From 44503faceae9080c76b46a01da84bec5044fbd01 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sun, 29 Mar 2020 18:57:07 +0200 Subject: [PATCH 001/121] Attempt to auto-import .map files for LEF/DEF reader. Probably needs adjustment. --- .../lefdef/db_plugin/dbLEFDEFImporter.cc | 78 ++++++++--- .../lefdef/db_plugin/dbLEFDEFImporter.h | 8 ++ .../lefdef/db_plugin/dbLEFDEFPlugin.cc | 125 +++++++++++++++++- 3 files changed, 190 insertions(+), 21 deletions(-) diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc index 430a31f25..d61efba16 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc @@ -147,18 +147,25 @@ LEFDEFLayerDelegate::open_layer (db::Layout &layout, const std::string &n, Layer { if (purpose == Outline || purpose == PlacementBlockage || purpose == Region) { + // NOTE: the canonical name is independent from the tech component's settings + // as is "(name)". It's used for implementing the automatic map file import + // feature. std::string ld; + std::string canonical_name; bool produce; if (purpose == Outline) { produce = mp_tech_comp->produce_cell_outlines (); ld = mp_tech_comp->cell_outline_layer (); + canonical_name = "(OUTLINE)"; } else if (purpose == Region) { produce = mp_tech_comp->produce_regions (); ld = mp_tech_comp->region_layer (); + canonical_name = "(REGION)"; } else { produce = mp_tech_comp->produce_placement_blockages (); ld = mp_tech_comp->placement_blockage_layer (); + canonical_name = "(BLK)"; } if (! produce) { @@ -178,10 +185,9 @@ LEFDEFLayerDelegate::open_layer (db::Layout &layout, const std::string &n, Layer if (ll.first) { - // create the layer if it is not part of the layout yet. - if (! layout.is_valid_layer (ll.second)) { - layout.insert_layer (ll.second, m_layer_map.mapping (ll.second)); - } + return ll; + + } else if ((ll = m_layer_map.logical (db::LayerProperties (canonical_name), layout)).first) { return ll; @@ -199,67 +205,99 @@ LEFDEFLayerDelegate::open_layer (db::Layout &layout, const std::string &n, Layer } else { + if (mp_tech_comp) { + bool produce = true; + switch (purpose) { + case Routing: + default: + produce = mp_tech_comp->produce_routing (); + break; + case ViaGeometry: + produce = mp_tech_comp->produce_via_geometry (); + break; + case Label: + produce = mp_tech_comp->produce_labels (); + break; + case Pins: + produce = mp_tech_comp->produce_pins (); + break; + case Obstructions: + produce = mp_tech_comp->produce_obstructions (); + break; + case Blockage: + produce = mp_tech_comp->produce_blockages (); + break; + } + if (! produce) { + return std::make_pair (false, 0); + } + } + + // Note: "name" is the decorated name as provided by the tech component's + // x_suffix specifications. As this is a variable entity, we also provide + // a canonical name of the form "(layer,purpose)" where purpose is a + // predefined suffix. The canonical name is the last fallback. Hence this + // allows importing layer mapping files as canonical name mapping. std::string name (n); - bool produce = true; int dt = 0; + std::string canonical_purpose; + if (mp_tech_comp) { switch (purpose) { case Routing: default: - produce = mp_tech_comp->produce_routing (); name += mp_tech_comp->routing_suffix (); + canonical_purpose = "NET"; dt += mp_tech_comp->routing_datatype (); break; case ViaGeometry: - produce = mp_tech_comp->produce_via_geometry (); name += mp_tech_comp->via_geometry_suffix (); dt += mp_tech_comp->via_geometry_datatype (); + canonical_purpose = "VIA"; break; case Label: - produce = mp_tech_comp->produce_labels (); name += mp_tech_comp->labels_suffix (); dt += mp_tech_comp->labels_datatype (); + canonical_purpose = "LABEL"; break; case Pins: - produce = mp_tech_comp->produce_pins (); name += mp_tech_comp->pins_suffix (); dt += mp_tech_comp->pins_datatype (); + canonical_purpose = "PIN"; break; case Obstructions: - produce = mp_tech_comp->produce_obstructions (); name += mp_tech_comp->obstructions_suffix (); dt += mp_tech_comp->obstructions_datatype (); + canonical_purpose = "OBS"; break; case Blockage: - produce = mp_tech_comp->produce_blockages (); name += mp_tech_comp->blockages_suffix (); dt += mp_tech_comp->blockages_datatype (); + canonical_purpose = "BLK"; break; } } - if (! produce) { - return std::make_pair (false, 0); - } + std::string canonical_name = std::string ("(") + n + "," + canonical_purpose + ")"; std::pair ll = m_layer_map.logical (name, layout); if (ll.first) { - // create the layer if it is not part of the layout yet. - if (! layout.is_valid_layer (ll.second)) { - layout.insert_layer (ll.second, m_layer_map.mapping (ll.second)); - } + return ll; + } else if ((ll = m_layer_map.logical (db::LayerProperties (canonical_name), layout)).first) { + + // final fallback: try canonical name return ll; } else { - std::pair ll_raw = m_layer_map.logical (n, layout); + ll = m_layer_map.logical (n, layout); int ln = -1; - if (ll_raw.first && (ln = layout.get_properties (ll_raw.second).layer) >= 0) { + if (ll.first && (ln = layout.get_properties (ll.second).layer) >= 0) { m_layer_map.map (db::LayerProperties (name), layout.layers (), db::LayerProperties (ln, dt, name)); m_layer_map.prepare (layout); diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h index 8058accd0..0cfc38f2b 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h @@ -518,6 +518,14 @@ public: return m_layer_map; } + /** + * @brief Get the layer map (non-const version) + */ + db::LayerMap &layer_map () + { + return m_layer_map; + } + /** * @brief Create a new layer or return the index of the given layer */ diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc index d9b10b28a..fa2e9adb5 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc @@ -77,6 +77,124 @@ static bool is_def_format (const std::string &fn) return false; } +/** + * @brief Reads a map file + * + * NOTE: this is rather experimental ... no idea what is the specification of + * the map file. + */ +static void +read_map_file (const std::string &path, db::LEFDEFLayerDelegate &layers) +{ + tl::log << tl::to_string (tr ("Reading LEF/DEF map file")) << " " << path; + + db::LayerMap &lm = layers.layer_map (); + unsigned int n = lm.next_index (); + + tl::InputFile file (path); + tl::InputStream file_stream (file); + tl::TextInputStream ts (file_stream); + + std::map purpose_translation; + purpose_translation ["LEFPIN"] = "PIN"; + purpose_translation ["LEFOBS"] = "OBS"; + purpose_translation ["SPNET"] = "NET"; + purpose_translation ["NET"] = "NET"; + purpose_translation ["VIA"] = "VIA"; + + while (! ts.at_end ()) { + + const std::string &l = ts.get_line (); + + tl::Extractor ex (l.c_str ()); + if (ex.at_end () || ex.test ("#")) { + + // ignore empty of comment lines + + } else { + + std::string w1, w2; + int layer = 0, datatype = 0; + + if (ex.try_read_word (w1) && ex.try_read_word (w2, "._$,/:") && ex.try_read (layer) && ex.try_read (datatype)) { + + if (w1 == "DIEAREA") { + + std::string canonical_name = "(OUTLINE)"; + lm.map (db::LayerProperties (canonical_name), n++, db::LayerProperties (layer, datatype)); + + } else if (w1 == "NAME") { + + std::vector purposes = tl::split (w2, ","); + for (std::vector::const_iterator p = purposes.begin (); p != purposes.end (); ++p) { + std::string canonical_name = std::string ("(") + tl::split (*p, "/").front () + ",LABEL)"; + lm.map (db::LayerProperties (canonical_name), n++, db::LayerProperties (layer, datatype)); + } + + } else { + + std::vector purposes = tl::split (w2, ","); + for (std::vector::const_iterator p = purposes.begin (); p != purposes.end (); ++p) { + std::map::const_iterator i = purpose_translation.find (*p); + if (i != purpose_translation.end ()) { + std::string canonical_name = std::string ("(") + w1 + "," + i->second + ")"; + lm.map (db::LayerProperties (canonical_name), n++, db::LayerProperties (layer, datatype)); + } + } + + } + + } + + } + + } +} + +/** + * @brief Imports a .map file present next to the input files + */ +static void +import_map_file_heuristics (const std::string &main_path, db::LEFDEFLayerDelegate &layers) +{ + std::string input_dir = tl::absolute_path (main_path); + if (! tl::file_exists (input_dir)) { + return; + } + + std::string bn = tl::basename (tl::filename (main_path)); + std::vector map_files; + std::string map_file_exact; + + std::vector entries = tl::dir_entries (input_dir); + for (std::vector::const_iterator e = entries.begin (); e != entries.end (); ++e) { + + if (tl::to_lower_case (tl::extension (*e)) == "map") { + + if (tl::basename (*e) == bn) { + map_file_exact = *e; + } else { + map_files.push_back (*e); + } + + } + + } + + try { + if (! map_file_exact.empty ()) { + read_map_file (tl::combine_path (input_dir, map_file_exact), layers); + tl::log << layers.layer_map ().to_string_file_format (); // @@@ + } else if (map_files.size () == 1) { + read_map_file (tl::combine_path (input_dir, map_files.front ()), layers); + tl::log << layers.layer_map ().to_string_file_format (); // @@@ + } + } catch (tl::Exception &ex) { + // ignore read errors on map file (this is a heuristics!) + tl::error << ex.msg (); + } +} + class LEFDEFReader : public db::ReaderBase { @@ -125,6 +243,9 @@ private: // Take the layer map and the "read all layers" flag from the reader options - hence we override the db::LEFDEFLayerDelegate layers (lefdef_options); + + import_map_file_heuristics (m_stream.absolute_path (), layers); + layers.prepare (layout); layout.dbu (lefdef_options->dbu ()); @@ -163,9 +284,11 @@ private: } - // Additionally read all LEF files next to the DEF file + // Additionally read all LEF files next to the DEF file and if there is a single .map file + // or one with the same name than the input file with ".map" suffix, try to read this one too. std::string input_dir = tl::absolute_path (m_stream.absolute_path ()); + if (tl::file_exists (input_dir)) { std::vector entries = tl::dir_entries (input_dir); From d328901799c25c822001d9853651daf5b2a64b2f Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sun, 29 Mar 2020 21:01:19 +0200 Subject: [PATCH 002/121] DEF reader fix: TAPER has to disable NONDEFAULTRULE for the segment --- .../streamers/lefdef/db_plugin/dbDEFImporter.cc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc index 5ee27d495..b5efc29b8 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc @@ -475,12 +475,13 @@ DEFImporter::do_read (db::Layout &layout) take (); } - taperrule.clear (); - do { std::string ln = get (); + taperrule.clear (); + const std::string *rulename = 0; + db::Coord w = 0; if (specialnets) { w = db::coord_traits::rounded (get_double () * scale); @@ -507,8 +508,10 @@ DEFImporter::do_read (db::Layout &layout) while (true) { if (test ("TAPER")) { taperrule.clear (); + rulename = &taperrule; } else if (test ("TAPERRULE")) { taperrule = get (); + rulename = &taperrule; } else if (test ("STYLE")) { sn = get_long (); } else { @@ -520,8 +523,7 @@ DEFImporter::do_read (db::Layout &layout) if (! specialnets) { - const std::string *rulename = &taperrule; - if (rulename->empty ()) { + if (! rulename) { rulename = &nondefaultrule; } From e15d99e4dadba06d1b8b8394f5a8ea6770dd3d7c Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sun, 29 Mar 2020 21:01:53 +0200 Subject: [PATCH 003/121] LEF reader fix: determine routing layers for vias without VIARULE from involved layers --- .../lefdef/db_plugin/dbLEFImporter.cc | 28 ++++++++++++++++++- .../lefdef/db_plugin/dbLEFImporter.h | 1 + 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc index 95506ff67..d39e27e84 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc @@ -602,7 +602,24 @@ LEFImporter::do_read (db::Layout &layout) test (";"); } - read_geometries (layout, cell, ViaGeometry); + std::map bboxes; + read_geometries (layout, cell, ViaGeometry, &bboxes); + + // determine m1 and m2 layers + + std::vector routing_layers; + for (std::map::const_iterator b = bboxes.begin (); b != bboxes.end (); ++b) { + if (m_routing_layers.find (b->first) != m_routing_layers.end ()) { + routing_layers.push_back (b->first); + } + } + + if (routing_layers.size () == 2) { + via_desc.m1 = routing_layers[0]; + via_desc.m2 = routing_layers[1]; + } else { + warn ("Can't determine routing layers for via: " + n); + } reset_cellname (); @@ -631,6 +648,15 @@ LEFImporter::do_read (db::Layout &layout) if (test ("END")) { expect (ln); break; + } else if (test ("TYPE")) { + if (test ("ROUTING")) { + m_routing_layers.insert (ln); + } else if (test ("CUT")) { + m_cut_layers.insert (ln); + } else { + get (); + } + expect (";"); } else if (test ("WIDTH")) { double w = get_double (); m_default_widths.insert (std::make_pair (ln, w)); diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.h b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.h index 9811d9bfc..b07af42e7 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.h +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.h @@ -106,6 +106,7 @@ private: std::map m_macros_by_name; std::map m_macro_bboxes_by_name; std::map m_vias; + std::set m_routing_layers, m_cut_layers; std::vector get_iteration (db::Layout &layout); void read_geometries (db::Layout &layout, db::Cell &cell, LayerPurpose purpose, std::map *collect_bboxes = 0, properties_id_type prop_id = 0); From 67a1c0ba257562268a044ae04d0497bc12fa816a Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sun, 29 Mar 2020 21:20:17 +0200 Subject: [PATCH 004/121] Updated implementation of mapping file reader for LEF/DEF. --- .../lefdef/db_plugin/dbLEFDEFPlugin.cc | 38 +++++++++++++++++-- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc index fa2e9adb5..bbe626736 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc @@ -125,23 +125,53 @@ read_map_file (const std::string &path, db::LEFDEFLayerDelegate &layers) } else if (w1 == "NAME") { + // converts a line like + // "NAME M1/PINS,M2/PINS ..." + // into a canonical name mapping like + // "(M1/LABELS): M1.LABEL" + // "(M2/LABELS): M2.LABEL" + + std::vector layers; std::vector purposes = tl::split (w2, ","); for (std::vector::const_iterator p = purposes.begin (); p != purposes.end (); ++p) { - std::string canonical_name = std::string ("(") + tl::split (*p, "/").front () + ",LABEL)"; - lm.map (db::LayerProperties (canonical_name), n++, db::LayerProperties (layer, datatype)); + layers.push_back (tl::split (*p, "/").front ()); } + std::string final_name = std::string ("(") + tl::join (layers, "/") + ",LABEL)"; + for (std::vector::const_iterator l = layers.begin (); l != layers.end (); ++l) { + std::string canonical_name = std::string ("(") + *l + ",LABEL)"; + lm.map (db::LayerProperties (canonical_name), n, db::LayerProperties (layer, datatype, final_name)); + } + ++n; + } else { + // converts a line like + // "M1 SPNET,NET,PINS,LEFPINS ..." + // into a canonical name mapping like + // "(M1,NET): M1.NET/PINS" + // "(M1,PINS): M1.NET/PINS" + // (separating, translating and recombing the purposes) + + std::vector translated_purposes; std::vector purposes = tl::split (w2, ","); for (std::vector::const_iterator p = purposes.begin (); p != purposes.end (); ++p) { std::map::const_iterator i = purpose_translation.find (*p); if (i != purpose_translation.end ()) { - std::string canonical_name = std::string ("(") + w1 + "," + i->second + ")"; - lm.map (db::LayerProperties (canonical_name), n++, db::LayerProperties (layer, datatype)); + translated_purposes.push_back (i->second); } } + std::sort (translated_purposes.begin (), translated_purposes.end ()); + translated_purposes.erase (std::unique (translated_purposes.begin (), translated_purposes.end ()), translated_purposes.end ()); + std::string final_name = w1 + "." + tl::join (translated_purposes, "/"); + + for (std::vector::const_iterator p = translated_purposes.begin (); p != translated_purposes.end (); ++p) { + std::string canonical_name = std::string ("(") + w1 + "," + *p + ")"; + lm.map (db::LayerProperties (canonical_name), n, db::LayerProperties (layer, datatype, final_name)); + } + ++n; + } } From dd63b727f80b26887e09727ab420dadca0aa66cf Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sun, 29 Mar 2020 21:23:12 +0200 Subject: [PATCH 005/121] Another update of the map file reader for LEF/DEF --- src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc index bbe626736..5ef4104b5 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc @@ -137,7 +137,7 @@ read_map_file (const std::string &path, db::LEFDEFLayerDelegate &layers) layers.push_back (tl::split (*p, "/").front ()); } - std::string final_name = std::string ("(") + tl::join (layers, "/") + ",LABEL)"; + std::string final_name = tl::join (layers, "/") + ".LABEL"; for (std::vector::const_iterator l = layers.begin (); l != layers.end (); ++l) { std::string canonical_name = std::string ("(") + *l + ",LABEL)"; lm.map (db::LayerProperties (canonical_name), n, db::LayerProperties (layer, datatype, final_name)); From ee3ee5bd8e1f82eff7c1788a2aaa9d174a1af41d Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sun, 29 Mar 2020 21:25:49 +0200 Subject: [PATCH 006/121] Another update of the map file reader for LEF/DEF --- src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc index 5ef4104b5..bd79bb5af 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc @@ -120,7 +120,7 @@ read_map_file (const std::string &path, db::LEFDEFLayerDelegate &layers) if (w1 == "DIEAREA") { - std::string canonical_name = "(OUTLINE)"; + std::string canonical_name = "OUTLINE"; lm.map (db::LayerProperties (canonical_name), n++, db::LayerProperties (layer, datatype)); } else if (w1 == "NAME") { From 8796b65ddbe714c6ab798f4107c078e63d56d2c0 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sun, 29 Mar 2020 21:52:51 +0200 Subject: [PATCH 007/121] DEF reader patched: after via continue with the new metal layer with the width given by the rule. --- .../lefdef/db_plugin/dbDEFImporter.cc | 47 +++++++++++-------- .../lefdef/db_plugin/dbDEFImporter.h | 1 + 2 files changed, 29 insertions(+), 19 deletions(-) diff --git a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc index b5efc29b8..bc29cf01b 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc @@ -136,6 +136,25 @@ struct Group std::vector comp_match; }; +db::Coord +DEFImporter::get_wire_width_for_rule (const std::string &rulename, const std::string &ln, double dbu) +{ + double w = db::coord_traits::rounded (m_lef_importer.layer_width (ln, rulename, 0.0) / dbu); + + // try to find local nondefault rule + if (! rulename.empty ()) { + std::map >::const_iterator nd = m_nondefault_widths.find (rulename); + if (nd != m_nondefault_widths.end ()) { + std::map::const_iterator ld = nd->second.find (ln); + if (ld != nd->second.end ()) { + w = ld->second; + } + } + } + + return w; +} + void DEFImporter::do_read (db::Layout &layout) { @@ -521,29 +540,14 @@ DEFImporter::do_read (db::Layout &layout) } - if (! specialnets) { - - if (! rulename) { - rulename = &nondefaultrule; - } - - w = db::coord_traits::rounded (m_lef_importer.layer_width (ln, *rulename, 0.0) / layout.dbu ()); - - // try to find local nondefault rule - if (! rulename->empty ()) { - std::map >::const_iterator nd = m_nondefault_widths.find (*rulename); - if (nd != m_nondefault_widths.end ()) { - std::map::const_iterator ld = nd->second.find (ln); - if (ld != nd->second.end ()) { - w = ld->second; - } - } - } - + if (! rulename) { + rulename = &nondefaultrule; } db::Coord def_ext = 0; + if (! specialnets) { + w = get_wire_width_for_rule (*rulename, ln, layout.dbu ()); def_ext = db::coord_traits::rounded (m_lef_importer.layer_ext (ln, w * 0.5 * layout.dbu ()) / layout.dbu ()); } @@ -733,6 +737,11 @@ DEFImporter::do_read (db::Layout &layout) } } + if (! specialnets) { + w = get_wire_width_for_rule (*rulename, ln, layout.dbu ()); + def_ext = db::coord_traits::rounded (m_lef_importer.layer_ext (ln, w * 0.5 * layout.dbu ()) / layout.dbu ()); + } + // continue a segment with the current point and the new layer if (pts.size () > 1) { pts.erase (pts.begin (), pts.end () - 1); diff --git a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.h b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.h index 112098cbc..083b9b4d2 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.h +++ b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.h @@ -66,6 +66,7 @@ private: db::FTrans get_orient (bool optional); void read_polygon (db::Polygon &poly, double scale); void read_rect (db::Polygon &poly, double scale); + db::Coord get_wire_width_for_rule(const std::string &rule, const std::string &ln, double dbu); }; } From fd0b07f0cdad51770012e2cec81f9be2a0eeb741 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sun, 29 Mar 2020 22:14:07 +0200 Subject: [PATCH 008/121] MERGE: strmxor could not identify layers when one has a name and the other does not (but both have numbers) --- src/buddies/src/bd/strmxor.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/buddies/src/bd/strmxor.cc b/src/buddies/src/bd/strmxor.cc index 8c4b03a33..0e1286bb5 100644 --- a/src/buddies/src/bd/strmxor.cc +++ b/src/buddies/src/bd/strmxor.cc @@ -140,7 +140,7 @@ struct XORData double tile_size; db::Layout *output_layout; db::cell_index_type output_cell; - std::map > l2l_map; + std::map, db::LPLogicalLessFunc> l2l_map; std::map, ResultDescriptor> *results; }; @@ -299,7 +299,7 @@ BD_PUBLIC int strmxor (int argc, char *argv[]) throw tl::Exception ("'" + top_b + "' is not a valid cell name in second layout"); } - std::map > l2l_map; + std::map, db::LPLogicalLessFunc> l2l_map; for (db::Layout::layer_iterator l = layout_a.begin_layers (); l != layout_a.end_layers (); ++l) { l2l_map.insert (std::make_pair (*(*l).second, std::make_pair (-1, -1))).first->second.first = (*l).first; From 0ae97279d829875ddaed0993de4c3bfa0b5cb7b6 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sun, 29 Mar 2020 23:13:22 +0200 Subject: [PATCH 009/121] Added optional MASK specification to VIA's RECT and POLYGON elements --- .../streamers/lefdef/db_plugin/dbDEFImporter.cc | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc index bc29cf01b..cc2010c58 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc @@ -914,6 +914,11 @@ DEFImporter::do_read (db::Layout &layout) std::string ln = get (); + if (test ("+")) { + expect ("MASK"); + get_long (); + } + std::vector &polygons = geometry.insert (std::make_pair (ln, std::vector ())).first->second; polygons.push_back (db::Polygon ()); read_polygon (polygons.back (), scale); @@ -922,6 +927,11 @@ DEFImporter::do_read (db::Layout &layout) std::string ln = get (); + if (test ("+")) { + expect ("MASK"); + get_long (); + } + std::vector &polygons = geometry.insert (std::make_pair (ln, std::vector ())).first->second; polygons.push_back (db::Polygon ()); read_rect (polygons.back (), scale); From 2c60338ae855870f725d9bedc8da2d0c864cf924 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Tue, 31 Mar 2020 21:56:13 +0200 Subject: [PATCH 010/121] Added DO .. BY .. STEP to vias in SPECIALNETS in DEF reader, added one more private testcase --- .../lefdef/db_plugin/dbDEFImporter.cc | 29 +++++++++++++++++- ...LEFDEFImport.cc => dbLEFDEFImportTests.cc} | 15 +++++++-- .../lefdef/unit_tests/unit_tests.pro | 2 +- testdata/lefdef/doxy_vias/.test.def.swp | Bin 0 -> 12288 bytes testdata/lefdef/doxy_vias/au.oas.gz | Bin 0 -> 254 bytes testdata/lefdef/doxy_vias/test.def | 19 ++++++++++++ 6 files changed, 60 insertions(+), 5 deletions(-) rename src/plugins/streamers/lefdef/unit_tests/{dbLEFDEFImport.cc => dbLEFDEFImportTests.cc} (96%) create mode 100644 testdata/lefdef/doxy_vias/.test.def.swp create mode 100644 testdata/lefdef/doxy_vias/au.oas.gz create mode 100644 testdata/lefdef/doxy_vias/test.def diff --git a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc index cc2010c58..842b3287a 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc @@ -727,9 +727,36 @@ DEFImporter::do_read (db::Layout &layout) std::string vn = get (); db::FTrans ft = get_orient (true /*optional*/); + db::Coord dx = 0, dy = 0; + long nx = 1, ny = 1; + + if (specialnets && test ("DO")) { + + nx = std::max (0l, get_long ()); + test ("BY"); + ny = std::max (0l, get_long ()); + test ("STEP"); + dx = db::coord_traits::rounded (get_double () * scale); + dy = db::coord_traits::rounded (get_double () * scale); + + if (nx < 0) { + dx = -dx; + nx = -nx; + } + if (ny < 0) { + dy = -dy; + ny = -ny; + } + + } + std::map::const_iterator vd = via_desc.find (vn); if (vd != via_desc.end () && ! pts.empty ()) { - design.insert (db::CellInstArray (db::CellInst (vd->second.cell->cell_index ()), db::Trans (ft.rot (), db::Vector (pts.back ())))); + if (nx <= 1 && ny <= 1) { + design.insert (db::CellInstArray (db::CellInst (vd->second.cell->cell_index ()), db::Trans (ft.rot (), db::Vector (pts.back ())))); + } else { + design.insert (db::CellInstArray (db::CellInst (vd->second.cell->cell_index ()), db::Trans (ft.rot (), db::Vector (pts.back ())), db::Vector (dx, 0), db::Vector (0, dy), (unsigned long) nx, (unsigned long) ny)); + } if (ln == vd->second.m1) { ln = vd->second.m2; } else if (ln == vd->second.m2) { diff --git a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImport.cc b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc similarity index 96% rename from src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImport.cc rename to src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc index 367802008..14cc6fcac 100644 --- a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImport.cc +++ b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc @@ -240,11 +240,16 @@ TEST(19) } TEST(20) +{ + run_test (_this, "def11", "lef:test.lef+def:test.def", "au.oas.gz", default_options ()); +} + +TEST(100) { run_test (_this, "issue-172", "lef:in.lef+def:in.def", "au.oas.gz", default_options (), false); } -TEST(21) +TEST(101) { db::LEFDEFReaderOptions opt = default_options (); opt.set_produce_pin_names (true); @@ -252,7 +257,7 @@ TEST(21) run_test (_this, "issue-489", "lef:in.lef+def:in.def", "au.oas", opt, false); } -TEST(22) +TEST(102) { db::LEFDEFReaderOptions opt = default_options (); opt.set_produce_pin_names (true); @@ -260,8 +265,12 @@ TEST(22) run_test (_this, "issue-489b", "lef:in_tech.lef+lef:in.lef", "au.oas.gz", opt, false); } -TEST(23) +TEST(103) { run_test (_this, "issue-517", "def:in.def", "au.oas.gz", default_options (), false); } +TEST(104) +{ + run_test (_this, "doxy_vias", "def:test.def", "au.oas.gz", default_options (), false); +} diff --git a/src/plugins/streamers/lefdef/unit_tests/unit_tests.pro b/src/plugins/streamers/lefdef/unit_tests/unit_tests.pro index 93529fc7f..3958da4b2 100644 --- a/src/plugins/streamers/lefdef/unit_tests/unit_tests.pro +++ b/src/plugins/streamers/lefdef/unit_tests/unit_tests.pro @@ -6,7 +6,7 @@ TARGET = lefdef_tests include($$PWD/../../../../lib_ut.pri) SOURCES = \ - dbLEFDEFImport.cc + dbLEFDEFImportTests.cc INCLUDEPATH += $$LAY_INC $$TL_INC $$DB_INC $$GSI_INC $$PWD/../db_plugin $$PWD/../../../common DEPENDPATH += $$LAY_INC $$TL_INC $$DB_INC $$GSI_INC $$PWD/../db_plugin $$PWD/../../../common diff --git a/testdata/lefdef/doxy_vias/.test.def.swp b/testdata/lefdef/doxy_vias/.test.def.swp new file mode 100644 index 0000000000000000000000000000000000000000..fcf20729c47ae24ef815046334aa97146874bc6f GIT binary patch literal 12288 zcmeI2&yEs75XK9SCacDMff6sf*$guSyGp`oU^;FmGT_XBS^tqyAdrPH%3$Q8F}{LF z6W_y=M-M)LH{->-PoQ59kPr`ec2k{vJyX?RS9Sjq4g{V$UESnr$svquM8l8oo*cb> zRCu2eO_MAejgz@q+BHV0HA&KJmhLiP?e(UheLhK+vqff4lX*6HVP}JR)=#p;o(zWl z!O-r{UM+hs(K%l!A@z^SvMdCIz)k{-Y-m;Ys8V+GkNVBx4c@=r*||j)g@6zc0zyCt z2mv7=1cZPPxL5?Tv_NlgrAzB;?XRDOzn<$*9zs9}2mv7=1cZPP5CTF#2nYcoAOwWK ze@Gzd6aCyH3a;Sr`2BzL{r~q>qF>N==qvOI`T#wLM$iMO0$qlFVDC5R3-lQ}hsMwu zWa{37WC#HvAOwVf5D)@FKnMr{As_^Vzy%JUCcncx52cp?=sD$cS;^XP(%FM#dz=O=;X7V*;W&{dCX&~Q- znF-7X)7&f|Q<#~7B5)Qjqo_3_10&N0mIZ7RnP)PIS~4**Jz(Czd6VTMqo^e_Bhv)t z3Ct%MPcrf{2>xJf_{g%rg6Ut)9#)ZR7KRIl9 Date: Tue, 31 Mar 2020 23:07:42 +0200 Subject: [PATCH 011/121] Bugfix LEF/DEF reader: via needs to change the layer also if it's inside a DEF. Added more test cases. --- .../lefdef/db_plugin/dbDEFImporter.cc | 19 +++++++++++++ .../lefdef/db_plugin/dbLEFImporter.h | 16 +++++++++++ .../lefdef/unit_tests/dbLEFDEFImportTests.cc | 5 ++++ testdata/lefdef/doxy_vias/.test.def.swp | Bin 12288 -> 0 bytes testdata/lefdef/doxy_vias/test.def | 9 ++++++ testdata/lefdef/specialnets_geo/au.oas.gz | Bin 0 -> 337 bytes testdata/lefdef/specialnets_geo/test.def | 26 ++++++++++++++++++ testdata/lefdef/specialnets_geo/test.lef | 24 ++++++++++++++++ 8 files changed, 99 insertions(+) delete mode 100644 testdata/lefdef/doxy_vias/.test.def.swp create mode 100644 testdata/lefdef/specialnets_geo/au.oas.gz create mode 100644 testdata/lefdef/specialnets_geo/test.def create mode 100644 testdata/lefdef/specialnets_geo/test.lef diff --git a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc index 842b3287a..81dc153dd 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc @@ -967,6 +967,25 @@ DEFImporter::do_read (db::Layout &layout) } + if (vd.m1.empty () && vd.m2.empty ()) { + + // analyze the layers to find the metals + std::vector routing_layers; + for (std::map >::const_iterator b = geometry.begin (); b != geometry.end (); ++b) { + if (m_lef_importer.is_routing_layer (b->first)) { + routing_layers.push_back (b->first); + } + } + + if (routing_layers.size () == 2) { + vd.m1 = routing_layers[0]; + vd.m2 = routing_layers[1]; + } else { + warn ("Can't determine routing layers for via: " + n); + } + + } + test (";"); if (has_via_rule && top && cut && bottom) { diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.h b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.h index b07af42e7..59ee3e5d2 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.h +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.h @@ -86,6 +86,22 @@ public: */ double layer_ext (const std::string &layer, double def_ext = 0.0) const; + /** + * @brief Returns true if the given layer is a routing layer + */ + bool is_routing_layer (const std::string &layer) const + { + return m_routing_layers.find (layer) != m_routing_layers.end (); + } + + /** + * @brief Returns true if the given layer is a cut layer + */ + bool is_cut_layer (const std::string &layer) const + { + return m_cut_layers.find (layer) != m_cut_layers.end (); + } + /** * @brief Gets a map of the vias defined in this LEF file * diff --git a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc index 14cc6fcac..472a29f0b 100644 --- a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc +++ b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc @@ -274,3 +274,8 @@ TEST(104) { run_test (_this, "doxy_vias", "def:test.def", "au.oas.gz", default_options (), false); } + +TEST(105) +{ + run_test (_this, "specialnets_geo", "lef:test.lef+def:test.def", "au.oas.gz", default_options (), false); +} diff --git a/testdata/lefdef/doxy_vias/.test.def.swp b/testdata/lefdef/doxy_vias/.test.def.swp deleted file mode 100644 index fcf20729c47ae24ef815046334aa97146874bc6f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI2&yEs75XK9SCacDMff6sf*$guSyGp`oU^;FmGT_XBS^tqyAdrPH%3$Q8F}{LF z6W_y=M-M)LH{->-PoQ59kPr`ec2k{vJyX?RS9Sjq4g{V$UESnr$svquM8l8oo*cb> zRCu2eO_MAejgz@q+BHV0HA&KJmhLiP?e(UheLhK+vqff4lX*6HVP}JR)=#p;o(zWl z!O-r{UM+hs(K%l!A@z^SvMdCIz)k{-Y-m;Ys8V+GkNVBx4c@=r*||j)g@6zc0zyCt z2mv7=1cZPPxL5?Tv_NlgrAzB;?XRDOzn<$*9zs9}2mv7=1cZPP5CTF#2nYcoAOwWK ze@Gzd6aCyH3a;Sr`2BzL{r~q>qF>N==qvOI`T#wLM$iMO0$qlFVDC5R3-lQ}hsMwu zWa{37WC#HvAOwVf5D)@FKnMr{As_^Vzy%JUCcncx52cp?=sD$cSg=2kMp6)^LKc{;`ev0*$|hMV0#G{nc# z&y|^lnSlqH!_DMt$jk^7gwjC15i>KG52m?UK&CJ=0Y%^}UPe)CMg~SEn*dFDQA=h< zrj!(8V^K>cMkWmnQBht7!3T^d7)1`VFsxw`d&tPo#Q@~Ws55Xd@-v7kFfvVGKEWs} zYQVy>h;0Ge3btcBH&|rFHZt>zh%f>bg5)e%*iSJXVmiUpz<-YE7}FW1EsR%~K*C5` j)-b`lmY+%s4ADO literal 0 HcmV?d00001 diff --git a/testdata/lefdef/specialnets_geo/test.def b/testdata/lefdef/specialnets_geo/test.def new file mode 100644 index 000000000..2874f0491 --- /dev/null +++ b/testdata/lefdef/specialnets_geo/test.def @@ -0,0 +1,26 @@ + +VERSION 5.8 ; +DIVIDERCHAR "/" ; +BUSBITCHARS "[]" ; +DESIGN chip_top ; +UNITS DISTANCE MICRONS 1000 ; +DIEAREA ( 0 0 ) ( 300 300 ) ; +STYLES 2 ; +- STYLE 1 ( 30 10 ) ( 10 30 ) ( -10 30 ) ( -30 10 ) ( -30 -10 ) ( -10 -30 ) ( 10 -30 ) ( 30 -10 ) ; +END STYLES +VIAS 1 ; + - VIA1_dummy + + RECT M1 ( -20 -15 ) ( 20 15 ) + + RECT VIA1 ( -10 -10 ) ( 10 10 ) + + RECT M2 ( -25 -25 ) ( 25 25 ) ; +END VIAS +SPECIALNETS 1 ; +- dummy + + POLYGON M1 ( 300 0 ) ( 300 50 ) ( 350 50 ) ( 400 100 ) ( 400 0 ) + + POLYGON M2 ( 300 150 ) ( 300 200 ) ( 350 200 ) ( 400 250 ) ( 400 150 ) + + RECT M1 ( 0 0 ) ( 100 200 ) + + ROUTED M1 30 ( 0 0 15 ) ( 100 0 0 ) VIA1_dummy ( 100 100 10 ) + + ROUTED M2 50 + SHAPE RING + STYLE 1 ( 0 100 ) ( 100 200 ) ( 200 200 ) +; +END SPECIALNETS +END DESIGN diff --git a/testdata/lefdef/specialnets_geo/test.lef b/testdata/lefdef/specialnets_geo/test.lef new file mode 100644 index 000000000..da907c86d --- /dev/null +++ b/testdata/lefdef/specialnets_geo/test.lef @@ -0,0 +1,24 @@ +VERSION 5.8 ; +BUSBITCHARS "[]" ; +DIVIDERCHAR "/" ; + +UNITS + DATABASE MICRONS 1000 ; +END UNITS + +MANUFACTURINGGRID 0.001 ; + +LAYER M1 + TYPE ROUTING ; +END M1 + +LAYER VIA1 + TYPE CUT ; +END VIA1 + +LAYER M2 + TYPE ROUTING ; + WIDTH 0.05 ; +END M2 + +END LIBRARY From 4a24b727d541c8cb0f00179bae9f40d4159d7973 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sat, 4 Apr 2020 00:40:01 +0200 Subject: [PATCH 012/121] Tried to implement MINWIDTH .. WRONGDIRECTION in LEF58_MINWIDTH property --- .../lefdef/db_plugin/dbDEFImporter.cc | 94 ++- .../lefdef/db_plugin/dbDEFImporter.h | 3 +- .../lefdef/db_plugin/dbLEFDEFImporter.cc | 18 +- .../lefdef/db_plugin/dbLEFDEFImporter.h | 10 + .../lefdef/db_plugin/dbLEFImporter.cc | 784 ++++++++++-------- .../lefdef/db_plugin/dbLEFImporter.h | 12 + .../lefdef/unit_tests/dbLEFDEFImportTests.cc | 9 +- testdata/lefdef/wrongdirection/au.oas.gz | Bin 0 -> 299 bytes testdata/lefdef/wrongdirection/test.def | 19 + testdata/lefdef/wrongdirection/test.lef | 41 + 10 files changed, 623 insertions(+), 367 deletions(-) create mode 100644 testdata/lefdef/wrongdirection/au.oas.gz create mode 100644 testdata/lefdef/wrongdirection/test.def create mode 100644 testdata/lefdef/wrongdirection/test.lef diff --git a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc index 81dc153dd..fb1953cda 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc @@ -136,10 +136,10 @@ struct Group std::vector comp_match; }; -db::Coord +std::pair DEFImporter::get_wire_width_for_rule (const std::string &rulename, const std::string &ln, double dbu) { - double w = db::coord_traits::rounded (m_lef_importer.layer_width (ln, rulename, 0.0) / dbu); + db::Coord w = db::coord_traits::rounded (m_lef_importer.layer_width (ln, rulename, 0.0) / dbu); // try to find local nondefault rule if (! rulename.empty ()) { @@ -152,7 +152,34 @@ DEFImporter::get_wire_width_for_rule (const std::string &rulename, const std::st } } - return w; + std::pair min_wxy = m_lef_importer.min_layer_width (ln); + db::Coord min_wx = db::coord_traits::rounded (min_wxy.first / dbu); + db::Coord min_wy = db::coord_traits::rounded (min_wxy.second / dbu); + + return std::make_pair (std::max (w, min_wx), std::max (w, min_wy)); +} + +std::pair +DEFImporter::get_def_ext (const std::string &ln, const std::pair &wxy, double dbu) +{ + if (wxy.first == wxy.second) { + db::Coord de = db::coord_traits::rounded (m_lef_importer.layer_ext (ln, wxy.first * 0.5 * dbu) / dbu); + return std::make_pair (de, de); + } else { +#if 0 + // This implementation picks the default extension according to the real width + // NOTE: the swapping of x and y for the default extension is intended. For horizontal lines, the + // extension is in x direction but corresponds to a wire width of a vertical wire and vice versa. + db::Coord dex = db::coord_traits::rounded (m_lef_importer.layer_ext (ln, wxy.second * 0.5 * dbu) / dbu); + db::Coord dey = db::coord_traits::rounded (m_lef_importer.layer_ext (ln, wxy.first * 0.5 * dbu) / dbu); + return std::make_pair (dex, dey); +#else + // This implementation picks the default extension according to the specified wire width (which is the minimum + // of wx and wy) + db::Coord de = db::coord_traits::rounded (m_lef_importer.layer_ext (ln, std::min (wxy.first, wxy.second) * 0.5 * dbu) / dbu); + return std::make_pair (de, de); +#endif + } } void @@ -501,9 +528,10 @@ DEFImporter::do_read (db::Layout &layout) taperrule.clear (); const std::string *rulename = 0; - db::Coord w = 0; + std::pair w (0, 0); if (specialnets) { - w = db::coord_traits::rounded (get_double () * scale); + db::Coord n = db::coord_traits::rounded (get_double () * scale); + w = std::make_pair (n, n); } const db::Polygon *style = 0; @@ -544,11 +572,11 @@ DEFImporter::do_read (db::Layout &layout) rulename = &nondefaultrule; } - db::Coord def_ext = 0; + std::pair def_ext (0, 0); if (! specialnets) { w = get_wire_width_for_rule (*rulename, ln, layout.dbu ()); - def_ext = db::coord_traits::rounded (m_lef_importer.layer_ext (ln, w * 0.5 * layout.dbu ()) / layout.dbu ()); + def_ext = get_def_ext (ln, w, layout.dbu ()); } std::map::const_iterator s = styles.find (sn); @@ -556,7 +584,7 @@ DEFImporter::do_read (db::Layout &layout) style = &s->second; } - std::vector ext; + std::vector > ext; std::vector pts; double x = 0.0, y = 0.0; @@ -629,11 +657,12 @@ DEFImporter::do_read (db::Layout &layout) y = get_double (); } pts.push_back (db::Point (db::DPoint (x * scale, y * scale))); - db::Coord e = def_ext; + std::pair ee = def_ext; if (! peek (")")) { - e = db::coord_traits::rounded (get_double () * scale); + db::Coord e = db::coord_traits::rounded (get_double () * scale); + ee.first = ee.second = e; } - ext.push_back (e); + ext.push_back (ee); test (")"); @@ -648,8 +677,11 @@ DEFImporter::do_read (db::Layout &layout) // Use the default style (octagon "pen" for non-manhattan segments, paths for // horizontal/vertical segments). + // Manhattan paths are stitched together from two-point paths if they - db::Coord e = std::max (ext.front (), ext.back ()); + std::pair e = std::max (ext.front (), ext.back ()); + bool is_isotropic = (e.first == e.second && w.first == w.second); + bool was_path = false; std::vector::const_iterator pt = pts.begin (); while (pt != pts.end ()) { @@ -657,11 +689,27 @@ DEFImporter::do_read (db::Layout &layout) std::vector::const_iterator pt0 = pt; do { ++pt; - } while (pt != pts.end () && (pt[-1].x () == pt[0].x () || pt[-1].y () == pt[0].y())); + } while (pt != pts.end () && is_isotropic && (pt[-1].x () == pt[0].x () || pt[-1].y () == pt[0].y())); - if (pt - pt0 > 1) { + if (pt - pt0 > 1 || pt0->x () == pt0[1].x () || pt0->y () == pt0[0].y()) { - db::Path p (pt0, pt, w, pt0 == pts.begin () ? e : 0, pt == pts.end () ? e : 0, false); + if (pt - pt0 == 1) { + ++pt; + } + + db::Coord wxy, wxy_perp, exy; + + if (pt0->x () == pt0 [1].x ()) { + wxy = w.second; + wxy_perp = w.first; + exy = e.second; + } else { + wxy = w.first; + wxy_perp = w.second; + exy = e.first; + } + + db::Path p (pt0, pt, wxy, pt0 == pts.begin () ? exy : (was_path ? wxy_perp / 2 : 0), pt == pts.end () ? exy : 0, false); if (prop_id != 0) { design.shapes (dl.second).insert (db::object_with_properties (p, prop_id)); } else { @@ -674,10 +722,16 @@ DEFImporter::do_read (db::Layout &layout) --pt; - } else if (pt != pts.end ()) { + was_path = true; - db::Coord s = (w + 1) / 2; - db::Coord t = db::Coord (ceil (w * (M_SQRT2 - 1) / 2)); + } else { + + if (! is_isotropic) { + warn("Anisotropic wire widths not supported for diagonal wires"); + } + + db::Coord s = (w.first + 1) / 2; + db::Coord t = db::Coord (ceil (w.first * (M_SQRT2 - 1) / 2)); db::Point octagon[8] = { db::Point (-s, t), @@ -700,6 +754,8 @@ DEFImporter::do_read (db::Layout &layout) design.shapes (dl.second).insert (p); } + was_path = false; + } } @@ -766,7 +822,7 @@ DEFImporter::do_read (db::Layout &layout) if (! specialnets) { w = get_wire_width_for_rule (*rulename, ln, layout.dbu ()); - def_ext = db::coord_traits::rounded (m_lef_importer.layer_ext (ln, w * 0.5 * layout.dbu ()) / layout.dbu ()); + def_ext = get_def_ext (ln, w, layout.dbu ()); } // continue a segment with the current point and the new layer diff --git a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.h b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.h index 083b9b4d2..fa4a377a4 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.h +++ b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.h @@ -66,7 +66,8 @@ private: db::FTrans get_orient (bool optional); void read_polygon (db::Polygon &poly, double scale); void read_rect (db::Polygon &poly, double scale); - db::Coord get_wire_width_for_rule(const std::string &rule, const std::string &ln, double dbu); + std::pair get_wire_width_for_rule(const std::string &rule, const std::string &ln, double dbu); + std::pair get_def_ext (const std::string &ln, const std::pair &wxy, double dbu); }; } diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc index d61efba16..eb895007b 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc @@ -531,7 +531,23 @@ LEFDEFImporter::expect (const std::string &token) } } -double +void +LEFDEFImporter::expect (const std::string &token1, const std::string &token2) +{ + if (! test (token1) && ! test (token2)) { + error ("Expected token: " + token1 + " or " + token2); + } +} + +void +LEFDEFImporter::expect (const std::string &token1, const std::string &token2, const std::string &token3) +{ + if (! test (token1) && ! test (token2) && ! test (token3)) { + error ("Expected token: " + token1 + ", " + token2 + " or " + token3); + } +} + +double LEFDEFImporter::get_double () { if (m_last_token.empty ()) { diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h index 0cfc38f2b..fe4e40b6b 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h @@ -642,6 +642,16 @@ protected: */ void expect (const std::string &token); + /** + * @brief Test whether the next token matches one of the given ones and raise an error if it does not + */ + void expect (const std::string &token1, const std::string &token2); + + /** + * @brief Test whether the next token matches one of the given ones and raise an error if it does not + */ + void expect (const std::string &token, const std::string &token2, const std::string &token3); + /** * @brief Gets the next token */ diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc index d39e27e84..f43d905fb 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc @@ -65,6 +65,17 @@ LEFImporter::layer_ext (const std::string &layer, double def_ext) const } } +std::pair +LEFImporter::min_layer_width (const std::string &layer) const +{ + std::map >::const_iterator l = m_min_widths.find (layer); + if (l != m_min_widths.end ()) { + return l->second; + } else { + return std::make_pair (0.0, 0.0); + } +} + double LEFImporter::layer_width (const std::string &layer, const std::string &nondefaultrule, double def_width) const { @@ -360,6 +371,431 @@ LEFImporter::read_geometries (db::Layout &layout, db::Cell &cell, LayerPurpose p } } +void +LEFImporter::read_nondefaultrule (db::Layout & /*layout*/) +{ + // read NONDEFAULTRULE sections + std::string n = get (); + + while (! test ("END") || ! test (n)) { + + if (test ("LAYER")) { + + std::string l = get (); + + // read the width for the layer + while (! test ("END")) { + if (test ("WIDTH")) { + double w = get_double (); + test (";"); + m_nondefault_widths[n][l] = w; + } else { + while (! test (";")) { + take (); + } + } + } + + test (l); + + } else if (test ("VIA")) { + + // ignore VIA statements + std::string v = get (); + while (! test ("END") || ! test (v)) { + take (); + } + + } else { + while (! test (";")) { + take (); + } + } + + } +} + +void +LEFImporter::read_viadef_by_rule (Layout &layout, db::Cell &cell, ViaDesc &via_desc, const std::string & /*n*/) +{ + db::Vector cutsize, cutspacing; + db::Vector be, te; + db::Vector bo, to; + db::Point offset; + int rows = 1, columns = 1; + std::string pattern; + + std::vector > > geometry; + geometry.push_back (std::pair > ()); + geometry.push_back (std::pair > ()); + geometry.push_back (std::pair > ()); + + while (! test ("END")) { + + double x, y; + + if (test ("CUTSIZE")) { + + x = get_double (); + y = get_double (); + cutsize = db::Vector (db::DVector (x / layout.dbu (), y / layout.dbu ())); + + test (";"); + + } else if (test ("CUTSPACING")) { + + x = get_double (); + y = get_double (); + cutspacing = db::Vector (db::DVector (x / layout.dbu (), y / layout.dbu ())); + + test (";"); + + } else if (test ("ORIGIN")) { + + x = get_double (); + y = get_double (); + offset = db::Point (db::DPoint (x / layout.dbu (), y / layout.dbu ())); + + test (";"); + + } else if (test ("ENCLOSURE")) { + + x = get_double (); + y = get_double (); + be = db::Vector (db::DVector (x / layout.dbu (), y / layout.dbu ())); + + x = get_double (); + y = get_double (); + te = db::Vector (db::DVector (x / layout.dbu (), y / layout.dbu ())); + + test (";"); + + } else if (test ("OFFSET")) { + + x = get_double (); + y = get_double (); + bo = db::Vector (db::DVector (x / layout.dbu (), y / layout.dbu ())); + + x = get_double (); + y = get_double (); + to = db::Vector (db::DVector (x / layout.dbu (), y / layout.dbu ())); + + test (";"); + + } else if (test ("ROWCOL")) { + + rows = get_long (); + columns = get_long (); + + test (";"); + + } else if (test ("PATTERN")) { + + pattern = get (); + + test (";"); + + } else if (test ("LAYERS")) { + + via_desc.m1 = geometry[0].first = get (); + geometry[1].first = get (); + via_desc.m2 = geometry[2].first = get (); + + test (";"); + + } else { + + while (! test (";")) { + take (); + } + + } + + } + + create_generated_via (geometry [0].second, geometry [1].second, geometry [2].second, + cutsize, cutspacing, be, te, bo, to, offset, rows, columns, pattern); + + for (std::vector > >::const_iterator g = geometry.begin (); g != geometry.end (); ++g) { + std::pair dl = open_layer (layout, g->first, ViaGeometry); + if (dl.first) { + for (std::vector::const_iterator p = g->second.begin (); p != g->second.end (); ++p) { + cell.shapes (dl.second).insert (*p); + } + } + } +} + +void +LEFImporter::read_viadef_by_geometry (Layout &layout, db::Cell &cell, ViaDesc &via_desc, const std::string &n) +{ + // ignore resistance spec + if (test ("RESISTANCE")) { + get_double (); + test (";"); + } + + std::map bboxes; + read_geometries (layout, cell, ViaGeometry, &bboxes); + + // determine m1 and m2 layers + + std::vector routing_layers; + for (std::map::const_iterator b = bboxes.begin (); b != bboxes.end (); ++b) { + if (m_routing_layers.find (b->first) != m_routing_layers.end ()) { + routing_layers.push_back (b->first); + } + } + + if (routing_layers.size () == 2) { + via_desc.m1 = routing_layers[0]; + via_desc.m2 = routing_layers[1]; + } else { + warn ("Can't determine routing layers for via: " + n); + } + + reset_cellname (); + + expect ("END"); +} + +void +LEFImporter::read_viadef (Layout &layout) +{ + std::string n = get (); + + // produce a cell for vias + std::string cellname = "VIA_" + n; + db::Cell &cell = layout.cell (layout.add_cell (cellname.c_str ())); + + ViaDesc &via_desc = m_vias[n]; + via_desc.cell = &cell; + + while (test ("DEFAULT") || test ("TOPOFSTACKONLY")) + ; + test (";"); + + if (test ("VIARULE")) { + read_viadef_by_rule (layout, cell, via_desc, n); + } else { + read_viadef_by_geometry (layout, cell, via_desc, n); + } + + test ("VIA"); + expect (n); +} + +void +LEFImporter::read_layer (Layout & /*layout*/) +{ + std::string ln = get (); + double wmin = 0.0, wmin_wrongdir = 0.0; + bool is_horizontal = true; + + register_layer (ln); + + // just extract the width from the layer - we need that as the default width for paths + while (! at_end ()) { + + if (test ("END")) { + + expect (ln); + break; + + } else if (test ("TYPE")) { + + if (test ("ROUTING")) { + m_routing_layers.insert (ln); + } else if (test ("CUT")) { + m_cut_layers.insert (ln); + } else { + get (); + } + expect (";"); + + } else if (test ("WIDTH")) { + + double w = get_double (); + m_default_widths.insert (std::make_pair (ln, w)); + expect (";"); + + } else if (test ("DIRECTION")) { + + if (test ("HORIZONTAL")) { + is_horizontal = true; + } else { + expect ("VERTICAL", "DIAG45", "DIAG135"); + } + + } else if (test ("WIREEXTENSION")) { + + double w = get_double (); + m_default_ext.insert (std::make_pair (ln, w)); + expect (";"); + + } else if (test ("ACCURRENTDENSITY")) { + + // ACCURRENTDENSITY needs some special attention because it can contain nested WIDTH + // blocks following a semicolon + take (); + if (test ("FREQUENCY")) { + while (! test ("TABLEENTRIES")) { + take (); + } + } + while (! test (";")) { + take (); + } + + } else if (test ("PROPERTY")) { + + std::string name = get (); + tl::Variant value = get (); + + if (name == "LEF58_MINWIDTH") { + + // Cadence extension + tl::Extractor ex (value.to_string ()); + double mw = 0.0; + if (ex.test ("MINWIDTH") && ex.try_read (mw)) { + if (ex.test ("WRONGDIRECTION")) { + wmin_wrongdir = mw; + } else { + wmin = mw; + } + } + + } + + } else { + + while (! test (";")) { + take (); + } + + } + } + + if (wmin > 0.0 || wmin_wrongdir > 0.0) { + + if (! is_horizontal) { + std::swap (wmin, wmin_wrongdir); + } + + m_min_widths.insert (std::make_pair (ln, std::make_pair (wmin, wmin_wrongdir))); + + } +} + +void +LEFImporter::read_macro (Layout &layout) +{ + std::string mn = get (); + set_cellname (mn); + + db::Cell &cell = layout.cell (layout.add_cell (mn.c_str ())); + + m_macros_by_name.insert (std::make_pair (mn, &cell)); + + db::Point origin; + db::Vector size; + + // read the macro + while (! at_end ()) { + + if (test ("END")) { + expect (mn); + break; + + } else if (test ("ORIGIN")) { + + double x = get_double (); + double y = get_double (); + expect (";"); + origin = db::Point (db::DPoint (x / layout.dbu (), y / layout.dbu ())); + + } else if (test ("SIZE")) { + + double x = get_double (); + test ("BY"); + double y = get_double (); + expect (";"); + size = db::Vector (db::DVector (x / layout.dbu (), y / layout.dbu ())); + + } else if (test ("PIN")) { + + std::string pn = get (); + std::string dir; + + while (! at_end ()) { + if (test ("END")) { + break; + } else if (test ("DIRECTION")) { + dir = get (); + test (";"); + } else if (test ("PORT")) { + + // produce pin labels + // TODO: put a label on every single object? + std::string label = pn; + /* don't add the direction currently, a name is sufficient + if (! dir.empty ()) { + label += ":"; + label += dir; + } + */ + + db::properties_id_type prop_id = 0; + if (produce_pin_props ()) { + db::PropertiesRepository::properties_set props; + props.insert (std::make_pair (pin_prop_name_id (), tl::Variant (label))); + prop_id = layout.properties_repository ().properties_id (props); + } + + std::map bboxes; + read_geometries (layout, cell, Pins, &bboxes, prop_id); + + for (std::map ::const_iterator b = bboxes.begin (); b != bboxes.end (); ++b) { + std::pair dl = open_layer (layout, b->first, Label); + if (dl.first) { + cell.shapes (dl.second).insert (db::Text (label.c_str (), db::Trans (b->second.center () - db::Point ()))); + } + } + + expect ("END"); + + } else { + while (! test (";")) { + take (); + } + } + } + + expect (pn); + + } else if (test ("OBS")) { + + read_geometries (layout, cell, Obstructions); + expect ("END"); + + } else { + while (! test (";")) { + take (); + } + } + + } + + std::pair dl = open_layer (layout, std::string (), Outline); + if (dl.first) { + cell.shapes (dl.second).insert (db::Box (-origin, -origin + size)); + } + + m_macro_bboxes_by_name.insert (std::make_pair (mn, db::Box (-origin, -origin + size))); + + reset_cellname (); +} + void LEFImporter::do_read (db::Layout &layout) { @@ -414,45 +850,7 @@ LEFImporter::do_read (db::Layout &layout) } else if (test ("NONDEFAULTRULE")) { - // read NONDEFAULTRULE sections - std::string n = get (); - - while (! test ("END") || ! test (n)) { - - if (test ("LAYER")) { - - std::string l = get (); - - // read the width for the layer - while (! test ("END")) { - if (test ("WIDTH")) { - double w = get_double (); - test (";"); - m_nondefault_widths[n][l] = w; - } else { - while (! test (";")) { - take (); - } - } - } - - test (l); - - } else if (test ("VIA")) { - - // ignore VIA statements - std::string v = get (); - while (! test ("END") || ! test (v)) { - take (); - } - - } else { - while (! test (";")) { - take (); - } - } - - } + read_nondefaultrule (layout); } else if (test ("SITE")) { @@ -472,163 +870,7 @@ LEFImporter::do_read (db::Layout &layout) } else if (test ("VIA")) { - std::string n = get (); - - // produce a cell for vias - std::string cellname = "VIA_" + n; - db::Cell &cell = layout.cell (layout.add_cell (cellname.c_str ())); - - ViaDesc &via_desc = m_vias[n]; - via_desc.cell = &cell; - - while (test ("DEFAULT") || test ("TOPOFSTACKONLY")) - ; - test (";"); - - if (test ("VIARULE")) { - - db::Vector cutsize, cutspacing; - db::Vector be, te; - db::Vector bo, to; - db::Point offset; - int rows = 1, columns = 1; - std::string pattern; - - std::vector > > geometry; - geometry.push_back (std::pair > ()); - geometry.push_back (std::pair > ()); - geometry.push_back (std::pair > ()); - - while (! test ("END")) { - - double x, y; - - if (test ("CUTSIZE")) { - - x = get_double (); - y = get_double (); - cutsize = db::Vector (db::DVector (x / layout.dbu (), y / layout.dbu ())); - - test (";"); - - } else if (test ("CUTSPACING")) { - - x = get_double (); - y = get_double (); - cutspacing = db::Vector (db::DVector (x / layout.dbu (), y / layout.dbu ())); - - test (";"); - - } else if (test ("ORIGIN")) { - - x = get_double (); - y = get_double (); - offset = db::Point (db::DPoint (x / layout.dbu (), y / layout.dbu ())); - - test (";"); - - } else if (test ("ENCLOSURE")) { - - x = get_double (); - y = get_double (); - be = db::Vector (db::DVector (x / layout.dbu (), y / layout.dbu ())); - - x = get_double (); - y = get_double (); - te = db::Vector (db::DVector (x / layout.dbu (), y / layout.dbu ())); - - test (";"); - - } else if (test ("OFFSET")) { - - x = get_double (); - y = get_double (); - bo = db::Vector (db::DVector (x / layout.dbu (), y / layout.dbu ())); - - x = get_double (); - y = get_double (); - to = db::Vector (db::DVector (x / layout.dbu (), y / layout.dbu ())); - - test (";"); - - } else if (test ("ROWCOL")) { - - rows = get_long (); - columns = get_long (); - - test (";"); - - } else if (test ("PATTERN")) { - - pattern = get (); - - test (";"); - - } else if (test ("LAYERS")) { - - via_desc.m1 = geometry[0].first = get (); - geometry[1].first = get (); - via_desc.m2 = geometry[2].first = get (); - - test (";"); - - } else { - - while (! test (";")) { - take (); - } - - } - - } - - create_generated_via (geometry [0].second, geometry [1].second, geometry [2].second, - cutsize, cutspacing, be, te, bo, to, offset, rows, columns, pattern); - - for (std::vector > >::const_iterator g = geometry.begin (); g != geometry.end (); ++g) { - std::pair dl = open_layer (layout, g->first, ViaGeometry); - if (dl.first) { - for (std::vector::const_iterator p = g->second.begin (); p != g->second.end (); ++p) { - cell.shapes (dl.second).insert (*p); - } - } - } - - } else { - - // ignore resistance spec - if (test ("RESISTANCE")) { - get_double (); - test (";"); - } - - std::map bboxes; - read_geometries (layout, cell, ViaGeometry, &bboxes); - - // determine m1 and m2 layers - - std::vector routing_layers; - for (std::map::const_iterator b = bboxes.begin (); b != bboxes.end (); ++b) { - if (m_routing_layers.find (b->first) != m_routing_layers.end ()) { - routing_layers.push_back (b->first); - } - } - - if (routing_layers.size () == 2) { - via_desc.m1 = routing_layers[0]; - via_desc.m2 = routing_layers[1]; - } else { - warn ("Can't determine routing layers for via: " + n); - } - - reset_cellname (); - - expect ("END"); - - } - - test ("VIA"); - expect (n); + read_viadef (layout); } else if (test ("BEGINEXT")) { @@ -639,157 +881,11 @@ LEFImporter::do_read (db::Layout &layout) } else if (test ("LAYER")) { - std::string ln = get (); - - register_layer (ln); - - // just extract the width from the layer - we need that as the default width for paths - while (! at_end ()) { - if (test ("END")) { - expect (ln); - break; - } else if (test ("TYPE")) { - if (test ("ROUTING")) { - m_routing_layers.insert (ln); - } else if (test ("CUT")) { - m_cut_layers.insert (ln); - } else { - get (); - } - expect (";"); - } else if (test ("WIDTH")) { - double w = get_double (); - m_default_widths.insert (std::make_pair (ln, w)); - expect (";"); - } else if (test ("WIREEXTENSION")) { - double w = get_double (); - m_default_ext.insert (std::make_pair (ln, w)); - expect (";"); - } else if (test ("ACCURRENTDENSITY")) { - // ACCURRENTDENSITY needs some special attention because it can contain nested WIDTH - // blocks following a semicolon - take (); - if (test ("FREQUENCY")) { - while (! test ("TABLEENTRIES")) { - take (); - } - } - while (! test (";")) { - take (); - } - } else { - while (! test (";")) { - take (); - } - } - } + read_layer (layout); } else if (test ("MACRO")) { - std::string mn = get (); - set_cellname (mn); - - db::Cell &cell = layout.cell (layout.add_cell (mn.c_str ())); - - m_macros_by_name.insert (std::make_pair (mn, &cell)); - - db::Point origin; - db::Vector size; - - // read the macro - while (! at_end ()) { - - if (test ("END")) { - expect (mn); - break; - - } else if (test ("ORIGIN")) { - - double x = get_double (); - double y = get_double (); - expect (";"); - origin = db::Point (db::DPoint (x / layout.dbu (), y / layout.dbu ())); - - } else if (test ("SIZE")) { - - double x = get_double (); - test ("BY"); - double y = get_double (); - expect (";"); - size = db::Vector (db::DVector (x / layout.dbu (), y / layout.dbu ())); - - } else if (test ("PIN")) { - - std::string pn = get (); - std::string dir; - - while (! at_end ()) { - if (test ("END")) { - break; - } else if (test ("DIRECTION")) { - dir = get (); - test (";"); - } else if (test ("PORT")) { - - // produce pin labels - // TODO: put a label on every single object? - std::string label = pn; - /* don't add the direction currently, a name is sufficient - if (! dir.empty ()) { - label += ":"; - label += dir; - } - */ - - db::properties_id_type prop_id = 0; - if (produce_pin_props ()) { - db::PropertiesRepository::properties_set props; - props.insert (std::make_pair (pin_prop_name_id (), tl::Variant (label))); - prop_id = layout.properties_repository ().properties_id (props); - } - - std::map bboxes; - read_geometries (layout, cell, Pins, &bboxes, prop_id); - - for (std::map ::const_iterator b = bboxes.begin (); b != bboxes.end (); ++b) { - std::pair dl = open_layer (layout, b->first, Label); - if (dl.first) { - cell.shapes (dl.second).insert (db::Text (label.c_str (), db::Trans (b->second.center () - db::Point ()))); - } - } - - expect ("END"); - - } else { - while (! test (";")) { - take (); - } - } - } - - expect (pn); - - } else if (test ("OBS")) { - - read_geometries (layout, cell, Obstructions); - expect ("END"); - - } else { - while (! test (";")) { - take (); - } - } - - } - - std::pair dl = open_layer (layout, std::string (), Outline); - if (dl.first) { - cell.shapes (dl.second).insert (db::Box (-origin, -origin + size)); - } - - m_macro_bboxes_by_name.insert (std::make_pair (mn, db::Box (-origin, -origin + size))); - - reset_cellname (); + read_macro (layout); } else { while (! test (";")) { diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.h b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.h index 59ee3e5d2..7bc672639 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.h +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.h @@ -86,6 +86,11 @@ public: */ double layer_ext (const std::string &layer, double def_ext = 0.0) const; + /** + * @brief Gets the minimum wire width in x and y direction for the given layer name + */ + std::pair min_layer_width (const std::string &layer) const; + /** * @brief Returns true if the given layer is a routing layer */ @@ -119,6 +124,7 @@ private: std::map > m_nondefault_widths; std::map m_default_widths; std::map m_default_ext; + std::map > m_min_widths; std::map m_macros_by_name; std::map m_macro_bboxes_by_name; std::map m_vias; @@ -126,6 +132,12 @@ private: std::vector get_iteration (db::Layout &layout); void read_geometries (db::Layout &layout, db::Cell &cell, LayerPurpose purpose, std::map *collect_bboxes = 0, properties_id_type prop_id = 0); + void read_nondefaultrule (Layout &layout); + void read_viadef (Layout &layout); + void read_viadef_by_rule (Layout &layout, db::Cell &cell, ViaDesc &desc, const std::string &n); + void read_viadef_by_geometry (Layout &layout, db::Cell &cell, ViaDesc &desc, const std::string &n); + void read_layer (Layout &layout); + void read_macro (Layout &layout); }; } diff --git a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc index 472a29f0b..249bf79ed 100644 --- a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc +++ b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc @@ -270,12 +270,17 @@ TEST(103) run_test (_this, "issue-517", "def:in.def", "au.oas.gz", default_options (), false); } -TEST(104) +TEST(104_doxy_vias) { run_test (_this, "doxy_vias", "def:test.def", "au.oas.gz", default_options (), false); } -TEST(105) +TEST(105_specialnets_geo) { run_test (_this, "specialnets_geo", "lef:test.lef+def:test.def", "au.oas.gz", default_options (), false); } + +TEST(106_wrongdirection) +{ + run_test (_this, "wrongdirection", "lef:test.lef+def:test.def", "au.oas.gz", default_options (), false); +} diff --git a/testdata/lefdef/wrongdirection/au.oas.gz b/testdata/lefdef/wrongdirection/au.oas.gz new file mode 100644 index 0000000000000000000000000000000000000000..92712cdd35f285ef718c6de232e8e6a867ee7412 GIT binary patch literal 299 zcmV+`0o48Z@2gEzO`uOm$ zl%y7yu=54SySoI(2L$;CxCVtpadV`e6x2%H5}W5Ub~Rs*KF+5JO9d_4VJnOT5>$Q)h=L73}ThcUzizz x`~!9it9++>;H$H2hUFp>cS0|0)(y5dj*004&uh)Mte literal 0 HcmV?d00001 diff --git a/testdata/lefdef/wrongdirection/test.def b/testdata/lefdef/wrongdirection/test.def new file mode 100644 index 000000000..e533260cf --- /dev/null +++ b/testdata/lefdef/wrongdirection/test.def @@ -0,0 +1,19 @@ +VERSION 5.8 ; +DIVIDERCHAR "/" ; +BUSBITCHARS "[]" ; +DESIGN test ; +UNITS DISTANCE MICRONS 1000 ; +DIEAREA ( 0 0 ) ( 10000 10000 ) ; +NONDEFAULTRULES 1 ; + - ndr + + HARDSPACING + + LAYER M3 WIDTH 500 SPACING 500 +; +END NONDEFAULTRULES +NETS 1 ; + - net_b + + NONDEFAULTRULE ndr + + ROUTED M3 ( 0 0 ) ( 2000 0 ) via34 ( * 2000 ) ( 4000 * ) ( * 4000 ) + ; +END NETS +END DESIGN diff --git a/testdata/lefdef/wrongdirection/test.lef b/testdata/lefdef/wrongdirection/test.lef new file mode 100644 index 000000000..36b5ae01c --- /dev/null +++ b/testdata/lefdef/wrongdirection/test.lef @@ -0,0 +1,41 @@ +VERSION 5.8 ; +BUSBITCHARS "[]" ; +DIVIDERCHAR "/" ; + +UNITS + DATABASE MICRONS 1000 ; +END UNITS + +MANUFACTURINGGRID 0.001 ; + +PROPERTYDEFINITIONS + LAYER LEF58_MINWIDTH STRING ; +END PROPERTYDEFINITIONS + +LAYER M3 + TYPE ROUTING ; + DIRECTION VERTICAL ; + WIDTH 0.6 ; +END M3 + +LAYER VIA3 + TYPE CUT ; +END VIA3 + +LAYER M4 + TYPE ROUTING ; + DIRECTION HORIZONTAL ; + WIDTH 0.5 ; + PROPERTY LEF58_MINWIDTH "MINWIDTH 1.0 WRONGDIRECTION ; " ; +END M4 + +VIA via34 + LAYER M3 ; + RECT -0.4 -0.3 0.4 0.3 ; + LAYER VIA3 ; + RECT -0.3 -0.25 0.3 0.25 ; + LAYER M4 ; + RECT -1.00 -0.5 1.00 0.5 ; +END via34 + +END LIBRARY From f11a3a0dd5e1f2a34a0b2ffdced8b95ebc924704 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sat, 4 Apr 2020 18:48:25 +0200 Subject: [PATCH 013/121] Bugfix: MINWIDTH ... WRONGDIRECTION wasn't considering DIRECTION VERTICAL Added/updated some tests, some refactoring. --- .../lefdef/db_plugin/dbDEFImporter.cc | 165 +++++++++--------- .../lefdef/db_plugin/dbDEFImporter.h | 4 +- .../lefdef/db_plugin/dbLEFImporter.cc | 68 ++++++-- .../lefdef/db_plugin/dbLEFImporter.h | 6 +- .../lefdef/unit_tests/dbLEFDEFImportTests.cc | 11 ++ testdata/lefdef/scanchain/au.oas.gz | Bin 0 -> 153 bytes testdata/lefdef/scanchain/test.def | 32 ++++ testdata/lefdef/specialwidths/au.oas.gz | Bin 0 -> 316 bytes testdata/lefdef/specialwidths/test.def | 19 ++ testdata/lefdef/specialwidths/test.lef | 43 +++++ 10 files changed, 245 insertions(+), 103 deletions(-) create mode 100644 testdata/lefdef/scanchain/au.oas.gz create mode 100644 testdata/lefdef/scanchain/test.def create mode 100644 testdata/lefdef/specialwidths/au.oas.gz create mode 100644 testdata/lefdef/specialwidths/test.def create mode 100644 testdata/lefdef/specialwidths/test.lef diff --git a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc index fb1953cda..cdbaf91e9 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc @@ -139,15 +139,17 @@ struct Group std::pair DEFImporter::get_wire_width_for_rule (const std::string &rulename, const std::string &ln, double dbu) { - db::Coord w = db::coord_traits::rounded (m_lef_importer.layer_width (ln, rulename, 0.0) / dbu); + std::pair wxy = m_lef_importer.layer_width (ln, rulename); + db::Coord wx = db::coord_traits::rounded (wxy.first / dbu); + db::Coord wy = db::coord_traits::rounded (wxy.second / dbu); // try to find local nondefault rule if (! rulename.empty ()) { - std::map >::const_iterator nd = m_nondefault_widths.find (rulename); + std::map >::const_iterator nd = m_nondefault_widths.find (rulename); if (nd != m_nondefault_widths.end ()) { - std::map::const_iterator ld = nd->second.find (ln); + std::map::const_iterator ld = nd->second.find (ln); if (ld != nd->second.end ()) { - w = ld->second; + wx = wy = ld->second; } } } @@ -156,30 +158,87 @@ DEFImporter::get_wire_width_for_rule (const std::string &rulename, const std::st db::Coord min_wx = db::coord_traits::rounded (min_wxy.first / dbu); db::Coord min_wy = db::coord_traits::rounded (min_wxy.second / dbu); - return std::make_pair (std::max (w, min_wx), std::max (w, min_wy)); + return std::make_pair (std::max (wx, min_wx), std::max (wy, min_wy)); } std::pair DEFImporter::get_def_ext (const std::string &ln, const std::pair &wxy, double dbu) { - if (wxy.first == wxy.second) { - db::Coord de = db::coord_traits::rounded (m_lef_importer.layer_ext (ln, wxy.first * 0.5 * dbu) / dbu); - return std::make_pair (de, de); - } else { -#if 0 - // This implementation picks the default extension according to the real width - // NOTE: the swapping of x and y for the default extension is intended. For horizontal lines, the - // extension is in x direction but corresponds to a wire width of a vertical wire and vice versa. - db::Coord dex = db::coord_traits::rounded (m_lef_importer.layer_ext (ln, wxy.second * 0.5 * dbu) / dbu); - db::Coord dey = db::coord_traits::rounded (m_lef_importer.layer_ext (ln, wxy.first * 0.5 * dbu) / dbu); - return std::make_pair (dex, dey); -#else - // This implementation picks the default extension according to the specified wire width (which is the minimum - // of wx and wy) - db::Coord de = db::coord_traits::rounded (m_lef_importer.layer_ext (ln, std::min (wxy.first, wxy.second) * 0.5 * dbu) / dbu); - return std::make_pair (de, de); -#endif + // This implementation assumes the "preferred width" is controlling the default extension and it is + // identical to the minimum effective width. This is true if "LEF58_MINWIDTH" with "WRONGDIRECTION" is + // used in the proposed way. Which is to specify a larger width for the "wrong" direction. + db::Coord de = db::coord_traits::rounded (m_lef_importer.layer_ext (ln, std::min (wxy.first, wxy.second) * 0.5 * dbu) / dbu); + return std::make_pair (de, de); +} + +void +DEFImporter::read_diearea (db::Layout &layout, db::Cell &design, double scale) +{ + std::vector points; + + while (! test (";")) { + test ("("); + double x = get_double (); + double y = get_double (); + points.push_back (db::DPoint (x * scale, y * scale)); + test (")"); } + + if (points.size () >= 2) { + + // create outline shape + std::pair dl = open_layer (layout, std::string (), Outline); + if (dl.first) { + if (points.size () == 2) { + design.shapes (dl.second).insert (db::Box (db::DBox (points [0], points [1]))); + } else { + db::DPolygon p; + p.assign_hull (points.begin (), points.end ()); + design.shapes (dl.second).insert (db::Polygon (p)); + } + } + + } +} + +void +DEFImporter::read_nondefaultrules (double scale) +{ + // read NONDEFAULTRULES sections + get_long (); + expect (";"); + + while (test ("-")) { + + std::string n = get (); + + while (test ("+")) { + + if (test ("LAYER")) { + + std::string l = get (); + + // read the width for the layer + if (test ("WIDTH")) { + double w = get_double () * scale; + m_nondefault_widths[n][l] = db::coord_traits::rounded (w); + } + + } + + // parse over the rest + while (! peek ("+") && ! peek ("-") && ! peek (";")) { + take (); + } + + } + + test (";"); + + } + + test ("END"); + test ("NONDEFAULTRULES"); } void @@ -231,31 +290,7 @@ DEFImporter::do_read (db::Layout &layout) } else if (test ("DIEAREA")) { - std::vector points; - - while (! test (";")) { - test ("("); - double x = get_double (); - double y = get_double (); - points.push_back (db::DPoint (x * scale, y * scale)); - test (")"); - } - - if (points.size () >= 2) { - - // create outline shape - std::pair dl = open_layer (layout, std::string (), Outline); - if (dl.first) { - if (points.size () == 2) { - design.shapes (dl.second).insert (db::Box (db::DBox (points [0], points [1]))); - } else { - db::DPolygon p; - p.assign_hull (points.begin (), points.end ()); - design.shapes (dl.second).insert (db::Polygon (p)); - } - } - - } + read_diearea (layout, design, scale); } else if (test ("PROPERTYDEFINITIONS")) { // read over PROPERTYDEFINITIONS sections @@ -265,41 +300,7 @@ DEFImporter::do_read (db::Layout &layout) } else if (test ("NONDEFAULTRULES")) { - // read NONDEFAULTRULES sections - get_long (); - expect (";"); - - while (test ("-")) { - - std::string n = get (); - - while (test ("+")) { - - if (test ("LAYER")) { - - std::string l = get (); - - // read the width for the layer - if (test ("WIDTH")) { - double w = get_double () * scale; - m_nondefault_widths[n][l] = w; - } - - } - - // parse over the rest - while (! peek ("+") && ! peek ("-") && ! peek (";")) { - take (); - } - - } - - test (";"); - - } - - test ("END"); - test ("NONDEFAULTRULES"); + read_nondefaultrules (scale); } else if (test ("REGIONS")) { diff --git a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.h b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.h index fa4a377a4..4fa08fbc3 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.h +++ b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.h @@ -61,13 +61,15 @@ protected: private: LEFImporter m_lef_importer; - std::map > m_nondefault_widths; + std::map > m_nondefault_widths; db::FTrans get_orient (bool optional); void read_polygon (db::Polygon &poly, double scale); void read_rect (db::Polygon &poly, double scale); std::pair get_wire_width_for_rule(const std::string &rule, const std::string &ln, double dbu); std::pair get_def_ext (const std::string &ln, const std::pair &wxy, double dbu); + void read_diearea (db::Layout &layout, db::Cell &design, double scale); + void read_nondefaultrules (double scale); }; } diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc index f43d905fb..cb5995b1d 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc @@ -76,12 +76,12 @@ LEFImporter::min_layer_width (const std::string &layer) const } } -double -LEFImporter::layer_width (const std::string &layer, const std::string &nondefaultrule, double def_width) const +std::pair +LEFImporter::layer_width (const std::string &layer, const std::string &nondefaultrule, const std::pair &def_width) const { - std::map >::const_iterator nd = m_nondefault_widths.find (nondefaultrule); + std::map > >::const_iterator nd = m_nondefault_widths.find (nondefaultrule); - std::map::const_iterator l; + std::map >::const_iterator l; bool has_width = false; if (! nondefaultrule.empty () && nd != m_nondefault_widths.end ()) { @@ -185,9 +185,9 @@ LEFImporter::read_geometries (db::Layout &layout, db::Cell &cell, LayerPurpose p } w = 0.0; - std::map::const_iterator dw = m_default_widths.find (layer_name); + std::map >::const_iterator dw = m_default_widths.find (layer_name); if (dw != m_default_widths.end ()) { - w = dw->second; + w = dw->second.first; } while (! test (";")) { @@ -388,7 +388,7 @@ LEFImporter::read_nondefaultrule (db::Layout & /*layout*/) if (test ("WIDTH")) { double w = get_double (); test (";"); - m_nondefault_widths[n][l] = w; + m_nondefault_widths[n][l] = std::make_pair (w, w); } else { while (! test (";")) { take (); @@ -590,7 +590,8 @@ LEFImporter::read_layer (Layout & /*layout*/) { std::string ln = get (); double wmin = 0.0, wmin_wrongdir = 0.0; - bool is_horizontal = true; + double w = 0.0, w_wrongdir = 0.0; + bool is_horizontal = false; register_layer (ln); @@ -615,8 +616,12 @@ LEFImporter::read_layer (Layout & /*layout*/) } else if (test ("WIDTH")) { - double w = get_double (); - m_default_widths.insert (std::make_pair (ln, w)); + w = get_double (); + expect (";"); + + } else if (test ("MINWIDTH")) { + + wmin = get_double (); expect (";"); } else if (test ("DIRECTION")) { @@ -629,8 +634,8 @@ LEFImporter::read_layer (Layout & /*layout*/) } else if (test ("WIREEXTENSION")) { - double w = get_double (); - m_default_ext.insert (std::make_pair (ln, w)); + double v = get_double (); + m_default_ext.insert (std::make_pair (ln, v)); expect (";"); } else if (test ("ACCURRENTDENSITY")) { @@ -656,17 +661,32 @@ LEFImporter::read_layer (Layout & /*layout*/) // Cadence extension tl::Extractor ex (value.to_string ()); - double mw = 0.0; - if (ex.test ("MINWIDTH") && ex.try_read (mw)) { + double v = 0.0; + if (ex.test ("MINWIDTH") && ex.try_read (v)) { if (ex.test ("WRONGDIRECTION")) { - wmin_wrongdir = mw; + wmin_wrongdir = v; } else { - wmin = mw; + wmin = v; + } + } + + } else if (name == "LEF58_WIDTH") { + + // Cadence extension + tl::Extractor ex (value.to_string ()); + double v = 0.0; + if (ex.test ("WIDTH") && ex.try_read (v)) { + if (ex.test ("WRONGDIRECTION")) { + w_wrongdir = v; + } else { + w = v; } } } + expect (";"); + } else { while (! test (";")) { @@ -676,9 +696,23 @@ LEFImporter::read_layer (Layout & /*layout*/) } } + if (w > 0.0 || w_wrongdir > 0.0) { + + if (w_wrongdir == 0.0) { + w_wrongdir = w; + } else if (! is_horizontal) { + std::swap (w, w_wrongdir); + } + + m_default_widths.insert (std::make_pair (ln, std::make_pair (w, w_wrongdir))); + + } + if (wmin > 0.0 || wmin_wrongdir > 0.0) { - if (! is_horizontal) { + if (wmin_wrongdir == 0.0) { + wmin_wrongdir = wmin; + } else if (! is_horizontal) { std::swap (wmin, wmin_wrongdir); } diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.h b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.h index 7bc672639..f52133996 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.h +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.h @@ -77,7 +77,7 @@ public: * The nondefaultrule name gives the name of the nondefaultrule or an empty string if * none is requested. */ - double layer_width (const std::string &layer, const std::string &nondefaultrule, double def_width = 0.0) const; + std::pair layer_width (const std::string &layer, const std::string &nondefaultrule, const std::pair &def_width = std::make_pair (0.0, 0.0)) const; /** * @brief Get the extension for a layer with the given name @@ -121,8 +121,8 @@ protected: void do_read (db::Layout &layout); private: - std::map > m_nondefault_widths; - std::map m_default_widths; + std::map > > m_nondefault_widths; + std::map > m_default_widths; std::map m_default_ext; std::map > m_min_widths; std::map m_macros_by_name; diff --git a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc index 249bf79ed..fd9b1b896 100644 --- a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc +++ b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc @@ -284,3 +284,14 @@ TEST(106_wrongdirection) { run_test (_this, "wrongdirection", "lef:test.lef+def:test.def", "au.oas.gz", default_options (), false); } + +TEST(107_specialwidths) +{ + run_test (_this, "specialwidths", "lef:test.lef+def:test.def", "au.oas.gz", default_options (), false); +} + +TEST(108_scanchain) +{ + run_test (_this, "scanchain", "def:test.def", "au.oas.gz", default_options (), false); +} + diff --git a/testdata/lefdef/scanchain/au.oas.gz b/testdata/lefdef/scanchain/au.oas.gz new file mode 100644 index 0000000000000000000000000000000000000000..62bd9872536a29580951b0170ce152a8118aac84 GIT binary patch literal 153 zcmV;K0A~LmiwFqBxQJc=17US8Z((x)Qw?_Y_0;uu4E7A>JUCcncx52cp?=sD$cSJUCcncx52cp?=sD$cS4!psa-1E#sz{X;{1JpEjmS%8Ab99{;IYDR_yY&TdIvfX46sbspr z@`d>(%U5QRO6CjvFW4{gzhviS6nwz2Kwj)IBf|t{{x8g5m>C!s$jhiRa4_;Sh`sp5 z2m}k|7s$(seFVz!-(b1H!U$Awz)n_d29Rcu6??IUi3b>dKn_rq$W4|Behdsu4I>#a OFaQ7#X*JMe0ssK6;Epo@ literal 0 HcmV?d00001 diff --git a/testdata/lefdef/specialwidths/test.def b/testdata/lefdef/specialwidths/test.def new file mode 100644 index 000000000..9f53fde84 --- /dev/null +++ b/testdata/lefdef/specialwidths/test.def @@ -0,0 +1,19 @@ +VERSION 5.8 ; +DIVIDERCHAR "/" ; +BUSBITCHARS "[]" ; +DESIGN test ; +UNITS DISTANCE MICRONS 1000 ; +DIEAREA ( 0 0 ) ( 10000 10000 ) ; +NONDEFAULTRULES 1 ; + - ndr + + HARDSPACING + + LAYER M3 WIDTH 500 SPACING 500 +; +END NONDEFAULTRULES +NETS 1 ; + - net_b + + NONDEFAULTRULE ndr + + ROUTED M3 ( 0 2000 ) ( 0 0 ) ( 2000 0 ) via34 ( * 2000 ) ( 4000 * ) ( * 4000 ) + ; +END NETS +END DESIGN diff --git a/testdata/lefdef/specialwidths/test.lef b/testdata/lefdef/specialwidths/test.lef new file mode 100644 index 000000000..2d0b5edc9 --- /dev/null +++ b/testdata/lefdef/specialwidths/test.lef @@ -0,0 +1,43 @@ +VERSION 5.8 ; +BUSBITCHARS "[]" ; +DIVIDERCHAR "/" ; + +UNITS + DATABASE MICRONS 1000 ; +END UNITS + +MANUFACTURINGGRID 0.001 ; + +PROPERTYDEFINITIONS + LAYER LEF58_MINWIDTH STRING ; +END PROPERTYDEFINITIONS + +LAYER M3 + TYPE ROUTING ; + DIRECTION VERTICAL ; + WIDTH 0.4 ; + PROPERTY LEF58_MINWIDTH "MINWIDTH 0.5 ; " ; + PROPERTY LEF58_MINWIDTH "MINWIDTH 0.8 WRONGDIRECTION ; " ; +END M3 + +LAYER VIA3 + TYPE CUT ; +END VIA3 + +LAYER M4 + TYPE ROUTING ; + DIRECTION HORIZONTAL ; + PROPERTY LEF58_WIDTH "WIDTH 0.6 ; " ; + PROPERTY LEF58_WIDTH "WIDTH 1.0 WRONGDIRECTION ; " ; +END M4 + +VIA via34 + LAYER M3 ; + RECT -0.4 -0.3 0.4 0.3 ; + LAYER VIA3 ; + RECT -0.3 -0.25 0.3 0.25 ; + LAYER M4 ; + RECT -1.00 -0.5 1.00 0.5 ; +END via34 + +END LIBRARY From 99af144d98085fb84ec5629ce699cc794efb528f Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sat, 4 Apr 2020 19:01:35 +0200 Subject: [PATCH 014/121] Some refactoring - DEF scanner more modular --- .../lefdef/db_plugin/dbDEFImporter.cc | 312 +++++++++--------- .../lefdef/db_plugin/dbDEFImporter.h | 5 + 2 files changed, 170 insertions(+), 147 deletions(-) diff --git a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc index cdbaf91e9..383f628ca 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc @@ -30,6 +30,28 @@ namespace db { +struct DEFImporterGroup +{ + DEFImporterGroup (const std::string &n, const std::string &rn, const std::vector &m) + : name (n), region_name (rn), comp_match (m) + { + // .. nothing yet .. + } + + bool comp_matches (const std::string &name) const + { + for (std::vector::const_iterator m = comp_match.begin (); m != comp_match.end (); ++m) { + if (m->match (name)) { + return true; + } + } + return false; + } + + std::string name, region_name; + std::vector comp_match; +}; + DEFImporter::DEFImporter () : LEFDEFImporter () { @@ -114,28 +136,6 @@ DEFImporter::read_rect (db::Polygon &poly, double scale) poly = db::Polygon (db::Box (pt1, pt2)); } -struct Group -{ - Group (const std::string &n, const std::string &rn, const std::vector &m) - : name (n), region_name (rn), comp_match (m) - { - // .. nothing yet .. - } - - bool comp_matches (const std::string &name) const - { - for (std::vector::const_iterator m = comp_match.begin (); m != comp_match.end (); ++m) { - if (m->match (name)) { - return true; - } - } - return false; - } - - std::string name, region_name; - std::vector comp_match; -}; - std::pair DEFImporter::get_wire_width_for_rule (const std::string &rulename, const std::string &ln, double dbu) { @@ -204,10 +204,6 @@ DEFImporter::read_diearea (db::Layout &layout, db::Cell &design, double scale) void DEFImporter::read_nondefaultrules (double scale) { - // read NONDEFAULTRULES sections - get_long (); - expect (";"); - while (test ("-")) { std::string n = get (); @@ -236,9 +232,131 @@ DEFImporter::read_nondefaultrules (double scale) test (";"); } +} - test ("END"); - test ("NONDEFAULTRULES"); +void +DEFImporter::read_regions (std::map > ®ions, double scale) +{ + while (test ("-")) { + + std::string n = get (); + std::vector &polygons = regions [n]; + + while (! peek (";")) { + + if (test ("+")) { + + // ignore other options for now + while (! peek (";")) { + take (); + } + break; + + } else { + + db::Polygon box; + read_rect (box, scale); + polygons.push_back (box); + + } + + } + + test (";"); + + } +} +void +DEFImporter::read_groups (std::list &groups, double /*scale*/) +{ + while (test ("-")) { + + std::string n = get (); + std::string rn; + std::vector match; + + while (! peek (";")) { + + if (test ("+")) { + + // gets the region name if there is one + if (test ("REGION")) { + rn = get (); + } + + // ignore the reset for now + while (! peek (";")) { + take (); + } + break; + + } else { + + match.push_back (tl::GlobPattern (get ())); + + } + + } + + groups.push_back (DEFImporterGroup (n, rn, match)); + + test (";"); + + } +} + +void +DEFImporter::read_blockages (db::Layout &layout, db::Cell &design, double scale) +{ + while (test ("-")) { + + std::string layer; + + while (! test (";")) { + + if (test ("PLACEMENT")) { + + // indicates a placement blockage + layer = std::string (); + + } else if (test ("LAYER")) { + + layer = get (); + + } else if (test ("+")) { + + // ignore options for now + while (! peek ("RECT") && ! peek ("POLYGON") && ! peek ("+") && ! peek ("-") && ! peek (";")) { + take (); + } + + } else if (test ("POLYGON")) { + + db::Polygon p; + read_polygon (p, scale); + + std::pair dl = open_layer (layout, layer, layer.empty () ? PlacementBlockage : Blockage); + if (dl.first) { + design.shapes (dl.second).insert (p); + } + + } else if (test ("RECT")) { + + db::Polygon p; + read_rect (p, scale); + + std::pair dl = open_layer (layout, layer, layer.empty () ? PlacementBlockage : Blockage); + if (dl.first) { + design.shapes (dl.second).insert (p); + } + + } else { + expect (";"); + } + + } + + } } void @@ -249,7 +367,7 @@ DEFImporter::do_read (db::Layout &layout) std::map styles; std::map via_desc = m_lef_importer.vias (); std::map > regions; - std::list groups; + std::list groups; std::list > instances; db::Cell &design = layout.cell (layout.add_cell ("TOP")); @@ -300,45 +418,25 @@ DEFImporter::do_read (db::Layout &layout) } else if (test ("NONDEFAULTRULES")) { + // read NONDEFAULTRULES sections + get_long (); + expect (";"); + read_nondefaultrules (scale); + expect ("END"); + expect ("NONDEFAULTRULES"); + } else if (test ("REGIONS")) { // Read REGION statements get_long (); expect (";"); - while (test ("-")) { + read_regions (regions, scale); - std::string n = get (); - std::vector &polygons = regions [n]; - - while (! peek (";")) { - - if (test ("+")) { - - // ignore other options for now - while (! peek (";")) { - take (); - } - break; - - } else { - - db::Polygon box; - read_rect (box, scale); - polygons.push_back (box); - - } - - } - - test (";"); - - } - - test ("END"); - test ("REGIONS"); + expect ("END"); + expect ("REGIONS"); } else if (test ("PINPROPERTIES")) { // read over PINPROPERTIES statements @@ -366,45 +464,13 @@ DEFImporter::do_read (db::Layout &layout) get_long (); expect (";"); - while (test ("-")) { + read_groups (groups, scale); - std::string n = get (); - std::string rn; - std::vector match; - - while (! peek (";")) { - - if (test ("+")) { - - // gets the region name if there is one - if (test ("REGION")) { - rn = get (); - } - - // ignore the reset for now - while (! peek (";")) { - take (); - } - break; - - } else { - - match.push_back (tl::GlobPattern (get ())); - - } - - } - - groups.push_back (Group (n, rn, match)); - - test (";"); - - } - - test ("END"); - test ("GROUPS"); + expect ("END"); + expect ("GROUPS"); } else if (test ("BEGINEXT")) { + // read over BEGINEXT sections while (! test ("ENDEXT")) { take (); @@ -415,58 +481,10 @@ DEFImporter::do_read (db::Layout &layout) get_long (); expect (";"); - while (test ("-")) { + read_blockages (layout, design, scale); - std::string layer; - - while (! test (";")) { - - if (test ("PLACEMENT")) { - - // indicates a placement blockage - layer = std::string (); - - } else if (test ("LAYER")) { - - layer = get (); - - } else if (test ("+")) { - - // ignore options for now - while (! peek ("RECT") && ! peek ("POLYGON") && ! peek ("+") && ! peek ("-") && ! peek (";")) { - take (); - } - - } else if (test ("POLYGON")) { - - db::Polygon p; - read_polygon (p, scale); - - std::pair dl = open_layer (layout, layer, layer.empty () ? PlacementBlockage : Blockage); - if (dl.first) { - design.shapes (dl.second).insert (p); - } - - } else if (test ("RECT")) { - - db::Polygon p; - read_rect (p, scale); - - std::pair dl = open_layer (layout, layer, layer.empty () ? PlacementBlockage : Blockage); - if (dl.first) { - design.shapes (dl.second).insert (p); - } - - } else { - expect (";"); - } - - } - - } - - test ("END"); - test ("BLOCKAGES"); + expect ("END"); + expect ("BLOCKAGES"); } else if ((specialnets = test ("SPECIALNETS")) == true || test ("NETS")) { @@ -1325,7 +1343,7 @@ DEFImporter::do_read (db::Layout &layout) // Walk through the groups, create a group container cell and put all instances // that match the group match string there. Then delete these cells (spec says "do not assign any component to more than one group"). - for (std::list::const_iterator g = groups.begin (); g != groups.end (); ++g) { + for (std::list::const_iterator g = groups.begin (); g != groups.end (); ++g) { db::Cell *group_cell = &layout.cell (layout.add_cell (("GROUP_" + g->name).c_str ())); design.insert (db::CellInstArray (group_cell->cell_index (), db::Trans ())); diff --git a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.h b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.h index 4fa08fbc3..0ac133de8 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.h +++ b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.h @@ -36,6 +36,8 @@ namespace db { +struct DEFImporterGroup; + /** * @brief The DEF importer object */ @@ -70,6 +72,9 @@ private: std::pair get_def_ext (const std::string &ln, const std::pair &wxy, double dbu); void read_diearea (db::Layout &layout, db::Cell &design, double scale); void read_nondefaultrules (double scale); + void read_regions (std::map > ®ions, double scale); + void read_groups (std::list &groups, double scale); + void read_blockages (db::Layout &layout, db::Cell &design, double scale); }; } From 9df6d29761a5d28d79d3d5fd3d93bb9dd5cbbc7d Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sat, 4 Apr 2020 19:14:56 +0200 Subject: [PATCH 015/121] Some refactoring - DEF scanner more modular (2) --- .../lefdef/db_plugin/dbDEFImporter.cc | 1620 +++++++++-------- .../lefdef/db_plugin/dbDEFImporter.h | 7 + 2 files changed, 833 insertions(+), 794 deletions(-) diff --git a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc index 383f628ca..54c97fbb2 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc @@ -359,17 +359,831 @@ DEFImporter::read_blockages (db::Layout &layout, db::Cell &design, double scale) } } +void +DEFImporter::read_nets (db::Layout &layout, db::Cell &design, double scale, bool specialnets) +{ + while (test ("-")) { + + std::string net = get (); + std::string nondefaultrule; + std::string stored_netname, stored_nondefaultrule; + std::string taperrule; + bool in_subnet = false; + + db::properties_id_type prop_id = 0; + if (produce_net_props ()) { + db::PropertiesRepository::properties_set props; + props.insert (std::make_pair (net_prop_name_id (), tl::Variant (net))); + prop_id = layout.properties_repository ().properties_id (props); + } + + while (test ("(")) { + while (! test (")")) { + take (); + } + } + + while (test ("+")) { + + bool was_shield = false; + + if (! specialnets && test ("SUBNET")) { + + while (test ("(")) { + while (! test (")")) { + take (); + } + } + + if (! in_subnet) { + stored_netname = net; + stored_nondefaultrule = nondefaultrule; + in_subnet = true; + } + + } else if (! specialnets && test ("NONDEFAULTRULE")) { + + nondefaultrule = get (); + + } else if ((was_shield = test ("SHIELD")) == true || test ("NOSHIELD") || test ("ROUTED") || test ("FIXED") || test ("COVER")) { + + if (was_shield) { + take (); + } + + do { + + std::string ln = get (); + + taperrule.clear (); + const std::string *rulename = 0; + + std::pair w (0, 0); + if (specialnets) { + db::Coord n = db::coord_traits::rounded (get_double () * scale); + w = std::make_pair (n, n); + } + + const db::Polygon *style = 0; + + int sn = std::numeric_limits::max (); + + if (specialnets) { + + while (test ("+")) { + + if (test ("STYLE")) { + sn = get_long (); + } else if (test ("SHAPE")) { + take (); + } + + } + + } else { + + while (true) { + if (test ("TAPER")) { + taperrule.clear (); + rulename = &taperrule; + } else if (test ("TAPERRULE")) { + taperrule = get (); + rulename = &taperrule; + } else if (test ("STYLE")) { + sn = get_long (); + } else { + break; + } + } + + } + + if (! rulename) { + rulename = &nondefaultrule; + } + + std::pair def_ext (0, 0); + + if (! specialnets) { + w = get_wire_width_for_rule (*rulename, ln, layout.dbu ()); + def_ext = get_def_ext (ln, w, layout.dbu ()); + } + + std::map::const_iterator s = m_styles.find (sn); + if (s != m_styles.end ()) { + style = &s->second; + } + + std::vector > ext; + std::vector pts; + + double x = 0.0, y = 0.0; + + while (true) { + + if (test ("MASK")) { + // ignore mask spec + get_long (); + } + + if (test ("RECT")) { + + if (! test ("(")) { + error (tl::to_string (tr ("RECT routing specification not followed by coordinate list"))); + } + + // breaks wiring + pts.clear (); + + // rect spec + + double x1 = get_double (); + double y1 = get_double (); + double x2 = get_double (); + double y2 = get_double (); + + test (")"); + + std::pair dl = open_layer (layout, ln, Routing); + if (dl.first) { + + db::Box rect (db::Point (db::DPoint ((x + x1) * scale, (y + y1) * scale)), + db::Point (db::DPoint ((x + x2) * scale, (y + y2) * scale))); + + if (prop_id != 0) { + design.shapes (dl.second).insert (db::object_with_properties (rect, prop_id)); + } else { + design.shapes (dl.second).insert (rect); + } + + } + + } else if (test ("VIRTUAL")) { + + // virtual specs simply create a new segment + pts.clear (); + + } else if (peek ("(")) { + + ext.clear (); + + while (peek ("(") || peek ("MASK")) { + + if (test ("MASK")) { + // ignore MASK spec + get_long (); + } + + if (! test ("(")) { + // We could have a via here: in that case we have swallowed MASK already, but + // since we don't do anything with that, this does not hurt for now. + break; + } + + if (! test ("*")) { + x = get_double (); + } + if (! test ("*")) { + y = get_double (); + } + pts.push_back (db::Point (db::DPoint (x * scale, y * scale))); + std::pair ee = def_ext; + if (! peek (")")) { + db::Coord e = db::coord_traits::rounded (get_double () * scale); + ee.first = ee.second = e; + } + ext.push_back (ee); + + test (")"); + + } + + if (pts.size () > 1) { + + std::pair dl = open_layer (layout, ln, Routing); + if (dl.first) { + + if (! style) { + + // Use the default style (octagon "pen" for non-manhattan segments, paths for + // horizontal/vertical segments). + // Manhattan paths are stitched together from two-point paths if they + + std::pair e = std::max (ext.front (), ext.back ()); + bool is_isotropic = (e.first == e.second && w.first == w.second); + bool was_path = false; + + std::vector::const_iterator pt = pts.begin (); + while (pt != pts.end ()) { + + std::vector::const_iterator pt0 = pt; + do { + ++pt; + } while (pt != pts.end () && is_isotropic && (pt[-1].x () == pt[0].x () || pt[-1].y () == pt[0].y())); + + if (pt - pt0 > 1 || pt0->x () == pt0[1].x () || pt0->y () == pt0[0].y()) { + + if (pt - pt0 == 1) { + ++pt; + } + + db::Coord wxy, wxy_perp, exy; + + if (pt0->x () == pt0 [1].x ()) { + wxy = w.second; + wxy_perp = w.first; + exy = e.second; + } else { + wxy = w.first; + wxy_perp = w.second; + exy = e.first; + } + + db::Path p (pt0, pt, wxy, pt0 == pts.begin () ? exy : (was_path ? wxy_perp / 2 : 0), pt == pts.end () ? exy : 0, false); + if (prop_id != 0) { + design.shapes (dl.second).insert (db::object_with_properties (p, prop_id)); + } else { + design.shapes (dl.second).insert (p); + } + + if (pt == pts.end ()) { + break; + } + + --pt; + + was_path = true; + + } else { + + if (! is_isotropic) { + warn("Anisotropic wire widths not supported for diagonal wires"); + } + + db::Coord s = (w.first + 1) / 2; + db::Coord t = db::Coord (ceil (w.first * (M_SQRT2 - 1) / 2)); + + db::Point octagon[8] = { + db::Point (-s, t), + db::Point (-t, s), + db::Point (t, s), + db::Point (s, t), + db::Point (s, -t), + db::Point (t, -s), + db::Point (-t, -s), + db::Point (-s, -t) + }; + + db::Polygon k; + k.assign_hull (octagon, octagon + sizeof (octagon) / sizeof (octagon[0])); + + db::Polygon p = db::minkowsky_sum (k, db::Edge (*pt0, *pt)); + if (prop_id != 0) { + design.shapes (dl.second).insert (db::object_with_properties (p, prop_id)); + } else { + design.shapes (dl.second).insert (p); + } + + was_path = false; + + } + + } + + } else { + + for (size_t i = 0; i < pts.size () - 1; ++i) { + db::Polygon p = db::minkowsky_sum (*style, db::Edge (pts [i], pts [i + 1])); + if (prop_id != 0) { + design.shapes (dl.second).insert (db::object_with_properties (p, prop_id)); + } else { + design.shapes (dl.second).insert (p); + } + } + + } + + } + + } + + } else if (! peek ("NEW") && ! peek ("+") && ! peek ("-") && ! peek (";")) { + + // indicates a via + std::string vn = get (); + db::FTrans ft = get_orient (true /*optional*/); + + db::Coord dx = 0, dy = 0; + long nx = 1, ny = 1; + + if (specialnets && test ("DO")) { + + nx = std::max (0l, get_long ()); + test ("BY"); + ny = std::max (0l, get_long ()); + test ("STEP"); + dx = db::coord_traits::rounded (get_double () * scale); + dy = db::coord_traits::rounded (get_double () * scale); + + if (nx < 0) { + dx = -dx; + nx = -nx; + } + if (ny < 0) { + dy = -dy; + ny = -ny; + } + + } + + std::map::const_iterator vd = m_via_desc.find (vn); + if (vd != m_via_desc.end () && ! pts.empty ()) { + if (nx <= 1 && ny <= 1) { + design.insert (db::CellInstArray (db::CellInst (vd->second.cell->cell_index ()), db::Trans (ft.rot (), db::Vector (pts.back ())))); + } else { + design.insert (db::CellInstArray (db::CellInst (vd->second.cell->cell_index ()), db::Trans (ft.rot (), db::Vector (pts.back ())), db::Vector (dx, 0), db::Vector (0, dy), (unsigned long) nx, (unsigned long) ny)); + } + if (ln == vd->second.m1) { + ln = vd->second.m2; + } else if (ln == vd->second.m2) { + ln = vd->second.m1; + } + } + + if (! specialnets) { + w = get_wire_width_for_rule (*rulename, ln, layout.dbu ()); + def_ext = get_def_ext (ln, w, layout.dbu ()); + } + + // continue a segment with the current point and the new layer + if (pts.size () > 1) { + pts.erase (pts.begin (), pts.end () - 1); + } + + } else { + break; + } + + } + + } while (test ("NEW")); + + if (in_subnet) { + in_subnet = false; + net = stored_netname; + stored_netname.clear (); + nondefaultrule = stored_nondefaultrule; + stored_nondefaultrule.clear (); + } + + } else if (test ("POLYGON")) { + + std::string ln = get (); + + db::Polygon p; + read_polygon (p, scale); + + std::pair dl = open_layer (layout, ln, Routing); + if (dl.first) { + if (prop_id != 0) { + design.shapes (dl.second).insert (db::object_with_properties (p, prop_id)); + } else { + design.shapes (dl.second).insert (p); + } + } + + } else if (test ("RECT")) { + + std::string ln = get (); + + db::Polygon p; + read_rect (p, scale); + + std::pair dl = open_layer (layout, ln, Routing); + if (dl.first) { + if (prop_id != 0) { + design.shapes (dl.second).insert (db::object_with_properties (p, prop_id)); + } else { + design.shapes (dl.second).insert (p); + } + } + + } else { + while (! peek ("+") && ! peek ("-") && ! peek (";")) { + take (); + } + } + + } + + expect (";"); + + } +} + +void +DEFImporter::read_vias (db::Layout &layout, db::Cell & /*design*/, double scale) +{ + while (test ("-")) { + + std::string n = get (); + ViaDesc &vd = m_via_desc.insert (std::make_pair (n, ViaDesc ())).first->second; + + // produce a cell for vias + std::string cellname = "VIA_" + n; + db::Cell &cell = layout.cell (layout.add_cell (cellname.c_str ())); + vd.cell = &cell; + + bool has_via_rule = false; + + db::Vector cutsize, cutspacing; + db::Vector be, te; + db::Vector bo, to; + db::Point offset; + int rows = 1, columns = 1; + std::string pattern; + + std::map > geometry; + std::vector *top = 0, *cut = 0, *bottom = 0; + + while (test ("+")) { + + double x, y; + + if (test ("VIARULE")) { + + has_via_rule = true; + take (); + + } else if (test ("CUTSIZE")) { + + x = get_double (); + y = get_double (); + cutsize = db::Vector (db::DVector (x * scale, y * scale)); + + } else if (test ("CUTSPACING")) { + + x = get_double (); + y = get_double (); + cutspacing = db::Vector (db::DVector (x * scale, y * scale)); + + } else if (test ("ORIGIN")) { + + x = get_double (); + y = get_double (); + offset = db::Point (db::DPoint (x * scale, y * scale)); + + } else if (test ("ENCLOSURE")) { + + x = get_double (); + y = get_double (); + be = db::Vector (db::DVector (x * scale, y * scale)); + + x = get_double (); + y = get_double (); + te = db::Vector (db::DVector (x * scale, y * scale)); + + } else if (test ("OFFSET")) { + + x = get_double (); + y = get_double (); + bo = db::Vector (db::DVector (x * scale, y * scale)); + + x = get_double (); + y = get_double (); + to = db::Vector (db::DVector (x * scale, y * scale)); + + } else if (test ("ROWCOL")) { + + rows = get_long (); + columns = get_long (); + + } else if (test ("PATTERN")) { + + pattern = get (); + + } else if (test ("LAYERS")) { + + std::string bn = get (); + std::string cn = get (); + std::string tn = get (); + + bottom = &geometry.insert (std::make_pair (bn, std::vector ())).first->second; + cut = &geometry.insert (std::make_pair (cn, std::vector ())).first->second; + top = &geometry.insert (std::make_pair (tn, std::vector ())).first->second; + + vd.m1 = bn; + vd.m2 = tn; + + } else if (test ("POLYGON")) { + + std::string ln = get (); + + if (test ("+")) { + expect ("MASK"); + get_long (); + } + + std::vector &polygons = geometry.insert (std::make_pair (ln, std::vector ())).first->second; + polygons.push_back (db::Polygon ()); + read_polygon (polygons.back (), scale); + + } else if (test ("RECT")) { + + std::string ln = get (); + + if (test ("+")) { + expect ("MASK"); + get_long (); + } + + std::vector &polygons = geometry.insert (std::make_pair (ln, std::vector ())).first->second; + polygons.push_back (db::Polygon ()); + read_rect (polygons.back (), scale); + + } + + } + + if (vd.m1.empty () && vd.m2.empty ()) { + + // analyze the layers to find the metals + std::vector routing_layers; + for (std::map >::const_iterator b = geometry.begin (); b != geometry.end (); ++b) { + if (m_lef_importer.is_routing_layer (b->first)) { + routing_layers.push_back (b->first); + } + } + + if (routing_layers.size () == 2) { + vd.m1 = routing_layers[0]; + vd.m2 = routing_layers[1]; + } else { + warn ("Can't determine routing layers for via: " + n); + } + + } + + test (";"); + + if (has_via_rule && top && cut && bottom) { + create_generated_via (*bottom, *cut, *top, + cutsize, cutspacing, be, te, bo, to, offset, rows, columns, pattern); + } + + for (std::map >::const_iterator g = geometry.begin (); g != geometry.end (); ++g) { + std::pair dl = open_layer (layout, g->first, ViaGeometry); + if (dl.first) { + for (std::vector::const_iterator p = g->second.begin (); p != g->second.end (); ++p) { + cell.shapes (dl.second).insert (*p); + } + } + } + + } +} + +void +DEFImporter::read_pins (db::Layout &layout, db::Cell &design, double scale) +{ + while (test ("-")) { + + take (); // pin name + + std::string net; + std::string dir; + std::map > geometry; + db::Trans trans; + + while (test ("+")) { + + bool flush = false; + + if (test ("DIRECTION")) { + dir = get (); + } else if (test ("NET")) { + net = get (); + } else if (test ("LAYER")) { + + std::string ln = get (); + + while (test ("DESIGNRULEWIDTH") || test ("SPACING")) { + take (); + } + + double x, y; + + test ("("); + x = get_double (); + y = get_double (); + db::Point pt1 = db::Point (db::DPoint (x * scale, y * scale)); + test (")"); + + test ("("); + x = get_double (); + y = get_double (); + db::Point pt2 = db::Point (db::DPoint (x * scale, y * scale)); + test (")"); + + geometry.insert (std::make_pair (ln, std::vector ())).first->second.push_back (db::Polygon (db::Box (pt1, pt2))); + + } else if (test ("POLYGON")) { + + std::string ln = get (); + + while (test ("DESIGNRULEWIDTH") || test ("SPACING")) { + take (); + } + + std::vector points; + + double x = 0.0, y = 0.0; + + while (! test ("+") && ! test (";")) { + + test ("("); + if (! test ("*")) { + x = get_double (); + } + if (! test ("*")) { + y = get_double (); + } + points.push_back (db::Point (db::DPoint (x * scale, y * scale))); + test (")"); + + } + + std::vector &polygons = geometry.insert (std::make_pair (ln, std::vector ())).first->second; + polygons.push_back (db::Polygon ()); + polygons.back ().assign_hull (points.begin (), points.end ()); + + } else if (test ("PLACED") || test ("FIXED") || test ("COVER")) { + + test ("("); + double x = get_double (); + double y = get_double (); + db::Vector d = db::Vector (db::DVector (x * scale, y * scale)); + test (")"); + + db::FTrans ft = get_orient (false /*mandatory*/); + trans = db::Trans (ft.rot (), d); + + } else if (test ("PORT")) { + + flush = true; + + } else { + while (! peek ("+") && ! peek ("-") && ! peek (";")) { + take (); + } + } + + if (flush || ! peek ("+")) { + + // TODO: put a label on every single object? + std::string label = net; + /* don't add the direction currently, a name is sufficient + if (! dir.empty ()) { + label += ":"; + label += dir; + } + */ + + // Produce geometry collected so far + for (std::map >::const_iterator g = geometry.begin (); g != geometry.end (); ++g) { + + std::pair dl = open_layer (layout, g->first, Pins); + if (dl.first) { + + db::properties_id_type prop_id = 0; + if (produce_pin_props ()) { + db::PropertiesRepository::properties_set props; + props.insert (std::make_pair (pin_prop_name_id (), tl::Variant (label))); + prop_id = layout.properties_repository ().properties_id (props); + } + + for (std::vector::const_iterator p = g->second.begin (); p != g->second.end (); ++p) { + db::Polygon pt = p->transformed (trans); + if (prop_id == 0) { + design.shapes (dl.second).insert (pt); + } else { + design.shapes (dl.second).insert (db::PolygonWithProperties (pt, prop_id)); + } + } + + } + + dl = open_layer (layout, g->first, Label); + if (dl.first) { + db::Box bbox; + if (! g->second.empty ()) { + bbox = g->second.back ().box ().transformed (trans); + } + design.shapes (dl.second).insert (db::Text (label.c_str (), db::Trans (db::Vector (bbox.center ())))); + } + + } + + geometry.clear (); + trans = db::Trans (); + + } + + } + + expect (";"); + + } +} + +void +DEFImporter::read_styles (double scale) +{ + while (test ("-")) { + + test ("STYLE"); + + int sn = get_long (); + + std::vector points; + + double x = 0.0, y = 0.0; + + while (! test (";")) { + + test ("("); + if (! test ("*")) { + x = get_double (); + } + if (! test ("*")) { + y = get_double (); + } + points.push_back (db::Point (db::DPoint (x * scale, y * scale))); + test (")"); + + } + + m_styles.insert (std::make_pair (sn, db::Polygon ())).first->second.assign_hull (points.begin (), points.end ()); + + } +} + +void +DEFImporter::read_components (std::list > &instances, double scale) +{ + while (test ("-")) { + + std::string inst_name = get (); + std::string model = get (); + + db::Cell *cell = m_lef_importer.macro_by_name (model); + + while (test ("+")) { + + if (test ("PLACED") || test ("FIXED") || test ("COVER")) { + + test ("("); + double x = get_double (); + double y = get_double (); + db::Point pt = db::Point (db::DPoint (x * scale, y * scale)); + test (")"); + + db::FTrans ft = get_orient (false /*mandatory*/); + db::Vector d = pt - m_lef_importer.macro_bbox_by_name (model).transformed (ft).lower_left (); + + if (cell) { + db::CellInstArray inst (db::CellInst (cell->cell_index ()), db::Trans (ft.rot (), d)); + instances.push_back (std::make_pair (inst_name, inst)); + } else { + warn (tl::to_string (tr ("Macro not found in LEF file: ")) + model); + } + + } else { + while (! peek ("+") && ! peek ("-") && ! peek (";")) { + take (); + } + } + + } + + expect (";"); + + } +} + void DEFImporter::do_read (db::Layout &layout) { double dbu_mic = 1000.0; double scale = 1.0 / (dbu_mic * layout.dbu ()); - std::map styles; - std::map via_desc = m_lef_importer.vias (); + std::map > regions; std::list groups; std::list > instances; + m_via_desc = m_lef_importer.vias (); + m_styles.clear (); + db::Cell &design = layout.cell (layout.add_cell ("TOP")); while (! at_end ()) { @@ -491,429 +1305,13 @@ DEFImporter::do_read (db::Layout &layout) get_long (); expect (";"); - while (test ("-")) { + read_nets (layout, design, scale, specialnets); - std::string net = get (); - std::string nondefaultrule; - std::string stored_netname, stored_nondefaultrule; - std::string taperrule; - bool in_subnet = false; - - db::properties_id_type prop_id = 0; - if (produce_net_props ()) { - db::PropertiesRepository::properties_set props; - props.insert (std::make_pair (net_prop_name_id (), tl::Variant (net))); - prop_id = layout.properties_repository ().properties_id (props); - } - - while (test ("(")) { - while (! test (")")) { - take (); - } - } - - while (test ("+")) { - - bool was_shield = false; - - if (! specialnets && test ("SUBNET")) { - - while (test ("(")) { - while (! test (")")) { - take (); - } - } - - if (! in_subnet) { - stored_netname = net; - stored_nondefaultrule = nondefaultrule; - in_subnet = true; - } - - } else if (! specialnets && test ("NONDEFAULTRULE")) { - - nondefaultrule = get (); - - } else if ((was_shield = test ("SHIELD")) == true || test ("NOSHIELD") || test ("ROUTED") || test ("FIXED") || test ("COVER")) { - - if (was_shield) { - take (); - } - - do { - - std::string ln = get (); - - taperrule.clear (); - const std::string *rulename = 0; - - std::pair w (0, 0); - if (specialnets) { - db::Coord n = db::coord_traits::rounded (get_double () * scale); - w = std::make_pair (n, n); - } - - const db::Polygon *style = 0; - - int sn = std::numeric_limits::max (); - - if (specialnets) { - - while (test ("+")) { - - if (test ("STYLE")) { - sn = get_long (); - } else if (test ("SHAPE")) { - take (); - } - - } - - } else { - - while (true) { - if (test ("TAPER")) { - taperrule.clear (); - rulename = &taperrule; - } else if (test ("TAPERRULE")) { - taperrule = get (); - rulename = &taperrule; - } else if (test ("STYLE")) { - sn = get_long (); - } else { - break; - } - } - - } - - if (! rulename) { - rulename = &nondefaultrule; - } - - std::pair def_ext (0, 0); - - if (! specialnets) { - w = get_wire_width_for_rule (*rulename, ln, layout.dbu ()); - def_ext = get_def_ext (ln, w, layout.dbu ()); - } - - std::map::const_iterator s = styles.find (sn); - if (s != styles.end ()) { - style = &s->second; - } - - std::vector > ext; - std::vector pts; - - double x = 0.0, y = 0.0; - - while (true) { - - if (test ("MASK")) { - // ignore mask spec - get_long (); - } - - if (test ("RECT")) { - - if (! test ("(")) { - error (tl::to_string (tr ("RECT routing specification not followed by coordinate list"))); - } - - // breaks wiring - pts.clear (); - - // rect spec - - double x1 = get_double (); - double y1 = get_double (); - double x2 = get_double (); - double y2 = get_double (); - - test (")"); - - std::pair dl = open_layer (layout, ln, Routing); - if (dl.first) { - - db::Box rect (db::Point (db::DPoint ((x + x1) * scale, (y + y1) * scale)), - db::Point (db::DPoint ((x + x2) * scale, (y + y2) * scale))); - - if (prop_id != 0) { - design.shapes (dl.second).insert (db::object_with_properties (rect, prop_id)); - } else { - design.shapes (dl.second).insert (rect); - } - - } - - } else if (test ("VIRTUAL")) { - - // virtual specs simply create a new segment - pts.clear (); - - } else if (peek ("(")) { - - ext.clear (); - - while (peek ("(") || peek ("MASK")) { - - if (test ("MASK")) { - // ignore MASK spec - get_long (); - } - - if (! test ("(")) { - // We could have a via here: in that case we have swallowed MASK already, but - // since we don't do anything with that, this does not hurt for now. - break; - } - - if (! test ("*")) { - x = get_double (); - } - if (! test ("*")) { - y = get_double (); - } - pts.push_back (db::Point (db::DPoint (x * scale, y * scale))); - std::pair ee = def_ext; - if (! peek (")")) { - db::Coord e = db::coord_traits::rounded (get_double () * scale); - ee.first = ee.second = e; - } - ext.push_back (ee); - - test (")"); - - } - - if (pts.size () > 1) { - - std::pair dl = open_layer (layout, ln, Routing); - if (dl.first) { - - if (! style) { - - // Use the default style (octagon "pen" for non-manhattan segments, paths for - // horizontal/vertical segments). - // Manhattan paths are stitched together from two-point paths if they - - std::pair e = std::max (ext.front (), ext.back ()); - bool is_isotropic = (e.first == e.second && w.first == w.second); - bool was_path = false; - - std::vector::const_iterator pt = pts.begin (); - while (pt != pts.end ()) { - - std::vector::const_iterator pt0 = pt; - do { - ++pt; - } while (pt != pts.end () && is_isotropic && (pt[-1].x () == pt[0].x () || pt[-1].y () == pt[0].y())); - - if (pt - pt0 > 1 || pt0->x () == pt0[1].x () || pt0->y () == pt0[0].y()) { - - if (pt - pt0 == 1) { - ++pt; - } - - db::Coord wxy, wxy_perp, exy; - - if (pt0->x () == pt0 [1].x ()) { - wxy = w.second; - wxy_perp = w.first; - exy = e.second; - } else { - wxy = w.first; - wxy_perp = w.second; - exy = e.first; - } - - db::Path p (pt0, pt, wxy, pt0 == pts.begin () ? exy : (was_path ? wxy_perp / 2 : 0), pt == pts.end () ? exy : 0, false); - if (prop_id != 0) { - design.shapes (dl.second).insert (db::object_with_properties (p, prop_id)); - } else { - design.shapes (dl.second).insert (p); - } - - if (pt == pts.end ()) { - break; - } - - --pt; - - was_path = true; - - } else { - - if (! is_isotropic) { - warn("Anisotropic wire widths not supported for diagonal wires"); - } - - db::Coord s = (w.first + 1) / 2; - db::Coord t = db::Coord (ceil (w.first * (M_SQRT2 - 1) / 2)); - - db::Point octagon[8] = { - db::Point (-s, t), - db::Point (-t, s), - db::Point (t, s), - db::Point (s, t), - db::Point (s, -t), - db::Point (t, -s), - db::Point (-t, -s), - db::Point (-s, -t) - }; - - db::Polygon k; - k.assign_hull (octagon, octagon + sizeof (octagon) / sizeof (octagon[0])); - - db::Polygon p = db::minkowsky_sum (k, db::Edge (*pt0, *pt)); - if (prop_id != 0) { - design.shapes (dl.second).insert (db::object_with_properties (p, prop_id)); - } else { - design.shapes (dl.second).insert (p); - } - - was_path = false; - - } - - } - - } else { - - for (size_t i = 0; i < pts.size () - 1; ++i) { - db::Polygon p = db::minkowsky_sum (*style, db::Edge (pts [i], pts [i + 1])); - if (prop_id != 0) { - design.shapes (dl.second).insert (db::object_with_properties (p, prop_id)); - } else { - design.shapes (dl.second).insert (p); - } - } - - } - - } - - } - - } else if (! peek ("NEW") && ! peek ("+") && ! peek ("-") && ! peek (";")) { - - // indicates a via - std::string vn = get (); - db::FTrans ft = get_orient (true /*optional*/); - - db::Coord dx = 0, dy = 0; - long nx = 1, ny = 1; - - if (specialnets && test ("DO")) { - - nx = std::max (0l, get_long ()); - test ("BY"); - ny = std::max (0l, get_long ()); - test ("STEP"); - dx = db::coord_traits::rounded (get_double () * scale); - dy = db::coord_traits::rounded (get_double () * scale); - - if (nx < 0) { - dx = -dx; - nx = -nx; - } - if (ny < 0) { - dy = -dy; - ny = -ny; - } - - } - - std::map::const_iterator vd = via_desc.find (vn); - if (vd != via_desc.end () && ! pts.empty ()) { - if (nx <= 1 && ny <= 1) { - design.insert (db::CellInstArray (db::CellInst (vd->second.cell->cell_index ()), db::Trans (ft.rot (), db::Vector (pts.back ())))); - } else { - design.insert (db::CellInstArray (db::CellInst (vd->second.cell->cell_index ()), db::Trans (ft.rot (), db::Vector (pts.back ())), db::Vector (dx, 0), db::Vector (0, dy), (unsigned long) nx, (unsigned long) ny)); - } - if (ln == vd->second.m1) { - ln = vd->second.m2; - } else if (ln == vd->second.m2) { - ln = vd->second.m1; - } - } - - if (! specialnets) { - w = get_wire_width_for_rule (*rulename, ln, layout.dbu ()); - def_ext = get_def_ext (ln, w, layout.dbu ()); - } - - // continue a segment with the current point and the new layer - if (pts.size () > 1) { - pts.erase (pts.begin (), pts.end () - 1); - } - - } else { - break; - } - - } - - } while (test ("NEW")); - - if (in_subnet) { - in_subnet = false; - net = stored_netname; - stored_netname.clear (); - nondefaultrule = stored_nondefaultrule; - stored_nondefaultrule.clear (); - } - - } else if (test ("POLYGON")) { - - std::string ln = get (); - - db::Polygon p; - read_polygon (p, scale); - - std::pair dl = open_layer (layout, ln, Routing); - if (dl.first) { - if (prop_id != 0) { - design.shapes (dl.second).insert (db::object_with_properties (p, prop_id)); - } else { - design.shapes (dl.second).insert (p); - } - } - - } else if (test ("RECT")) { - - std::string ln = get (); - - db::Polygon p; - read_rect (p, scale); - - std::pair dl = open_layer (layout, ln, Routing); - if (dl.first) { - if (prop_id != 0) { - design.shapes (dl.second).insert (db::object_with_properties (p, prop_id)); - } else { - design.shapes (dl.second).insert (p); - } - } - - } else { - while (! peek ("+") && ! peek ("-") && ! peek (";")) { - take (); - } - } - - } - - expect (";"); - - } - - test ("END"); + expect ("END"); if (specialnets) { - test ("SPECIALNETS"); + expect ("SPECIALNETS"); } else { - test ("NETS"); + expect ("NETS"); } } else if (test ("VIAS")) { @@ -921,163 +1319,7 @@ DEFImporter::do_read (db::Layout &layout) get_long (); expect (";"); - while (test ("-")) { - - std::string n = get (); - ViaDesc &vd = via_desc.insert (std::make_pair (n, ViaDesc ())).first->second; - - // produce a cell for vias - std::string cellname = "VIA_" + n; - db::Cell &cell = layout.cell (layout.add_cell (cellname.c_str ())); - vd.cell = &cell; - - bool has_via_rule = false; - - db::Vector cutsize, cutspacing; - db::Vector be, te; - db::Vector bo, to; - db::Point offset; - int rows = 1, columns = 1; - std::string pattern; - - std::map > geometry; - std::vector *top = 0, *cut = 0, *bottom = 0; - - while (test ("+")) { - - double x, y; - - if (test ("VIARULE")) { - - has_via_rule = true; - take (); - - } else if (test ("CUTSIZE")) { - - x = get_double (); - y = get_double (); - cutsize = db::Vector (db::DVector (x * scale, y * scale)); - - } else if (test ("CUTSPACING")) { - - x = get_double (); - y = get_double (); - cutspacing = db::Vector (db::DVector (x * scale, y * scale)); - - } else if (test ("ORIGIN")) { - - x = get_double (); - y = get_double (); - offset = db::Point (db::DPoint (x * scale, y * scale)); - - } else if (test ("ENCLOSURE")) { - - x = get_double (); - y = get_double (); - be = db::Vector (db::DVector (x * scale, y * scale)); - - x = get_double (); - y = get_double (); - te = db::Vector (db::DVector (x * scale, y * scale)); - - } else if (test ("OFFSET")) { - - x = get_double (); - y = get_double (); - bo = db::Vector (db::DVector (x * scale, y * scale)); - - x = get_double (); - y = get_double (); - to = db::Vector (db::DVector (x * scale, y * scale)); - - } else if (test ("ROWCOL")) { - - rows = get_long (); - columns = get_long (); - - } else if (test ("PATTERN")) { - - pattern = get (); - - } else if (test ("LAYERS")) { - - std::string bn = get (); - std::string cn = get (); - std::string tn = get (); - - bottom = &geometry.insert (std::make_pair (bn, std::vector ())).first->second; - cut = &geometry.insert (std::make_pair (cn, std::vector ())).first->second; - top = &geometry.insert (std::make_pair (tn, std::vector ())).first->second; - - vd.m1 = bn; - vd.m2 = tn; - - } else if (test ("POLYGON")) { - - std::string ln = get (); - - if (test ("+")) { - expect ("MASK"); - get_long (); - } - - std::vector &polygons = geometry.insert (std::make_pair (ln, std::vector ())).first->second; - polygons.push_back (db::Polygon ()); - read_polygon (polygons.back (), scale); - - } else if (test ("RECT")) { - - std::string ln = get (); - - if (test ("+")) { - expect ("MASK"); - get_long (); - } - - std::vector &polygons = geometry.insert (std::make_pair (ln, std::vector ())).first->second; - polygons.push_back (db::Polygon ()); - read_rect (polygons.back (), scale); - - } - - } - - if (vd.m1.empty () && vd.m2.empty ()) { - - // analyze the layers to find the metals - std::vector routing_layers; - for (std::map >::const_iterator b = geometry.begin (); b != geometry.end (); ++b) { - if (m_lef_importer.is_routing_layer (b->first)) { - routing_layers.push_back (b->first); - } - } - - if (routing_layers.size () == 2) { - vd.m1 = routing_layers[0]; - vd.m2 = routing_layers[1]; - } else { - warn ("Can't determine routing layers for via: " + n); - } - - } - - test (";"); - - if (has_via_rule && top && cut && bottom) { - create_generated_via (*bottom, *cut, *top, - cutsize, cutspacing, be, te, bo, to, offset, rows, columns, pattern); - } - - for (std::map >::const_iterator g = geometry.begin (); g != geometry.end (); ++g) { - std::pair dl = open_layer (layout, g->first, ViaGeometry); - if (dl.first) { - for (std::vector::const_iterator p = g->second.begin (); p != g->second.end (); ++p) { - cell.shapes (dl.second).insert (*p); - } - } - } - - } + read_vias (layout, design, scale); expect ("END"); expect ("VIAS"); @@ -1087,80 +1329,17 @@ DEFImporter::do_read (db::Layout &layout) get_long (); expect (";"); - while (test ("-")) { + read_styles (scale); - test ("STYLE"); - - int sn = get_long (); - - std::vector points; - - double x = 0.0, y = 0.0; - - while (! test (";")) { - - test ("("); - if (! test ("*")) { - x = get_double (); - } - if (! test ("*")) { - y = get_double (); - } - points.push_back (db::Point (db::DPoint (x * scale, y * scale))); - test (")"); - - } - - styles.insert (std::make_pair (sn, db::Polygon ())).first->second.assign_hull (points.begin (), points.end ()); - - } - - test ("END"); - test ("STYLES"); + expect ("END"); + expect ("STYLES"); } else if (test ("COMPONENTS")) { get_long (); expect (";"); - while (test ("-")) { - - std::string inst_name = get (); - std::string model = get (); - - db::Cell *cell = m_lef_importer.macro_by_name (model); - - while (test ("+")) { - - if (test ("PLACED") || test ("FIXED") || test ("COVER")) { - - test ("("); - double x = get_double (); - double y = get_double (); - db::Point pt = db::Point (db::DPoint (x * scale, y * scale)); - test (")"); - - db::FTrans ft = get_orient (false /*mandatory*/); - db::Vector d = pt - m_lef_importer.macro_bbox_by_name (model).transformed (ft).lower_left (); - - if (cell) { - db::CellInstArray inst (db::CellInst (cell->cell_index ()), db::Trans (ft.rot (), d)); - instances.push_back (std::make_pair (inst_name, inst)); - } else { - warn (tl::to_string (tr ("Macro not found in LEF file: ")) + model); - } - - } else { - while (! peek ("+") && ! peek ("-") && ! peek (";")) { - take (); - } - } - - } - - expect (";"); - - } + read_components (instances, scale); expect ("END"); expect ("COMPONENTS"); @@ -1170,154 +1349,7 @@ DEFImporter::do_read (db::Layout &layout) get_long (); expect (";"); - while (test ("-")) { - - take (); // pin name - - std::string net; - std::string dir; - std::map > geometry; - db::Trans trans; - - while (test ("+")) { - - bool flush = false; - - if (test ("DIRECTION")) { - dir = get (); - } else if (test ("NET")) { - net = get (); - } else if (test ("LAYER")) { - - std::string ln = get (); - - while (test ("DESIGNRULEWIDTH") || test ("SPACING")) { - take (); - } - - double x, y; - - test ("("); - x = get_double (); - y = get_double (); - db::Point pt1 = db::Point (db::DPoint (x * scale, y * scale)); - test (")"); - - test ("("); - x = get_double (); - y = get_double (); - db::Point pt2 = db::Point (db::DPoint (x * scale, y * scale)); - test (")"); - - geometry.insert (std::make_pair (ln, std::vector ())).first->second.push_back (db::Polygon (db::Box (pt1, pt2))); - - } else if (test ("POLYGON")) { - - std::string ln = get (); - - while (test ("DESIGNRULEWIDTH") || test ("SPACING")) { - take (); - } - - std::vector points; - - double x = 0.0, y = 0.0; - - while (! test ("+") && ! test (";")) { - - test ("("); - if (! test ("*")) { - x = get_double (); - } - if (! test ("*")) { - y = get_double (); - } - points.push_back (db::Point (db::DPoint (x * scale, y * scale))); - test (")"); - - } - - std::vector &polygons = geometry.insert (std::make_pair (ln, std::vector ())).first->second; - polygons.push_back (db::Polygon ()); - polygons.back ().assign_hull (points.begin (), points.end ()); - - } else if (test ("PLACED") || test ("FIXED") || test ("COVER")) { - - test ("("); - double x = get_double (); - double y = get_double (); - db::Vector d = db::Vector (db::DVector (x * scale, y * scale)); - test (")"); - - db::FTrans ft = get_orient (false /*mandatory*/); - trans = db::Trans (ft.rot (), d); - - } else if (test ("PORT")) { - - flush = true; - - } else { - while (! peek ("+") && ! peek ("-") && ! peek (";")) { - take (); - } - } - - if (flush || ! peek ("+")) { - - // TODO: put a label on every single object? - std::string label = net; - /* don't add the direction currently, a name is sufficient - if (! dir.empty ()) { - label += ":"; - label += dir; - } - */ - - // Produce geometry collected so far - for (std::map >::const_iterator g = geometry.begin (); g != geometry.end (); ++g) { - - std::pair dl = open_layer (layout, g->first, Pins); - if (dl.first) { - - db::properties_id_type prop_id = 0; - if (produce_pin_props ()) { - db::PropertiesRepository::properties_set props; - props.insert (std::make_pair (pin_prop_name_id (), tl::Variant (label))); - prop_id = layout.properties_repository ().properties_id (props); - } - - for (std::vector::const_iterator p = g->second.begin (); p != g->second.end (); ++p) { - db::Polygon pt = p->transformed (trans); - if (prop_id == 0) { - design.shapes (dl.second).insert (pt); - } else { - design.shapes (dl.second).insert (db::PolygonWithProperties (pt, prop_id)); - } - } - - } - - dl = open_layer (layout, g->first, Label); - if (dl.first) { - db::Box bbox; - if (! g->second.empty ()) { - bbox = g->second.back ().box ().transformed (trans); - } - design.shapes (dl.second).insert (db::Text (label.c_str (), db::Trans (db::Vector (bbox.center ())))); - } - - } - - geometry.clear (); - trans = db::Trans (); - - } - - } - - expect (";"); - - } + read_pins (layout, design, scale); expect ("END"); expect ("PINS"); diff --git a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.h b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.h index 0ac133de8..13a8f90cb 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.h +++ b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.h @@ -64,6 +64,8 @@ protected: private: LEFImporter m_lef_importer; std::map > m_nondefault_widths; + std::map m_via_desc; + std::map m_styles; db::FTrans get_orient (bool optional); void read_polygon (db::Polygon &poly, double scale); @@ -75,6 +77,11 @@ private: void read_regions (std::map > ®ions, double scale); void read_groups (std::list &groups, double scale); void read_blockages (db::Layout &layout, db::Cell &design, double scale); + void read_nets (db::Layout &layout, db::Cell &design, double scale, bool specialnets); + void read_vias (db::Layout &layout, db::Cell &design, double scale); + void read_pins (db::Layout &layout, db::Cell &design, double scale); + void read_styles (double scale); + void read_components (std::list > &instances, double scale); }; } From dea3743d5930bb97794c30186ea3f897022b6d58 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sat, 4 Apr 2020 19:31:01 +0200 Subject: [PATCH 016/121] Some refactoring - DEF scanner more modular (3) --- .../lefdef/db_plugin/dbDEFImporter.cc | 663 +++++++++--------- .../lefdef/db_plugin/dbDEFImporter.h | 1 + 2 files changed, 346 insertions(+), 318 deletions(-) diff --git a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc index 54c97fbb2..9486ab3ff 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc @@ -359,6 +359,329 @@ DEFImporter::read_blockages (db::Layout &layout, db::Cell &design, double scale) } } +void +DEFImporter::read_single_net (std::string &nondefaultrule, Layout &layout, db::Cell &design, double scale, db::properties_id_type prop_id, bool specialnets) +{ + std::string taperrule; + + do { + + std::string ln = get (); + + taperrule.clear (); + const std::string *rulename = 0; + + std::pair w (0, 0); + if (specialnets) { + db::Coord n = db::coord_traits::rounded (get_double () * scale); + w = std::make_pair (n, n); + } + + const db::Polygon *style = 0; + + int sn = std::numeric_limits::max (); + + if (specialnets) { + + while (test ("+")) { + + if (test ("STYLE")) { + sn = get_long (); + } else if (test ("SHAPE")) { + take (); + } + + } + + } else { + + while (true) { + if (test ("TAPER")) { + taperrule.clear (); + rulename = &taperrule; + } else if (test ("TAPERRULE")) { + taperrule = get (); + rulename = &taperrule; + } else if (test ("STYLE")) { + sn = get_long (); + } else { + break; + } + } + + } + + if (! rulename) { + rulename = &nondefaultrule; + } + + std::pair def_ext (0, 0); + + if (! specialnets) { + w = get_wire_width_for_rule (*rulename, ln, layout.dbu ()); + def_ext = get_def_ext (ln, w, layout.dbu ()); + } + + std::map::const_iterator s = m_styles.find (sn); + if (s != m_styles.end ()) { + style = &s->second; + } + + std::vector > ext; + std::vector pts; + + double x = 0.0, y = 0.0; + + while (true) { + + if (test ("MASK")) { + // ignore mask spec + get_long (); + } + + if (test ("RECT")) { + + if (! test ("(")) { + error (tl::to_string (tr ("RECT routing specification not followed by coordinate list"))); + } + + // breaks wiring + pts.clear (); + + // rect spec + + double x1 = get_double (); + double y1 = get_double (); + double x2 = get_double (); + double y2 = get_double (); + + test (")"); + + std::pair dl = open_layer (layout, ln, Routing); + if (dl.first) { + + db::Box rect (db::Point (db::DPoint ((x + x1) * scale, (y + y1) * scale)), + db::Point (db::DPoint ((x + x2) * scale, (y + y2) * scale))); + + if (prop_id != 0) { + design.shapes (dl.second).insert (db::object_with_properties (rect, prop_id)); + } else { + design.shapes (dl.second).insert (rect); + } + + } + + } else if (test ("VIRTUAL")) { + + // virtual specs simply create a new segment + pts.clear (); + + } else if (peek ("(")) { + + ext.clear (); + + while (peek ("(") || peek ("MASK")) { + + if (test ("MASK")) { + // ignore MASK spec + get_long (); + } + + if (! test ("(")) { + // We could have a via here: in that case we have swallowed MASK already, but + // since we don't do anything with that, this does not hurt for now. + break; + } + + if (! test ("*")) { + x = get_double (); + } + if (! test ("*")) { + y = get_double (); + } + pts.push_back (db::Point (db::DPoint (x * scale, y * scale))); + std::pair ee = def_ext; + if (! peek (")")) { + db::Coord e = db::coord_traits::rounded (get_double () * scale); + ee.first = ee.second = e; + } + ext.push_back (ee); + + test (")"); + + } + + if (pts.size () > 1) { + + std::pair dl = open_layer (layout, ln, Routing); + if (dl.first) { + + if (! style) { + + // Use the default style (octagon "pen" for non-manhattan segments, paths for + // horizontal/vertical segments). + // Manhattan paths are stitched together from two-point paths if they + + std::pair e = std::max (ext.front (), ext.back ()); + bool is_isotropic = (e.first == e.second && w.first == w.second); + bool was_path = false; + + std::vector::const_iterator pt = pts.begin (); + while (pt != pts.end ()) { + + std::vector::const_iterator pt0 = pt; + do { + ++pt; + } while (pt != pts.end () && is_isotropic && (pt[-1].x () == pt[0].x () || pt[-1].y () == pt[0].y())); + + if (pt - pt0 > 1 || pt0->x () == pt0[1].x () || pt0->y () == pt0[0].y()) { + + if (pt - pt0 == 1) { + ++pt; + } + + db::Coord wxy, wxy_perp, exy; + + if (pt0->x () == pt0 [1].x ()) { + wxy = w.second; + wxy_perp = w.first; + exy = e.second; + } else { + wxy = w.first; + wxy_perp = w.second; + exy = e.first; + } + + db::Path p (pt0, pt, wxy, pt0 == pts.begin () ? exy : (was_path ? wxy_perp / 2 : 0), pt == pts.end () ? exy : 0, false); + if (prop_id != 0) { + design.shapes (dl.second).insert (db::object_with_properties (p, prop_id)); + } else { + design.shapes (dl.second).insert (p); + } + + if (pt == pts.end ()) { + break; + } + + --pt; + + was_path = true; + + } else { + + if (! is_isotropic) { + warn("Anisotropic wire widths not supported for diagonal wires"); + } + + db::Coord s = (w.first + 1) / 2; + db::Coord t = db::Coord (ceil (w.first * (M_SQRT2 - 1) / 2)); + + db::Point octagon[8] = { + db::Point (-s, t), + db::Point (-t, s), + db::Point (t, s), + db::Point (s, t), + db::Point (s, -t), + db::Point (t, -s), + db::Point (-t, -s), + db::Point (-s, -t) + }; + + db::Polygon k; + k.assign_hull (octagon, octagon + sizeof (octagon) / sizeof (octagon[0])); + + db::Polygon p = db::minkowsky_sum (k, db::Edge (*pt0, *pt)); + if (prop_id != 0) { + design.shapes (dl.second).insert (db::object_with_properties (p, prop_id)); + } else { + design.shapes (dl.second).insert (p); + } + + was_path = false; + + } + + } + + } else { + + for (size_t i = 0; i < pts.size () - 1; ++i) { + db::Polygon p = db::minkowsky_sum (*style, db::Edge (pts [i], pts [i + 1])); + if (prop_id != 0) { + design.shapes (dl.second).insert (db::object_with_properties (p, prop_id)); + } else { + design.shapes (dl.second).insert (p); + } + } + + } + + } + + } + + } else if (! peek ("NEW") && ! peek ("+") && ! peek ("-") && ! peek (";")) { + + // indicates a via + std::string vn = get (); + db::FTrans ft = get_orient (true /*optional*/); + + db::Coord dx = 0, dy = 0; + long nx = 1, ny = 1; + + if (specialnets && test ("DO")) { + + nx = std::max (0l, get_long ()); + test ("BY"); + ny = std::max (0l, get_long ()); + test ("STEP"); + dx = db::coord_traits::rounded (get_double () * scale); + dy = db::coord_traits::rounded (get_double () * scale); + + if (nx < 0) { + dx = -dx; + nx = -nx; + } + if (ny < 0) { + dy = -dy; + ny = -ny; + } + + } + + std::map::const_iterator vd = m_via_desc.find (vn); + if (vd != m_via_desc.end () && ! pts.empty ()) { + if (nx <= 1 && ny <= 1) { + design.insert (db::CellInstArray (db::CellInst (vd->second.cell->cell_index ()), db::Trans (ft.rot (), db::Vector (pts.back ())))); + } else { + design.insert (db::CellInstArray (db::CellInst (vd->second.cell->cell_index ()), db::Trans (ft.rot (), db::Vector (pts.back ())), db::Vector (dx, 0), db::Vector (0, dy), (unsigned long) nx, (unsigned long) ny)); + } + if (ln == vd->second.m1) { + ln = vd->second.m2; + } else if (ln == vd->second.m2) { + ln = vd->second.m1; + } + } + + if (! specialnets) { + w = get_wire_width_for_rule (*rulename, ln, layout.dbu ()); + def_ext = get_def_ext (ln, w, layout.dbu ()); + } + + // continue a segment with the current point and the new layer + if (pts.size () > 1) { + pts.erase (pts.begin (), pts.end () - 1); + } + + } else { + break; + } + + } + + } while (test ("NEW")); +} + void DEFImporter::read_nets (db::Layout &layout, db::Cell &design, double scale, bool specialnets) { @@ -367,7 +690,7 @@ DEFImporter::read_nets (db::Layout &layout, db::Cell &design, double scale, bool std::string net = get (); std::string nondefaultrule; std::string stored_netname, stored_nondefaultrule; - std::string taperrule; + db::properties_id_type stored_prop_id; bool in_subnet = false; db::properties_id_type prop_id = 0; @@ -389,6 +712,8 @@ DEFImporter::read_nets (db::Layout &layout, db::Cell &design, double scale, bool if (! specialnets && test ("SUBNET")) { + std::string subnetname = get (); + while (test ("(")) { while (! test (")")) { take (); @@ -398,7 +723,18 @@ DEFImporter::read_nets (db::Layout &layout, db::Cell &design, double scale, bool if (! in_subnet) { stored_netname = net; stored_nondefaultrule = nondefaultrule; + stored_prop_id = prop_id; in_subnet = true; + } else { + warn ("Nested subnets"); + } + + net = stored_netname + "/" + subnetname; + + if (produce_net_props ()) { + db::PropertiesRepository::properties_set props; + props.insert (std::make_pair (net_prop_name_id (), tl::Variant (net))); + prop_id = layout.properties_repository ().properties_id (props); } } else if (! specialnets && test ("NONDEFAULTRULE")) { @@ -411,329 +747,20 @@ DEFImporter::read_nets (db::Layout &layout, db::Cell &design, double scale, bool take (); } - do { - - std::string ln = get (); - - taperrule.clear (); - const std::string *rulename = 0; - - std::pair w (0, 0); - if (specialnets) { - db::Coord n = db::coord_traits::rounded (get_double () * scale); - w = std::make_pair (n, n); - } - - const db::Polygon *style = 0; - - int sn = std::numeric_limits::max (); - - if (specialnets) { - - while (test ("+")) { - - if (test ("STYLE")) { - sn = get_long (); - } else if (test ("SHAPE")) { - take (); - } - - } - - } else { - - while (true) { - if (test ("TAPER")) { - taperrule.clear (); - rulename = &taperrule; - } else if (test ("TAPERRULE")) { - taperrule = get (); - rulename = &taperrule; - } else if (test ("STYLE")) { - sn = get_long (); - } else { - break; - } - } - - } - - if (! rulename) { - rulename = &nondefaultrule; - } - - std::pair def_ext (0, 0); - - if (! specialnets) { - w = get_wire_width_for_rule (*rulename, ln, layout.dbu ()); - def_ext = get_def_ext (ln, w, layout.dbu ()); - } - - std::map::const_iterator s = m_styles.find (sn); - if (s != m_styles.end ()) { - style = &s->second; - } - - std::vector > ext; - std::vector pts; - - double x = 0.0, y = 0.0; - - while (true) { - - if (test ("MASK")) { - // ignore mask spec - get_long (); - } - - if (test ("RECT")) { - - if (! test ("(")) { - error (tl::to_string (tr ("RECT routing specification not followed by coordinate list"))); - } - - // breaks wiring - pts.clear (); - - // rect spec - - double x1 = get_double (); - double y1 = get_double (); - double x2 = get_double (); - double y2 = get_double (); - - test (")"); - - std::pair dl = open_layer (layout, ln, Routing); - if (dl.first) { - - db::Box rect (db::Point (db::DPoint ((x + x1) * scale, (y + y1) * scale)), - db::Point (db::DPoint ((x + x2) * scale, (y + y2) * scale))); - - if (prop_id != 0) { - design.shapes (dl.second).insert (db::object_with_properties (rect, prop_id)); - } else { - design.shapes (dl.second).insert (rect); - } - - } - - } else if (test ("VIRTUAL")) { - - // virtual specs simply create a new segment - pts.clear (); - - } else if (peek ("(")) { - - ext.clear (); - - while (peek ("(") || peek ("MASK")) { - - if (test ("MASK")) { - // ignore MASK spec - get_long (); - } - - if (! test ("(")) { - // We could have a via here: in that case we have swallowed MASK already, but - // since we don't do anything with that, this does not hurt for now. - break; - } - - if (! test ("*")) { - x = get_double (); - } - if (! test ("*")) { - y = get_double (); - } - pts.push_back (db::Point (db::DPoint (x * scale, y * scale))); - std::pair ee = def_ext; - if (! peek (")")) { - db::Coord e = db::coord_traits::rounded (get_double () * scale); - ee.first = ee.second = e; - } - ext.push_back (ee); - - test (")"); - - } - - if (pts.size () > 1) { - - std::pair dl = open_layer (layout, ln, Routing); - if (dl.first) { - - if (! style) { - - // Use the default style (octagon "pen" for non-manhattan segments, paths for - // horizontal/vertical segments). - // Manhattan paths are stitched together from two-point paths if they - - std::pair e = std::max (ext.front (), ext.back ()); - bool is_isotropic = (e.first == e.second && w.first == w.second); - bool was_path = false; - - std::vector::const_iterator pt = pts.begin (); - while (pt != pts.end ()) { - - std::vector::const_iterator pt0 = pt; - do { - ++pt; - } while (pt != pts.end () && is_isotropic && (pt[-1].x () == pt[0].x () || pt[-1].y () == pt[0].y())); - - if (pt - pt0 > 1 || pt0->x () == pt0[1].x () || pt0->y () == pt0[0].y()) { - - if (pt - pt0 == 1) { - ++pt; - } - - db::Coord wxy, wxy_perp, exy; - - if (pt0->x () == pt0 [1].x ()) { - wxy = w.second; - wxy_perp = w.first; - exy = e.second; - } else { - wxy = w.first; - wxy_perp = w.second; - exy = e.first; - } - - db::Path p (pt0, pt, wxy, pt0 == pts.begin () ? exy : (was_path ? wxy_perp / 2 : 0), pt == pts.end () ? exy : 0, false); - if (prop_id != 0) { - design.shapes (dl.second).insert (db::object_with_properties (p, prop_id)); - } else { - design.shapes (dl.second).insert (p); - } - - if (pt == pts.end ()) { - break; - } - - --pt; - - was_path = true; - - } else { - - if (! is_isotropic) { - warn("Anisotropic wire widths not supported for diagonal wires"); - } - - db::Coord s = (w.first + 1) / 2; - db::Coord t = db::Coord (ceil (w.first * (M_SQRT2 - 1) / 2)); - - db::Point octagon[8] = { - db::Point (-s, t), - db::Point (-t, s), - db::Point (t, s), - db::Point (s, t), - db::Point (s, -t), - db::Point (t, -s), - db::Point (-t, -s), - db::Point (-s, -t) - }; - - db::Polygon k; - k.assign_hull (octagon, octagon + sizeof (octagon) / sizeof (octagon[0])); - - db::Polygon p = db::minkowsky_sum (k, db::Edge (*pt0, *pt)); - if (prop_id != 0) { - design.shapes (dl.second).insert (db::object_with_properties (p, prop_id)); - } else { - design.shapes (dl.second).insert (p); - } - - was_path = false; - - } - - } - - } else { - - for (size_t i = 0; i < pts.size () - 1; ++i) { - db::Polygon p = db::minkowsky_sum (*style, db::Edge (pts [i], pts [i + 1])); - if (prop_id != 0) { - design.shapes (dl.second).insert (db::object_with_properties (p, prop_id)); - } else { - design.shapes (dl.second).insert (p); - } - } - - } - - } - - } - - } else if (! peek ("NEW") && ! peek ("+") && ! peek ("-") && ! peek (";")) { - - // indicates a via - std::string vn = get (); - db::FTrans ft = get_orient (true /*optional*/); - - db::Coord dx = 0, dy = 0; - long nx = 1, ny = 1; - - if (specialnets && test ("DO")) { - - nx = std::max (0l, get_long ()); - test ("BY"); - ny = std::max (0l, get_long ()); - test ("STEP"); - dx = db::coord_traits::rounded (get_double () * scale); - dy = db::coord_traits::rounded (get_double () * scale); - - if (nx < 0) { - dx = -dx; - nx = -nx; - } - if (ny < 0) { - dy = -dy; - ny = -ny; - } - - } - - std::map::const_iterator vd = m_via_desc.find (vn); - if (vd != m_via_desc.end () && ! pts.empty ()) { - if (nx <= 1 && ny <= 1) { - design.insert (db::CellInstArray (db::CellInst (vd->second.cell->cell_index ()), db::Trans (ft.rot (), db::Vector (pts.back ())))); - } else { - design.insert (db::CellInstArray (db::CellInst (vd->second.cell->cell_index ()), db::Trans (ft.rot (), db::Vector (pts.back ())), db::Vector (dx, 0), db::Vector (0, dy), (unsigned long) nx, (unsigned long) ny)); - } - if (ln == vd->second.m1) { - ln = vd->second.m2; - } else if (ln == vd->second.m2) { - ln = vd->second.m1; - } - } - - if (! specialnets) { - w = get_wire_width_for_rule (*rulename, ln, layout.dbu ()); - def_ext = get_def_ext (ln, w, layout.dbu ()); - } - - // continue a segment with the current point and the new layer - if (pts.size () > 1) { - pts.erase (pts.begin (), pts.end () - 1); - } - - } else { - break; - } - - } - - } while (test ("NEW")); + read_single_net (nondefaultrule, layout, design, scale, prop_id, specialnets); if (in_subnet) { + in_subnet = false; + net = stored_netname; - stored_netname.clear (); nondefaultrule = stored_nondefaultrule; + prop_id = stored_prop_id; + + stored_netname.clear (); stored_nondefaultrule.clear (); + stored_prop_id = 0; + } } else if (test ("POLYGON")) { diff --git a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.h b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.h index 13a8f90cb..6158da2cf 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.h +++ b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.h @@ -82,6 +82,7 @@ private: void read_pins (db::Layout &layout, db::Cell &design, double scale); void read_styles (double scale); void read_components (std::list > &instances, double scale); + void read_single_net (std::string &nondefaultrule, db::Layout &layout, db::Cell &design, double scale, properties_id_type prop_id, bool specialnets); }; } From 4757ad50449fce73d1341f030a4f8c9609fea84b Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sat, 4 Apr 2020 19:42:01 +0200 Subject: [PATCH 017/121] Some refactoring - DEF scanner more modular (4) --- .../lefdef/db_plugin/dbDEFImporter.cc | 209 +++++++++--------- .../lefdef/db_plugin/dbDEFImporter.h | 1 + 2 files changed, 106 insertions(+), 104 deletions(-) diff --git a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc index 9486ab3ff..4d7da4147 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc @@ -359,6 +359,110 @@ DEFImporter::read_blockages (db::Layout &layout, db::Cell &design, double scale) } } +void +DEFImporter::produce_routing_geometry (db::Cell &design, const Polygon *style, unsigned int layer, properties_id_type prop_id, const std::vector &pts, const std::vector > &ext, std::pair w) +{ + if (! style) { + + // Use the default style (octagon "pen" for non-manhattan segments, paths for + // horizontal/vertical segments). + // Manhattan paths are stitched together from two-point paths if they + + std::pair e = std::max (ext.front (), ext.back ()); + bool is_isotropic = (e.first == e.second && w.first == w.second); + bool was_path = false; + + std::vector::const_iterator pt = pts.begin (); + while (pt != pts.end ()) { + + std::vector::const_iterator pt0 = pt; + do { + ++pt; + } while (pt != pts.end () && is_isotropic && (pt[-1].x () == pt[0].x () || pt[-1].y () == pt[0].y())); + + if (pt - pt0 > 1 || pt0->x () == pt0[1].x () || pt0->y () == pt0[0].y()) { + + if (pt - pt0 == 1) { + ++pt; + } + + db::Coord wxy, wxy_perp, exy; + + if (pt0->x () == pt0 [1].x ()) { + wxy = w.second; + wxy_perp = w.first; + exy = e.second; + } else { + wxy = w.first; + wxy_perp = w.second; + exy = e.first; + } + + db::Path p (pt0, pt, wxy, pt0 == pts.begin () ? exy : (was_path ? wxy_perp / 2 : 0), pt == pts.end () ? exy : 0, false); + if (prop_id != 0) { + design.shapes (layer).insert (db::object_with_properties (p, prop_id)); + } else { + design.shapes (layer).insert (p); + } + + if (pt == pts.end ()) { + break; + } + + --pt; + + was_path = true; + + } else { + + if (! is_isotropic) { + warn("Anisotropic wire widths not supported for diagonal wires"); + } + + db::Coord s = (w.first + 1) / 2; + db::Coord t = db::Coord (ceil (w.first * (M_SQRT2 - 1) / 2)); + + db::Point octagon[8] = { + db::Point (-s, t), + db::Point (-t, s), + db::Point (t, s), + db::Point (s, t), + db::Point (s, -t), + db::Point (t, -s), + db::Point (-t, -s), + db::Point (-s, -t) + }; + + db::Polygon k; + k.assign_hull (octagon, octagon + sizeof (octagon) / sizeof (octagon[0])); + + db::Polygon p = db::minkowsky_sum (k, db::Edge (*pt0, *pt)); + if (prop_id != 0) { + design.shapes (layer).insert (db::object_with_properties (p, prop_id)); + } else { + design.shapes (layer).insert (p); + } + + was_path = false; + + } + + } + + } else { + + for (size_t i = 0; i < pts.size () - 1; ++i) { + db::Polygon p = db::minkowsky_sum (*style, db::Edge (pts [i], pts [i + 1])); + if (prop_id != 0) { + design.shapes (layer).insert (db::object_with_properties (p, prop_id)); + } else { + design.shapes (layer).insert (p); + } + } + + } +} + void DEFImporter::read_single_net (std::string &nondefaultrule, Layout &layout, db::Cell &design, double scale, db::properties_id_type prop_id, bool specialnets) { @@ -512,112 +616,10 @@ DEFImporter::read_single_net (std::string &nondefaultrule, Layout &layout, db::C } if (pts.size () > 1) { - std::pair dl = open_layer (layout, ln, Routing); if (dl.first) { - - if (! style) { - - // Use the default style (octagon "pen" for non-manhattan segments, paths for - // horizontal/vertical segments). - // Manhattan paths are stitched together from two-point paths if they - - std::pair e = std::max (ext.front (), ext.back ()); - bool is_isotropic = (e.first == e.second && w.first == w.second); - bool was_path = false; - - std::vector::const_iterator pt = pts.begin (); - while (pt != pts.end ()) { - - std::vector::const_iterator pt0 = pt; - do { - ++pt; - } while (pt != pts.end () && is_isotropic && (pt[-1].x () == pt[0].x () || pt[-1].y () == pt[0].y())); - - if (pt - pt0 > 1 || pt0->x () == pt0[1].x () || pt0->y () == pt0[0].y()) { - - if (pt - pt0 == 1) { - ++pt; - } - - db::Coord wxy, wxy_perp, exy; - - if (pt0->x () == pt0 [1].x ()) { - wxy = w.second; - wxy_perp = w.first; - exy = e.second; - } else { - wxy = w.first; - wxy_perp = w.second; - exy = e.first; - } - - db::Path p (pt0, pt, wxy, pt0 == pts.begin () ? exy : (was_path ? wxy_perp / 2 : 0), pt == pts.end () ? exy : 0, false); - if (prop_id != 0) { - design.shapes (dl.second).insert (db::object_with_properties (p, prop_id)); - } else { - design.shapes (dl.second).insert (p); - } - - if (pt == pts.end ()) { - break; - } - - --pt; - - was_path = true; - - } else { - - if (! is_isotropic) { - warn("Anisotropic wire widths not supported for diagonal wires"); - } - - db::Coord s = (w.first + 1) / 2; - db::Coord t = db::Coord (ceil (w.first * (M_SQRT2 - 1) / 2)); - - db::Point octagon[8] = { - db::Point (-s, t), - db::Point (-t, s), - db::Point (t, s), - db::Point (s, t), - db::Point (s, -t), - db::Point (t, -s), - db::Point (-t, -s), - db::Point (-s, -t) - }; - - db::Polygon k; - k.assign_hull (octagon, octagon + sizeof (octagon) / sizeof (octagon[0])); - - db::Polygon p = db::minkowsky_sum (k, db::Edge (*pt0, *pt)); - if (prop_id != 0) { - design.shapes (dl.second).insert (db::object_with_properties (p, prop_id)); - } else { - design.shapes (dl.second).insert (p); - } - - was_path = false; - - } - - } - - } else { - - for (size_t i = 0; i < pts.size () - 1; ++i) { - db::Polygon p = db::minkowsky_sum (*style, db::Edge (pts [i], pts [i + 1])); - if (prop_id != 0) { - design.shapes (dl.second).insert (db::object_with_properties (p, prop_id)); - } else { - design.shapes (dl.second).insert (p); - } - } - - } - + produce_routing_geometry (design, style, dl.second, prop_id, pts, ext, w); } - } } else if (! peek ("NEW") && ! peek ("+") && ! peek ("-") && ! peek (";")) { @@ -1467,4 +1469,3 @@ DEFImporter::do_read (db::Layout &layout) } } - diff --git a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.h b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.h index 6158da2cf..8e4a29b78 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.h +++ b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.h @@ -83,6 +83,7 @@ private: void read_styles (double scale); void read_components (std::list > &instances, double scale); void read_single_net (std::string &nondefaultrule, db::Layout &layout, db::Cell &design, double scale, properties_id_type prop_id, bool specialnets); + void produce_routing_geometry (db::Cell &design, const db::Polygon *style, unsigned int layer, properties_id_type prop_id, const std::vector &pts, const std::vector > &ext, std::pair w); }; } From cd801206bc17882795e83e51cd623a4182fdacc3 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sat, 4 Apr 2020 20:28:15 +0200 Subject: [PATCH 018/121] Some refactoring - DEF scanner more modular (5) --- .../lefdef/db_plugin/dbDEFImporter.cc | 89 ++++++++----------- .../lefdef/db_plugin/dbDEFImporter.h | 2 + 2 files changed, 37 insertions(+), 54 deletions(-) diff --git a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc index 4d7da4147..9414c9aeb 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc @@ -92,6 +92,22 @@ DEFImporter::get_orient (bool optional) } } +db::Point +DEFImporter::get_point (double scale) +{ + double x = get_double (); + double y = get_double (); + return db::Point (db::DPoint (x * scale, y * scale)); +} + +db::Vector +DEFImporter::get_vector (double scale) +{ + double x = get_double (); + double y = get_double (); + return db::Vector (db::DVector (x * scale, y * scale)); +} + void DEFImporter::read_polygon (db::Polygon &poly, double scale) { @@ -119,18 +135,12 @@ DEFImporter::read_polygon (db::Polygon &poly, double scale) void DEFImporter::read_rect (db::Polygon &poly, double scale) { - double x = 0.0, y = 0.0; - test ("("); - x = get_double (); - y = get_double (); - db::Point pt1 = db::Point (db::DPoint (x * scale, y * scale)); + db::Point pt1 = get_point (scale); test (")"); test ("("); - x = get_double (); - y = get_double (); - db::Point pt2 = db::Point (db::DPoint (x * scale, y * scale)); + db::Point pt2 = get_point (scale); test (")"); poly = db::Polygon (db::Box (pt1, pt2)); @@ -174,13 +184,11 @@ DEFImporter::get_def_ext (const std::string &ln, const std::pair points; + std::vector points; while (! test (";")) { test ("("); - double x = get_double (); - double y = get_double (); - points.push_back (db::DPoint (x * scale, y * scale)); + points.push_back (get_point (scale)); test (")"); } @@ -190,11 +198,11 @@ DEFImporter::read_diearea (db::Layout &layout, db::Cell &design, double scale) std::pair dl = open_layer (layout, std::string (), Outline); if (dl.first) { if (points.size () == 2) { - design.shapes (dl.second).insert (db::Box (db::DBox (points [0], points [1]))); + design.shapes (dl.second).insert (db::Box (points [0], points [1])); } else { - db::DPolygon p; + db::Polygon p; p.assign_hull (points.begin (), points.end ()); - design.shapes (dl.second).insert (db::Polygon (p)); + design.shapes (dl.second).insert (p); } } @@ -564,6 +572,7 @@ DEFImporter::read_single_net (std::string &nondefaultrule, Layout &layout, db::C std::pair dl = open_layer (layout, ln, Routing); if (dl.first) { + db::Point p (x, y); db::Box rect (db::Point (db::DPoint ((x + x1) * scale, (y + y1) * scale)), db::Point (db::DPoint ((x + x2) * scale, (y + y2) * scale))); @@ -837,8 +846,6 @@ DEFImporter::read_vias (db::Layout &layout, db::Cell & /*design*/, double scale) while (test ("+")) { - double x, y; - if (test ("VIARULE")) { has_via_rule = true; @@ -846,41 +853,25 @@ DEFImporter::read_vias (db::Layout &layout, db::Cell & /*design*/, double scale) } else if (test ("CUTSIZE")) { - x = get_double (); - y = get_double (); - cutsize = db::Vector (db::DVector (x * scale, y * scale)); + cutsize = get_vector (scale); } else if (test ("CUTSPACING")) { - x = get_double (); - y = get_double (); - cutspacing = db::Vector (db::DVector (x * scale, y * scale)); + cutspacing = get_vector (scale); } else if (test ("ORIGIN")) { - x = get_double (); - y = get_double (); - offset = db::Point (db::DPoint (x * scale, y * scale)); + offset = get_point (scale); } else if (test ("ENCLOSURE")) { - x = get_double (); - y = get_double (); - be = db::Vector (db::DVector (x * scale, y * scale)); - - x = get_double (); - y = get_double (); - te = db::Vector (db::DVector (x * scale, y * scale)); + be = get_vector (scale); + te = get_vector (scale); } else if (test ("OFFSET")) { - x = get_double (); - y = get_double (); - bo = db::Vector (db::DVector (x * scale, y * scale)); - - x = get_double (); - y = get_double (); - to = db::Vector (db::DVector (x * scale, y * scale)); + bo = get_vector (scale); + to = get_vector (scale); } else if (test ("ROWCOL")) { @@ -1000,18 +991,12 @@ DEFImporter::read_pins (db::Layout &layout, db::Cell &design, double scale) take (); } - double x, y; - test ("("); - x = get_double (); - y = get_double (); - db::Point pt1 = db::Point (db::DPoint (x * scale, y * scale)); + db::Point pt1 = get_point (scale); test (")"); test ("("); - x = get_double (); - y = get_double (); - db::Point pt2 = db::Point (db::DPoint (x * scale, y * scale)); + db::Point pt2 = get_point (scale); test (")"); geometry.insert (std::make_pair (ln, std::vector ())).first->second.push_back (db::Polygon (db::Box (pt1, pt2))); @@ -1049,9 +1034,7 @@ DEFImporter::read_pins (db::Layout &layout, db::Cell &design, double scale) } else if (test ("PLACED") || test ("FIXED") || test ("COVER")) { test ("("); - double x = get_double (); - double y = get_double (); - db::Vector d = db::Vector (db::DVector (x * scale, y * scale)); + db::Vector d = get_vector (scale); test (")"); db::FTrans ft = get_orient (false /*mandatory*/); @@ -1172,9 +1155,7 @@ DEFImporter::read_components (std::list > if (test ("PLACED") || test ("FIXED") || test ("COVER")) { test ("("); - double x = get_double (); - double y = get_double (); - db::Point pt = db::Point (db::DPoint (x * scale, y * scale)); + db::Point pt = get_point (scale); test (")"); db::FTrans ft = get_orient (false /*mandatory*/); diff --git a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.h b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.h index 8e4a29b78..0a0b5b0ba 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.h +++ b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.h @@ -84,6 +84,8 @@ private: void read_components (std::list > &instances, double scale); void read_single_net (std::string &nondefaultrule, db::Layout &layout, db::Cell &design, double scale, properties_id_type prop_id, bool specialnets); void produce_routing_geometry (db::Cell &design, const db::Polygon *style, unsigned int layer, properties_id_type prop_id, const std::vector &pts, const std::vector > &ext, std::pair w); + db::Point get_point (double scale); + db::Vector get_vector (double scale); }; } From df7c530013bdde6226c981c3f8742995e5606199 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sun, 5 Apr 2020 22:56:04 +0200 Subject: [PATCH 019/121] Bugfix for the net reader of DEF - wasn't properly reading diagonal parts. --- .../lefdef/db_plugin/dbDEFImporter.cc | 33 +++++++++++-------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc index 9414c9aeb..657f7e581 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc @@ -374,7 +374,8 @@ DEFImporter::produce_routing_geometry (db::Cell &design, const Polygon *style, u // Use the default style (octagon "pen" for non-manhattan segments, paths for // horizontal/vertical segments). - // Manhattan paths are stitched together from two-point paths if they + // Manhattan paths are stitched together from two-point paths if the + // horizontal and vertical width is different. std::pair e = std::max (ext.front (), ext.back ()); bool is_isotropic = (e.first == e.second && w.first == w.second); @@ -384,15 +385,25 @@ DEFImporter::produce_routing_geometry (db::Cell &design, const Polygon *style, u while (pt != pts.end ()) { std::vector::const_iterator pt0 = pt; - do { - ++pt; - } while (pt != pts.end () && is_isotropic && (pt[-1].x () == pt[0].x () || pt[-1].y () == pt[0].y())); + ++pt; + if (pt == pts.end ()) { + break; + } - if (pt - pt0 > 1 || pt0->x () == pt0[1].x () || pt0->y () == pt0[0].y()) { - - if (pt - pt0 == 1) { + bool multipart = false; + if (is_isotropic) { + while (pt != pts.end () && (pt[-1].x () == pt[0].x () || pt[-1].y () == pt[0].y())) { ++pt; + multipart = true; } + if (multipart) { + --pt; + } + } + + // The next part is the interval [pt0..pt] (pt inclusive) + + if (multipart || (pt0->x () == pt0[1].x () || pt0->y () == pt0[1].y())) { db::Coord wxy, wxy_perp, exy; @@ -406,19 +417,13 @@ DEFImporter::produce_routing_geometry (db::Cell &design, const Polygon *style, u exy = e.first; } - db::Path p (pt0, pt, wxy, pt0 == pts.begin () ? exy : (was_path ? wxy_perp / 2 : 0), pt == pts.end () ? exy : 0, false); + db::Path p (pt0, pt + 1, wxy, pt0 == pts.begin () ? exy : (was_path ? wxy_perp / 2 : 0), pt + 1 == pts.end () ? exy : 0, false); if (prop_id != 0) { design.shapes (layer).insert (db::object_with_properties (p, prop_id)); } else { design.shapes (layer).insert (p); } - if (pt == pts.end ()) { - break; - } - - --pt; - was_path = true; } else { From 3ada29d6067b671682218b77a07ece5dda9a0220 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sun, 5 Apr 2020 23:49:19 +0200 Subject: [PATCH 020/121] Some bugfixes for LEF/DEF reader for special nets (extension handling) --- .../lefdef/db_plugin/dbDEFImporter.cc | 35 ++++++++++++------ .../lefdef/unit_tests/dbLEFDEFImportTests.cc | 6 +++ testdata/lefdef/specialnets_geo/au.oas.gz | Bin 337 -> 337 bytes 3 files changed, 30 insertions(+), 11 deletions(-) diff --git a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc index 657f7e581..4b65f2ade 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc @@ -377,9 +377,8 @@ DEFImporter::produce_routing_geometry (db::Cell &design, const Polygon *style, u // Manhattan paths are stitched together from two-point paths if the // horizontal and vertical width is different. - std::pair e = std::max (ext.front (), ext.back ()); - bool is_isotropic = (e.first == e.second && w.first == w.second); - bool was_path = false; + bool is_isotropic = (w.first == w.second); + bool was_path_before = false; std::vector::const_iterator pt = pts.begin (); while (pt != pts.end ()) { @@ -405,26 +404,39 @@ DEFImporter::produce_routing_geometry (db::Cell &design, const Polygon *style, u if (multipart || (pt0->x () == pt0[1].x () || pt0->y () == pt0[1].y())) { - db::Coord wxy, wxy_perp, exy; + db::Coord wxy, wxy_perp; if (pt0->x () == pt0 [1].x ()) { wxy = w.second; wxy_perp = w.first; - exy = e.second; } else { wxy = w.first; wxy_perp = w.second; - exy = e.first; } - db::Path p (pt0, pt + 1, wxy, pt0 == pts.begin () ? exy : (was_path ? wxy_perp / 2 : 0), pt + 1 == pts.end () ? exy : 0, false); + // compute begin extension + db::Coord be = 0; + if (pt0 == pts.begin ()) { + be = ext.front ().first; + } else if (was_path_before) { + // provides the overlap to the previous segment + be = wxy_perp / 2; + } + + // compute end extension + db::Coord ee = 0; + if (pt + 1 == pts.end ()) { + ee = ext.back ().first; + } + + db::Path p (pt0, pt + 1, wxy, be, ee, false); if (prop_id != 0) { design.shapes (layer).insert (db::object_with_properties (p, prop_id)); } else { design.shapes (layer).insert (p); } - was_path = true; + was_path_before = true; } else { @@ -456,7 +468,7 @@ DEFImporter::produce_routing_geometry (db::Cell &design, const Polygon *style, u design.shapes (layer).insert (p); } - was_path = false; + was_path_before = false; } @@ -596,8 +608,6 @@ DEFImporter::read_single_net (std::string &nondefaultrule, Layout &layout, db::C } else if (peek ("(")) { - ext.clear (); - while (peek ("(") || peek ("MASK")) { if (test ("MASK")) { @@ -689,6 +699,9 @@ DEFImporter::read_single_net (std::string &nondefaultrule, Layout &layout, db::C pts.erase (pts.begin (), pts.end () - 1); } + ext.clear (); + ext.push_back (def_ext); + } else { break; } diff --git a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc index fd9b1b896..5ff589fb1 100644 --- a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc +++ b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc @@ -112,6 +112,7 @@ static void run_test (tl::TestBase *_this, const char *lef_dir, const char *file tl::OutputStream stream (tmp_file); db::SaveLayoutOptions options; options.set_format ("OASIS"); + options.set_option_by_name ("oasis_permissive", tl::Variant (true)); db::Writer writer (options); writer.write (layout, stream); } @@ -244,6 +245,11 @@ TEST(20) run_test (_this, "def11", "lef:test.lef+def:test.def", "au.oas.gz", default_options ()); } +TEST(21) +{ + run_test (_this, "def12", "lef:test.lef+def:test.def", "au.oas.gz", default_options ()); +} + TEST(100) { run_test (_this, "issue-172", "lef:in.lef+def:in.def", "au.oas.gz", default_options (), false); diff --git a/testdata/lefdef/specialnets_geo/au.oas.gz b/testdata/lefdef/specialnets_geo/au.oas.gz index 994644702511b980169ee5e6379707783cf41b93..9a20c2234753451d7489d7dc87b5c1710ecb9b94 100644 GIT binary patch delta 73 zcmV-P0Ji_p0?`5uABzYGUQdc%00VSwaFGn%0m+f-B_XqmFap(qq%2t2Pca>0I>FSy fe~#%G(;22Mj8~XI!bm!kF##9|rE;c>lL7z$3ymB< delta 73 zcmV-P0Ji_p0?`5tABzYG+OUIO00UulkqzAe#gXeJBJ+!gFai~V0I>FSy fe~#%G(;22Mj8~XI!bn<^F##9|7~`e>lmY+%J98aZ From 9c62bb015f481c62d55e3b6a4bc65aa70a41ad5b Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sun, 5 Apr 2020 23:56:43 +0200 Subject: [PATCH 021/121] Include BLOCKAGE in map file LEF/DEF, becoming case insensitive for purpose --- src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc index bd79bb5af..8ffdc60df 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc @@ -101,6 +101,7 @@ read_map_file (const std::string &path, db::LEFDEFLayerDelegate &layers) purpose_translation ["SPNET"] = "NET"; purpose_translation ["NET"] = "NET"; purpose_translation ["VIA"] = "VIA"; + purpose_translation ["BLOCKAGE"] = "BLK"; while (! ts.at_end ()) { @@ -156,7 +157,7 @@ read_map_file (const std::string &path, db::LEFDEFLayerDelegate &layers) std::vector translated_purposes; std::vector purposes = tl::split (w2, ","); for (std::vector::const_iterator p = purposes.begin (); p != purposes.end (); ++p) { - std::map::const_iterator i = purpose_translation.find (*p); + std::map::const_iterator i = purpose_translation.find (tl::to_upper_case (*p)); if (i != purpose_translation.end ()) { translated_purposes.push_back (i->second); } From 61714090e3e6f85c143ddde107a818d80c5ef2fd Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Tue, 14 Apr 2020 22:48:18 +0200 Subject: [PATCH 022/121] Maybe fixed performance issue: usually it's not a good idea to iterate the layout's hierarchy while deleting something from it. --- src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc index 4b65f2ade..fb3902d48 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc @@ -1397,6 +1397,8 @@ DEFImporter::do_read (db::Layout &layout) if (! groups.empty ()) { + db::LayoutLocker locker (&layout); + others_cell = &layout.cell (layout.add_cell ("NOGROUP")); design.insert (db::CellInstArray (others_cell->cell_index (), db::Trans ())); From 921af5264327fcfb013ff7ce3d2831793b2d44dc Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Tue, 14 Apr 2020 23:15:08 +0200 Subject: [PATCH 023/121] DEF reader bugfix: wasn't reading SPECIALNETS + ROUTED + RECT --- .../lefdef/db_plugin/dbDEFImporter.cc | 101 +++++++++++------- testdata/lefdef/specialnets_geo/test.def | 3 +- 2 files changed, 62 insertions(+), 42 deletions(-) diff --git a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc index fb3902d48..08edc10cc 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc @@ -770,15 +770,70 @@ DEFImporter::read_nets (db::Layout &layout, db::Cell &design, double scale, bool nondefaultrule = get (); - } else if ((was_shield = test ("SHIELD")) == true || test ("NOSHIELD") || test ("ROUTED") || test ("FIXED") || test ("COVER")) { + } else { - if (was_shield) { - take (); + bool prefixed = false; + + if ((was_shield = test ("SHIELD")) == true || test ("NOSHIELD") || test ("ROUTED") || test ("FIXED") || test ("COVER")) { + if (was_shield) { + take (); + } + prefixed = true; } - read_single_net (nondefaultrule, layout, design, scale, prop_id, specialnets); + bool any = false; - if (in_subnet) { + if (test ("POLYGON")) { + + std::string ln = get (); + + db::Polygon p; + read_polygon (p, scale); + + std::pair dl = open_layer (layout, ln, Routing); + if (dl.first) { + if (prop_id != 0) { + design.shapes (dl.second).insert (db::object_with_properties (p, prop_id)); + } else { + design.shapes (dl.second).insert (p); + } + } + + any = true; + + } else if (test ("RECT")) { + + std::string ln = get (); + + db::Polygon p; + read_rect (p, scale); + + std::pair dl = open_layer (layout, ln, Routing); + if (dl.first) { + if (prop_id != 0) { + design.shapes (dl.second).insert (db::object_with_properties (p, prop_id)); + } else { + design.shapes (dl.second).insert (p); + } + } + + any = true; + + } else if (prefixed) { + + read_single_net (nondefaultrule, layout, design, scale, prop_id, specialnets); + any = true; + + } else { + + // lazily skip everything else + while (! peek ("+") && ! peek ("-") && ! peek (";")) { + take (); + } + + } + + if (any && in_subnet) { in_subnet = false; @@ -792,42 +847,6 @@ DEFImporter::read_nets (db::Layout &layout, db::Cell &design, double scale, bool } - } else if (test ("POLYGON")) { - - std::string ln = get (); - - db::Polygon p; - read_polygon (p, scale); - - std::pair dl = open_layer (layout, ln, Routing); - if (dl.first) { - if (prop_id != 0) { - design.shapes (dl.second).insert (db::object_with_properties (p, prop_id)); - } else { - design.shapes (dl.second).insert (p); - } - } - - } else if (test ("RECT")) { - - std::string ln = get (); - - db::Polygon p; - read_rect (p, scale); - - std::pair dl = open_layer (layout, ln, Routing); - if (dl.first) { - if (prop_id != 0) { - design.shapes (dl.second).insert (db::object_with_properties (p, prop_id)); - } else { - design.shapes (dl.second).insert (p); - } - } - - } else { - while (! peek ("+") && ! peek ("-") && ! peek (";")) { - take (); - } } } diff --git a/testdata/lefdef/specialnets_geo/test.def b/testdata/lefdef/specialnets_geo/test.def index 2874f0491..0686c4fec 100644 --- a/testdata/lefdef/specialnets_geo/test.def +++ b/testdata/lefdef/specialnets_geo/test.def @@ -16,8 +16,9 @@ VIAS 1 ; END VIAS SPECIALNETS 1 ; - dummy + + ROUTED RECT M2 ( 350 0 ) ( 200 100 ) + POLYGON M1 ( 300 0 ) ( 300 50 ) ( 350 50 ) ( 400 100 ) ( 400 0 ) - + POLYGON M2 ( 300 150 ) ( 300 200 ) ( 350 200 ) ( 400 250 ) ( 400 150 ) + + ROUTED POLYGON M2 ( 300 150 ) ( 300 200 ) ( 350 200 ) ( 400 250 ) ( 400 150 ) + RECT M1 ( 0 0 ) ( 100 200 ) + ROUTED M1 30 ( 0 0 15 ) ( 100 0 0 ) VIA1_dummy ( 100 100 10 ) + ROUTED M2 50 + SHAPE RING + STYLE 1 ( 0 100 ) ( 100 200 ) ( 200 200 ) From d4a333966b4d108530d37c2496d3aeb62d422551 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Tue, 14 Apr 2020 23:16:43 +0200 Subject: [PATCH 024/121] Updated testdata for last patch. --- testdata/lefdef/specialnets_geo/au.oas.gz | Bin 337 -> 346 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/testdata/lefdef/specialnets_geo/au.oas.gz b/testdata/lefdef/specialnets_geo/au.oas.gz index 9a20c2234753451d7489d7dc87b5c1710ecb9b94..cffe301036e98a0a255fff963ec96a3908949e8a 100644 GIT binary patch delta 62 zcmV-E0Kxy!0@?xxABzYG7bupo2POe6;KCjJ2be&@J^Z3QAjOPKCm7cN4P^kSKr(X; UlPpuiNCpfH08r9-!k+>F0HVbd-v9sr delta 53 zcmV-50LuT`0?`5oABzYGUQdd#2POd|K*C5m)-b`lL7z$9d;D2 From 54cf57c7728f46bbfcdabecbba32b32e6106ffc4 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sat, 18 Apr 2020 17:58:50 +0200 Subject: [PATCH 025/121] LEF/DEF enhancements (via cellname suffix configurable, group separation disabled by default) Two new reader options: 1.) via cell name prefix (default is "VIA_"). This name is put in front of the via name to form the cell cell name 2.) group separation disabled by default. Groups are not put into individual parent cells by default. --- .../lefdef/db_plugin/dbDEFImporter.cc | 35 +++++++++-- .../lefdef/db_plugin/dbDEFImporter.h | 2 +- .../lefdef/db_plugin/dbLEFDEFImporter.cc | 52 ++++++++++----- .../lefdef/db_plugin/dbLEFDEFImporter.h | 63 ++++++++++++++++--- .../lefdef/db_plugin/dbLEFDEFPlugin.cc | 24 +++---- .../lefdef/db_plugin/dbLEFImporter.cc | 17 +++-- .../lefdef/db_plugin/gsiDeclDbLEFDEF.cc | 26 ++++++++ .../LEFDEFTechnologyComponentEditor.ui | 53 ++++++++++++---- .../lefdef/lay_plugin/layLEFDEFImport.cc | 2 +- .../lay_plugin/layLEFDEFImportDialogs.cc | 4 ++ .../lefdef/unit_tests/dbLEFDEFImportTests.cc | 8 ++- testdata/ruby/dbReaders.rb | 8 +++ 12 files changed, 230 insertions(+), 64 deletions(-) diff --git a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc index 4b65f2ade..806259f55 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc @@ -59,9 +59,9 @@ DEFImporter::DEFImporter () } void -DEFImporter::read_lef (tl::InputStream &stream, db::Layout &layout, LEFDEFLayerDelegate &ld) +DEFImporter::read_lef (tl::InputStream &stream, db::Layout &layout, LEFDEFReaderState &state) { - m_lef_importer.read (stream, layout, ld); + m_lef_importer.read (stream, layout, state); } @@ -846,8 +846,9 @@ DEFImporter::read_vias (db::Layout &layout, db::Cell & /*design*/, double scale) ViaDesc &vd = m_via_desc.insert (std::make_pair (n, ViaDesc ())).first->second; // produce a cell for vias - std::string cellname = "VIA_" + n; + std::string cellname = options ().via_cellname_prefix () + n; db::Cell &cell = layout.cell (layout.add_cell (cellname.c_str ())); + reader_state ()->register_via_cell (n, &cell); vd.cell = &cell; bool has_via_rule = false; @@ -1395,7 +1396,7 @@ DEFImporter::do_read (db::Layout &layout) db::Cell *others_cell = &design; - if (! groups.empty ()) { + if (! groups.empty () && options ().separate_groups ()) { others_cell = &layout.cell (layout.add_cell ("NOGROUP")); design.insert (db::CellInstArray (others_cell->cell_index (), db::Trans ())); @@ -1410,16 +1411,21 @@ DEFImporter::do_read (db::Layout &layout) if (! g->region_name.empty ()) { - std::map >::const_iterator r = regions.find (g->region_name); + std::map >::iterator r = regions.find (g->region_name); if (r == regions.end ()) { - warn (tl::sprintf (tl::to_string (tr ("Not a valid region name: %s in group %s")), g->region_name, g->name)); + + warn (tl::sprintf (tl::to_string (tr ("Not a valid region name or region is already used: %s in group %s")), g->region_name, g->name)); + } else { + std::pair dl = open_layer (layout, std::string (), Region); if (dl.first) { for (std::vector::const_iterator p = r->second.begin (); p != r->second.end (); ++p) { group_cell->shapes (dl.second).insert (*p); } } + regions.erase (r); + } } @@ -1451,6 +1457,23 @@ DEFImporter::do_read (db::Layout &layout) } + // put all remaining regions into the "others_cell" which is the top cell if there are no groups. + + if (! regions.empty ()) { + + std::pair dl = open_layer (layout, std::string (), Region); + if (dl.first) { + + for (std::map >::const_iterator r = regions.begin (); r != regions.end (); ++r) { + for (std::vector::const_iterator p = r->second.begin (); p != r->second.end (); ++p) { + others_cell->shapes (dl.second).insert (*p); + } + } + + } + + } + // treat all remaining cells and put them into the "others_cell" which is the top cell // if there are no groups. diff --git a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.h b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.h index 0a0b5b0ba..b0f421ad8 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.h +++ b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.h @@ -56,7 +56,7 @@ public: * This method reads the layout specified into the given layout. * Multiple LEF files can be read. */ - void read_lef (tl::InputStream &stream, db::Layout &layout, LEFDEFLayerDelegate &ld); + void read_lef (tl::InputStream &stream, db::Layout &layout, LEFDEFReaderState &state); protected: void do_read (db::Layout &layout); diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc index eb895007b..a574da6a7 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc @@ -52,6 +52,7 @@ LEFDEFReaderOptions::LEFDEFReaderOptions () m_produce_via_geometry (true), m_via_geometry_suffix (""), m_via_geometry_datatype (0), + m_via_cellname_prefix ("VIA_"), m_produce_pins (true), m_pins_suffix (".PIN"), m_pins_datatype (2), @@ -66,7 +67,8 @@ LEFDEFReaderOptions::LEFDEFReaderOptions () m_labels_datatype (1), m_produce_routing (true), m_routing_suffix (""), - m_routing_datatype (0) + m_routing_datatype (0), + m_separate_groups (false) { // .. nothing yet .. } @@ -90,6 +92,7 @@ LEFDEFReaderOptions::LEFDEFReaderOptions (const LEFDEFReaderOptions &d) m_produce_via_geometry (d.m_produce_via_geometry), m_via_geometry_suffix (d.m_via_geometry_suffix), m_via_geometry_datatype (d.m_via_geometry_datatype), + m_via_cellname_prefix (d.m_via_cellname_prefix), m_produce_pins (d.m_produce_pins), m_pins_suffix (d.m_pins_suffix), m_pins_datatype (d.m_pins_datatype), @@ -105,6 +108,7 @@ LEFDEFReaderOptions::LEFDEFReaderOptions (const LEFDEFReaderOptions &d) m_produce_routing (d.m_produce_routing), m_routing_suffix (d.m_routing_suffix), m_routing_datatype (d.m_routing_datatype), + m_separate_groups (d.m_separate_groups), m_lef_files (d.m_lef_files) { // .. nothing yet .. @@ -126,7 +130,7 @@ LEFDEFReaderOptions::format_name () const // ----------------------------------------------------------------------------------- // LEFDEFLayerDelegate implementation -LEFDEFLayerDelegate::LEFDEFLayerDelegate (const LEFDEFReaderOptions *tc) +LEFDEFReaderState::LEFDEFReaderState (const LEFDEFReaderOptions *tc) : m_create_layers (true), m_laynum (1), mp_tech_comp (tc) { if (tc) { @@ -136,14 +140,14 @@ LEFDEFLayerDelegate::LEFDEFLayerDelegate (const LEFDEFReaderOptions *tc) } void -LEFDEFLayerDelegate::register_layer (const std::string &ln) +LEFDEFReaderState::register_layer (const std::string &ln) { m_default_number.insert (std::make_pair (ln, m_laynum)); ++m_laynum; } std::pair -LEFDEFLayerDelegate::open_layer (db::Layout &layout, const std::string &n, LayerPurpose purpose) +LEFDEFReaderState::open_layer (db::Layout &layout, const std::string &n, LayerPurpose purpose) { if (purpose == Outline || purpose == PlacementBlockage || purpose == Region) { @@ -327,13 +331,13 @@ LEFDEFLayerDelegate::open_layer (db::Layout &layout, const std::string &n, Layer } void -LEFDEFLayerDelegate::prepare (db::Layout &layout) +LEFDEFReaderState::prepare (db::Layout &layout) { m_layer_map.prepare (layout); } void -LEFDEFLayerDelegate::finish (db::Layout &layout) +LEFDEFReaderState::finish (db::Layout &layout) { int lnum = 0; @@ -393,11 +397,24 @@ LEFDEFLayerDelegate::finish (db::Layout &layout) } } +void +LEFDEFReaderState::register_via_cell (const std::string &vn, db::Cell *cell) +{ + m_via_cells [vn] = cell; +} + +db::Cell * +LEFDEFReaderState::via_cell (const std::string &vn) +{ + std::map::const_iterator i = m_via_cells.find (vn); + return i != m_via_cells.end () ? i->second : 0; +} + // ----------------------------------------------------------------------------------- // LEFDEFImporter implementation LEFDEFImporter::LEFDEFImporter () - : mp_progress (0), mp_stream (0), mp_layer_delegate (0), + : mp_progress (0), mp_stream (0), mp_reader_state (0), m_produce_net_props (false), m_net_prop_name_id (0), m_produce_inst_props (false), m_inst_prop_name_id (0), m_produce_pin_props (false), m_pin_prop_name_id (0) @@ -411,7 +428,7 @@ LEFDEFImporter::~LEFDEFImporter () } void -LEFDEFImporter::read (tl::InputStream &stream, db::Layout &layout, LEFDEFLayerDelegate &ld) +LEFDEFImporter::read (tl::InputStream &stream, db::Layout &layout, LEFDEFReaderState &state) { m_fn = stream.filename (); @@ -420,34 +437,39 @@ LEFDEFImporter::read (tl::InputStream &stream, db::Layout &layout, LEFDEFLayerDe progress.set_format_unit (1000.0); progress.set_unit (10000.0); + mp_reader_state = &state; + + if (state.tech_comp ()) { + m_options = *state.tech_comp (); + } + m_produce_net_props = false; m_net_prop_name_id = 0; - if (ld.tech_comp () && ld.tech_comp ()->produce_net_names ()) { + if (m_options.produce_net_names ()) { m_produce_net_props = true; - m_net_prop_name_id = layout.properties_repository ().prop_name_id (ld.tech_comp ()->net_property_name ()); + m_net_prop_name_id = layout.properties_repository ().prop_name_id (m_options.net_property_name ()); } m_produce_inst_props = false; m_inst_prop_name_id = 0; - if (ld.tech_comp () && ld.tech_comp ()->produce_inst_names ()) { + if (m_options.produce_inst_names ()) { m_produce_inst_props = true; - m_inst_prop_name_id = layout.properties_repository ().prop_name_id (ld.tech_comp ()->inst_property_name ()); + m_inst_prop_name_id = layout.properties_repository ().prop_name_id (m_options.inst_property_name ()); } m_produce_pin_props = false; m_pin_prop_name_id = 0; - if (ld.tech_comp () && ld.tech_comp ()->produce_pin_names ()) { + if (m_options.produce_pin_names ()) { m_produce_pin_props = true; - m_pin_prop_name_id = layout.properties_repository ().prop_name_id (ld.tech_comp ()->pin_property_name ()); + m_pin_prop_name_id = layout.properties_repository ().prop_name_id (m_options.pin_property_name ()); } try { mp_progress = &progress; - mp_layer_delegate = &ld; mp_stream = new tl::TextInputStream (stream); do_read (layout); diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h index fe4e40b6b..c6ca07a68 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h @@ -255,6 +255,16 @@ public: m_via_geometry_datatype = s; } + const std::string &via_cellname_prefix () const + { + return m_via_cellname_prefix; + } + + void set_via_cellname_prefix (const std::string &s) + { + m_via_cellname_prefix = s; + } + bool produce_pins () const { return m_produce_pins; @@ -435,6 +445,16 @@ public: m_lef_files = lf; } + bool separate_groups () const + { + return m_separate_groups; + } + + void set_separate_groups (bool f) + { + m_separate_groups = f; + } + private: bool m_read_all_layers; db::LayerMap m_layer_map; @@ -454,6 +474,7 @@ private: bool m_produce_via_geometry; std::string m_via_geometry_suffix; int m_via_geometry_datatype; + std::string m_via_cellname_prefix; bool m_produce_pins; std::string m_pins_suffix; int m_pins_datatype; @@ -469,6 +490,7 @@ private: bool m_produce_routing; std::string m_routing_suffix; int m_routing_datatype; + bool m_separate_groups; std::vector m_lef_files; }; @@ -493,13 +515,13 @@ enum LayerPurpose * * This class will handle the creation and management of layers in the LEF/DEF reader context */ -class DB_PLUGIN_PUBLIC LEFDEFLayerDelegate +class DB_PLUGIN_PUBLIC LEFDEFReaderState { public: /** * @brief Constructor */ - LEFDEFLayerDelegate (const LEFDEFReaderOptions *tc); + LEFDEFReaderState (const LEFDEFReaderOptions *tc); /** * @brief Set the layer map @@ -546,6 +568,16 @@ public: */ void finish (db::Layout &layout); + /** + * @brief Registers a via cell for the via with the given name + */ + void register_via_cell (const std::string &vn, db::Cell *cell); + + /** + * @brief Gets the via cell for the given via name or 0 if no such via is registered + */ + db::Cell *via_cell (const std::string &vn); + /** * @brief Get the technology component pointer */ @@ -560,6 +592,7 @@ private: bool m_create_layers; int m_laynum; std::map m_default_number; + std::map m_via_cells; const LEFDEFReaderOptions *mp_tech_comp; }; @@ -602,7 +635,7 @@ public: * * This method reads the layout specified into the given layout */ - void read (tl::InputStream &stream, db::Layout &layout, LEFDEFLayerDelegate &layer_delegate); + void read (tl::InputStream &stream, db::Layout &layout, LEFDEFReaderState &state); protected: /** @@ -677,7 +710,7 @@ protected: */ std::pair open_layer (db::Layout &layout, const std::string &name, LayerPurpose purpose) { - return mp_layer_delegate->open_layer (layout, name, purpose); + return mp_reader_state->open_layer (layout, name, purpose); } /** @@ -685,7 +718,7 @@ protected: */ void register_layer (const std::string &l) { - mp_layer_delegate->register_layer (l); + mp_reader_state->register_layer (l); } /** @@ -752,7 +785,22 @@ protected: return m_pin_prop_name_id; } -protected: + /** + * @brief Gets the reader options + */ + const db::LEFDEFReaderOptions &options () const + { + return m_options; + } + + /** + * @brief Gets the reader state object + */ + db::LEFDEFReaderState *reader_state () + { + return mp_reader_state; + } + void create_generated_via (std::vector &bottom, std::vector &cut, std::vector &top, @@ -767,7 +815,7 @@ protected: private: tl::AbsoluteProgress *mp_progress; tl::TextInputStream *mp_stream; - LEFDEFLayerDelegate *mp_layer_delegate; + LEFDEFReaderState *mp_reader_state; std::string m_cellname; std::string m_fn; std::string m_last_token; @@ -777,6 +825,7 @@ private: db::property_names_id_type m_inst_prop_name_id; bool m_produce_pin_props; db::property_names_id_type m_pin_prop_name_id; + db::LEFDEFReaderOptions m_options; const std::string &next (); }; diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc index 8ffdc60df..e7e7f168c 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc @@ -84,7 +84,7 @@ static bool is_def_format (const std::string &fn) * the map file. */ static void -read_map_file (const std::string &path, db::LEFDEFLayerDelegate &layers) +read_map_file (const std::string &path, db::LEFDEFReaderState &layers) { tl::log << tl::to_string (tr ("Reading LEF/DEF map file")) << " " << path; @@ -186,7 +186,7 @@ read_map_file (const std::string &path, db::LEFDEFLayerDelegate &layers) * @brief Imports a .map file present next to the input files */ static void -import_map_file_heuristics (const std::string &main_path, db::LEFDEFLayerDelegate &layers) +import_map_file_heuristics (const std::string &main_path, db::LEFDEFReaderState &layers) { std::string input_dir = tl::absolute_path (main_path); if (! tl::file_exists (input_dir)) { @@ -273,11 +273,11 @@ private: } // Take the layer map and the "read all layers" flag from the reader options - hence we override the - db::LEFDEFLayerDelegate layers (lefdef_options); + db::LEFDEFReaderState state (lefdef_options); - import_map_file_heuristics (m_stream.absolute_path (), layers); + import_map_file_heuristics (m_stream.absolute_path (), state); - layers.prepare (layout); + state.prepare (layout); layout.dbu (lefdef_options->dbu ()); if (import_lef) { @@ -292,12 +292,12 @@ private: tl::InputStream lef_stream (lp); tl::log << tl::to_string (tr ("Reading")) << " " << lp; - importer.read (lef_stream, layout, layers); + importer.read (lef_stream, layout, state); } tl::log << tl::to_string (tr ("Reading")) << " " << m_stream.source (); - importer.read (m_stream, layout, layers); + importer.read (m_stream, layout, state); } else { @@ -311,7 +311,7 @@ private: tl::InputStream lef_stream (lp); tl::log << tl::to_string (tr ("Reading")) << " " << lp; - importer.read_lef (lef_stream, layout, layers); + importer.read_lef (lef_stream, layout, state); } @@ -330,7 +330,7 @@ private: std::string lp = tl::combine_path (input_dir, *e); tl::InputStream lef_stream (lp); tl::log << tl::to_string (tr ("Reading")) << " " << lp; - importer.read_lef (lef_stream, layout, layers); + importer.read_lef (lef_stream, layout, state); } @@ -339,13 +339,13 @@ private: } tl::log << tl::to_string (tr ("Reading")) << " " << m_stream.source (); - importer.read (m_stream, layout, layers); + importer.read (m_stream, layout, state); } - layers.finish (layout); + state.finish (layout); - m_layer_map = layers.layer_map (); + m_layer_map = state.layer_map (); return m_layer_map; } }; diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc index cb5995b1d..72f6140da 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc @@ -345,20 +345,18 @@ LEFImporter::read_geometries (db::Layout &layout, db::Cell &cell, LayerPurpose p points.push_back (db::Vector (db::DVector (x / dbu, y / dbu))); std::string vn = get (); - std::pair cn = layout.cell_by_name (("VIA_" + vn).c_str ()); - if (! cn.first) { + db::Cell *vc = reader_state ()->via_cell (vn); + if (! vc) { warn ("Unknown via: " + vn); } if (iterate) { std::vector ti = get_iteration (layout); - if (cn.first) { - for (std::vector::const_iterator t = ti.begin (); t != ti.end (); ++t) { - cell.insert (db::CellInstArray (db::CellInst (cn.second), *t * db::Trans (points [0]))); - } + for (std::vector::const_iterator t = ti.begin (); t != ti.end (); ++t) { + cell.insert (db::CellInstArray (db::CellInst (vc->cell_index ()), *t * db::Trans (points [0]))); } - } else if (cn.first) { - cell.insert (db::CellInstArray (db::CellInst (cn.second), db::Trans (points [0]))); + } else { + cell.insert (db::CellInstArray (db::CellInst (vc->cell_index ()), db::Trans (points [0]))); } expect (";"); @@ -565,8 +563,9 @@ LEFImporter::read_viadef (Layout &layout) std::string n = get (); // produce a cell for vias - std::string cellname = "VIA_" + n; + std::string cellname = options ().via_cellname_prefix () + n; db::Cell &cell = layout.cell (layout.add_cell (cellname.c_str ())); + reader_state ()->register_via_cell (n, &cell); ViaDesc &via_desc = m_vias[n]; via_desc.cell = &cell; diff --git a/src/plugins/streamers/lefdef/db_plugin/gsiDeclDbLEFDEF.cc b/src/plugins/streamers/lefdef/db_plugin/gsiDeclDbLEFDEF.cc index f0640f3e4..55191416e 100644 --- a/src/plugins/streamers/lefdef/db_plugin/gsiDeclDbLEFDEF.cc +++ b/src/plugins/streamers/lefdef/db_plugin/gsiDeclDbLEFDEF.cc @@ -260,6 +260,18 @@ gsi::Class decl_lefdef_config ("db", "LEFDEFReaderConfi "@brief Sets the via geometry layer datatype value.\n" "See \\produce_via_geometry for details about this property.\n" ) + + gsi::method ("via_cellname_prefix", &db::LEFDEFReaderOptions::via_cellname_prefix, + "@brief Gets the via cellname prefix.\n" + "Vias are represented by cells. The cell name is formed by combining the via cell name prefix and the via name.\n" + "\n" + "This property has been added in version 0.26.5.\n" + ) + + gsi::method ("via_cellname_prefix=", &db::LEFDEFReaderOptions::set_via_cellname_prefix, gsi::arg ("prefix"), + "@brief Sets the via cellname prefix.\n" + "See \\via_cellname_prefix for details about this property.\n" + "\n" + "This property has been added in version 0.26.5.\n" + ) + gsi::method ("produce_pins", &db::LEFDEFReaderOptions::produce_pins, "@brief Gets a value indicating whether pin geometries shall be produced.\n" "See \\produce_via_geometry for details about the layer production rules." @@ -380,6 +392,20 @@ gsi::Class decl_lefdef_config ("db", "LEFDEFReaderConfi "@brief Sets the routing layer datatype value.\n" "See \\produce_via_geometry for details about the layer production rules." ) + + gsi::method ("separate_groups", &db::LEFDEFReaderOptions::separate_groups, + "@brief Gets a value indicating whether to create separate parent cells for individual groups.\n" + "If this property is set to true, instances belonging to different groups are separated by putting them into " + "individual parent cells. These parent cells are named after the groups and are put into the master top cell.\n" + "If this property is set to false (the default), no such group parents will be formed." + "\n" + "This property has been added in version 0.26.5.\n" + ) + + gsi::method ("separate_groups=", &db::LEFDEFReaderOptions::set_separate_groups, gsi::arg ("flag"), + "@brief Gets a value indicating whether to create separate parent cells for individual groups.\n" + "See \\seperate_groups for details about this property.\n" + "\n" + "This property has been added in version 0.26.5.\n" + ) + gsi::method ("lef_files", &db::LEFDEFReaderOptions::lef_files, "@brief Gets the list technology LEF files to additionally import\n" "Returns a list of path names for technology LEF files to read in addition to the primary file. " diff --git a/src/plugins/streamers/lefdef/lay_plugin/LEFDEFTechnologyComponentEditor.ui b/src/plugins/streamers/lefdef/lay_plugin/LEFDEFTechnologyComponentEditor.ui index 2b2dcf365..3833de8a3 100644 --- a/src/plugins/streamers/lefdef/lay_plugin/LEFDEFTechnologyComponentEditor.ui +++ b/src/plugins/streamers/lefdef/lay_plugin/LEFDEFTechnologyComponentEditor.ui @@ -7,7 +7,7 @@ 0 0 775 - 766 + 855 @@ -200,31 +200,28 @@ true - + 4 4 - + Layout database unit - - - - - 0 - 0 - + + + + Via cell name prefix - + @@ -237,6 +234,40 @@ + + + + + 0 + 0 + + + + + + + + + 0 + 0 + + + + + + + + Produce a parent cell for each group + + + + + + + Separate groups + + + diff --git a/src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImport.cc b/src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImport.cc index 3c8f051c2..14d8c7463 100644 --- a/src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImport.cc +++ b/src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImport.cc @@ -140,7 +140,7 @@ public: } } - db::LEFDEFLayerDelegate layers (&options); + db::LEFDEFReaderState layers (&options); layers.prepare (*layout); layout->dbu (options.dbu ()); diff --git a/src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImportDialogs.cc b/src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImportDialogs.cc index 14474fa23..8aeef44bd 100644 --- a/src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImportDialogs.cc +++ b/src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImportDialogs.cc @@ -425,6 +425,7 @@ LEFDEFReaderOptionsEditor::commit (db::FormatSpecificReaderOptions *options, con data->set_produce_via_geometry (produce_via_geometry->isChecked ()); data->set_via_geometry_suffix (tl::to_string (suffix_via_geometry->text ())); data->set_via_geometry_datatype (datatype_via_geometry->text ().toInt ()); + data->set_via_cellname_prefix (tl::to_string (prefix_via_cellname->text ())); data->set_produce_pins (produce_pins->isChecked ()); data->set_pins_suffix (tl::to_string (suffix_pins->text ())); data->set_pins_datatype (datatype_pins->text ().toInt ()); @@ -440,6 +441,7 @@ LEFDEFReaderOptionsEditor::commit (db::FormatSpecificReaderOptions *options, con data->set_produce_labels (produce_labels->isChecked ()); data->set_labels_suffix (tl::to_string (suffix_labels->text ())); data->set_labels_datatype (datatype_labels->text ().toInt ()); + data->set_separate_groups (separate_groups->isChecked ()); data->clear_lef_files (); for (int i = 0; i < lef_files->count (); ++i) { @@ -477,6 +479,7 @@ LEFDEFReaderOptionsEditor::setup (const db::FormatSpecificReaderOptions *options produce_via_geometry->setChecked (data->produce_via_geometry ()); suffix_via_geometry->setText (tl::to_qstring (data->via_geometry_suffix ())); datatype_via_geometry->setText (QString::number (data->via_geometry_datatype ())); + prefix_via_cellname->setText (tl::to_qstring (data->via_cellname_prefix ())); produce_pins->setChecked (data->produce_pins ()); suffix_pins->setText (tl::to_qstring (data->pins_suffix ())); datatype_pins->setText (QString::number (data->pins_datatype ())); @@ -492,6 +495,7 @@ LEFDEFReaderOptionsEditor::setup (const db::FormatSpecificReaderOptions *options produce_labels->setChecked (data->produce_labels ()); suffix_labels->setText (tl::to_qstring (data->labels_suffix ())); datatype_labels->setText (QString::number (data->labels_datatype ())); + separate_groups->setChecked (data->separate_groups ()); checkbox_changed (); diff --git a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc index 5ff589fb1..0908b18e9 100644 --- a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc +++ b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc @@ -51,7 +51,7 @@ static db::LEFDEFReaderOptions default_options () static void run_test (tl::TestBase *_this, const char *lef_dir, const char *filename, const char *au, const db::LEFDEFReaderOptions &tc, bool priv = true) { - db::LEFDEFLayerDelegate ld (&tc); + db::LEFDEFReaderState ld (&tc); db::Manager m (false); db::Layout layout (&m), layout2 (&m), layout_au (&m); @@ -232,7 +232,11 @@ TEST(17) TEST(18) { - run_test (_this, "def9", "lef:tech.lef+lef:cells_modified.lef+def:in.def", "au.oas.gz", default_options ()); + db::LEFDEFReaderOptions options = default_options (); + options.set_separate_groups (true); + run_test (_this, "def9", "lef:tech.lef+lef:cells_modified.lef+def:in.def", "au.oas.gz", options); + + run_test (_this, "def9", "lef:tech.lef+lef:cells_modified.lef+def:in.def", "au_nogroups.oas.gz", default_options ()); } TEST(19) diff --git a/testdata/ruby/dbReaders.rb b/testdata/ruby/dbReaders.rb index 4c89cc871..9cc558f75 100644 --- a/testdata/ruby/dbReaders.rb +++ b/testdata/ruby/dbReaders.rb @@ -249,6 +249,10 @@ class DBReaders_TestClass < TestBase conf.via_geometry_suffix = "XVIA" assert_equal(conf.via_geometry_suffix, "XVIA") + assert_equal(conf.via_cellname_prefix, "VIA_") + conf.via_cellname_prefix = "ABC" + assert_equal(conf.via_cellname_prefix, "ABC") + assert_equal(conf.via_geometry_datatype, 0) conf.via_geometry_datatype = 17 assert_equal(conf.via_geometry_datatype, 17) @@ -313,6 +317,10 @@ class DBReaders_TestClass < TestBase conf.routing_datatype = 22 assert_equal(conf.routing_datatype, 22) + assert_equal(conf.separate_groups, false) + conf.separate_groups = true + assert_equal(conf.separate_groups, true) + assert_equal(conf.lef_files.join(","), "") conf.lef_files = [ "u.lef", "v.lef" ] assert_equal(conf.lef_files.join(","), "u.lef,v.lef") From 9a7f0a9c2a80308f0777b2a55e3793ca19acdadc Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sat, 18 Apr 2020 18:48:25 +0200 Subject: [PATCH 026/121] Fixed a LEF/DEF reader bug (was '+ RECT' or '+ POLYGON' in SPECIALNETS) --- src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc | 6 ++++-- testdata/lefdef/specialnets_geo/test.def | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc index 6ef63978f..ea5de1c3f 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc @@ -773,17 +773,19 @@ DEFImporter::read_nets (db::Layout &layout, db::Cell &design, double scale, bool } else { bool prefixed = false; + bool can_have_rect_or_polygon = true; if ((was_shield = test ("SHIELD")) == true || test ("NOSHIELD") || test ("ROUTED") || test ("FIXED") || test ("COVER")) { if (was_shield) { take (); } prefixed = true; + can_have_rect_or_polygon = test ("+"); } bool any = false; - if (test ("POLYGON")) { + if (can_have_rect_or_polygon && test ("POLYGON")) { std::string ln = get (); @@ -801,7 +803,7 @@ DEFImporter::read_nets (db::Layout &layout, db::Cell &design, double scale, bool any = true; - } else if (test ("RECT")) { + } else if (can_have_rect_or_polygon && test ("RECT")) { std::string ln = get (); diff --git a/testdata/lefdef/specialnets_geo/test.def b/testdata/lefdef/specialnets_geo/test.def index 0686c4fec..b9b3e39c8 100644 --- a/testdata/lefdef/specialnets_geo/test.def +++ b/testdata/lefdef/specialnets_geo/test.def @@ -16,9 +16,9 @@ VIAS 1 ; END VIAS SPECIALNETS 1 ; - dummy - + ROUTED RECT M2 ( 350 0 ) ( 200 100 ) + + ROUTED + RECT M2 ( 350 0 ) ( 200 100 ) + POLYGON M1 ( 300 0 ) ( 300 50 ) ( 350 50 ) ( 400 100 ) ( 400 0 ) - + ROUTED POLYGON M2 ( 300 150 ) ( 300 200 ) ( 350 200 ) ( 400 250 ) ( 400 150 ) + + ROUTED + POLYGON M2 ( 300 150 ) ( 300 200 ) ( 350 200 ) ( 400 250 ) ( 400 150 ) + RECT M1 ( 0 0 ) ( 100 200 ) + ROUTED M1 30 ( 0 0 15 ) ( 100 0 0 ) VIA1_dummy ( 100 100 10 ) + ROUTED M2 50 + SHAPE RING + STYLE 1 ( 0 100 ) ( 100 200 ) ( 200 200 ) From d93ef3ff974dc84ff55c4fa4be1a55b36324d0b7 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sun, 19 Apr 2020 10:39:27 +0200 Subject: [PATCH 027/121] Timing reports for stream writers too, reporting file names for reader and writer timing. --- src/db/db/dbReader.cc | 18 ++++++++++++++++++ src/db/db/dbReader.h | 10 ++-------- src/db/db/dbWriter.cc | 4 ++++ .../streamers/cif/db_plugin/dbCIFReader.cc | 2 -- .../streamers/dxf/db_plugin/dbDXFReader.cc | 2 -- .../gds2/db_plugin/dbGDS2ReaderBase.cc | 2 -- .../lefdef/db_plugin/dbLEFDEFPlugin.cc | 5 ++--- .../streamers/magic/db_plugin/dbMAGReader.cc | 2 +- .../streamers/oasis/db_plugin/dbOASISReader.cc | 2 -- 9 files changed, 27 insertions(+), 20 deletions(-) diff --git a/src/db/db/dbReader.cc b/src/db/db/dbReader.cc index 4e1455bc1..fc6f13adb 100644 --- a/src/db/db/dbReader.cc +++ b/src/db/db/dbReader.cc @@ -24,6 +24,8 @@ #include "dbReader.h" #include "dbStream.h" #include "tlClassRegistry.h" +#include "tlTimer.h" +#include "tlLog.h" namespace db { @@ -74,5 +76,21 @@ Reader::~Reader () } } +const db::LayerMap & +Reader::read (db::Layout &layout, const db::LoadLayoutOptions &options) +{ + tl::SelfTimer timer (tl::verbosity () >= 21, tl::to_string (tr ("Reading file: ")) + m_stream.source ()); + + return mp_actual_reader->read (layout, options); +} + +const db::LayerMap & +Reader::read (db::Layout &layout) +{ + tl::SelfTimer timer (tl::verbosity () >= 21, tl::to_string (tr ("Reading file: ")) + m_stream.source ()); + + return mp_actual_reader->read (layout); +} + } diff --git a/src/db/db/dbReader.h b/src/db/db/dbReader.h index 6429ea71b..bab39df87 100644 --- a/src/db/db/dbReader.h +++ b/src/db/db/dbReader.h @@ -125,10 +125,7 @@ public: * @param layout The layout object to write to * @param options The LayerMap object */ - const db::LayerMap &read (db::Layout &layout, const db::LoadLayoutOptions &options) - { - return mp_actual_reader->read (layout, options); - } + const db::LayerMap &read (db::Layout &layout, const db::LoadLayoutOptions &options); /** * @brief The basic read method (without mapping) @@ -143,10 +140,7 @@ public: * @param layout The layout object to write to * @return The LayerMap object */ - const db::LayerMap &read (db::Layout &layout) - { - return mp_actual_reader->read (layout); - } + const db::LayerMap &read (db::Layout &layout); /** * @brief Returns a format describing the file format found diff --git a/src/db/db/dbWriter.cc b/src/db/db/dbWriter.cc index 5dfdcefa0..917790212 100644 --- a/src/db/db/dbWriter.cc +++ b/src/db/db/dbWriter.cc @@ -26,6 +26,8 @@ #include "tlClassRegistry.h" #include "tlAssert.h" #include "tlStream.h" +#include "tlTimer.h" +#include "tlLog.h" namespace db { @@ -54,6 +56,8 @@ Writer::~Writer () void Writer::write (db::Layout &layout, tl::OutputStream &stream) { + tl::SelfTimer timer (tl::verbosity () >= 21, tl::to_string (tr ("Writing file: ")) + stream.path ()); + tl_assert (mp_writer != 0); mp_writer->write (layout, stream, m_options); } diff --git a/src/plugins/streamers/cif/db_plugin/dbCIFReader.cc b/src/plugins/streamers/cif/db_plugin/dbCIFReader.cc index f63d9ffb5..df544ffe2 100644 --- a/src/plugins/streamers/cif/db_plugin/dbCIFReader.cc +++ b/src/plugins/streamers/cif/db_plugin/dbCIFReader.cc @@ -818,8 +818,6 @@ CIFReader::read_cell (db::Layout &layout, db::Cell &cell, double sf, int level) void CIFReader::do_read (db::Layout &layout) { - tl::SelfTimer timer (tl::verbosity () >= 21, "File read"); - try { double sf = 0.01 / m_dbu; diff --git a/src/plugins/streamers/dxf/db_plugin/dbDXFReader.cc b/src/plugins/streamers/dxf/db_plugin/dbDXFReader.cc index 85fe87027..2a7f8327b 100644 --- a/src/plugins/streamers/dxf/db_plugin/dbDXFReader.cc +++ b/src/plugins/streamers/dxf/db_plugin/dbDXFReader.cc @@ -379,8 +379,6 @@ DXFReader::open_layer (db::Layout &layout, const std::string &n) void DXFReader::do_read (db::Layout &layout, db::cell_index_type top) { - tl::SelfTimer timer (tl::verbosity () >= 21, "File read"); - // create the zero layer - this is not mapped to GDS but can be specified in the layer mapping as // a layer named "0". std::pair ll = layer_map ().logical (zero_layer_name, layout); diff --git a/src/plugins/streamers/gds2/db_plugin/dbGDS2ReaderBase.cc b/src/plugins/streamers/gds2/db_plugin/dbGDS2ReaderBase.cc index 4d6695891..1541960e0 100644 --- a/src/plugins/streamers/gds2/db_plugin/dbGDS2ReaderBase.cc +++ b/src/plugins/streamers/gds2/db_plugin/dbGDS2ReaderBase.cc @@ -233,8 +233,6 @@ eq_y (const GDS2XY &a, const GDS2XY &b) void GDS2ReaderBase::do_read (db::Layout &layout) { - tl::SelfTimer timer (tl::verbosity () >= 21, "File read"); - m_cellname = ""; m_libname = ""; m_mapped_cellnames.clear (); diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc index e7e7f168c..5c196d026 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc @@ -272,7 +272,6 @@ private: lefdef_options = &default_options; } - // Take the layer map and the "read all layers" flag from the reader options - hence we override the db::LEFDEFReaderState state (lefdef_options); import_map_file_heuristics (m_stream.absolute_path (), state); @@ -282,7 +281,7 @@ private: if (import_lef) { - tl::SelfTimer timer (tl::verbosity () >= 11, tl::to_string (tr ("Reading LEF file"))); + tl::SelfTimer timer (tl::verbosity () >= 21, tl::to_string (tr ("Reading LEF file"))); db::LEFImporter importer; @@ -301,7 +300,7 @@ private: } else { - tl::SelfTimer timer (tl::verbosity () >= 11, tl::to_string (tr ("Reading DEF file"))); + tl::SelfTimer timer (tl::verbosity () >= 21, tl::to_string (tr ("Reading DEF file"))); DEFImporter importer; diff --git a/src/plugins/streamers/magic/db_plugin/dbMAGReader.cc b/src/plugins/streamers/magic/db_plugin/dbMAGReader.cc index f44a71330..b9fa4bb06 100644 --- a/src/plugins/streamers/magic/db_plugin/dbMAGReader.cc +++ b/src/plugins/streamers/magic/db_plugin/dbMAGReader.cc @@ -111,7 +111,7 @@ MAGReader::read (db::Layout &layout, const db::LoadLayoutOptions &options) m_tech.clear (); { - tl::SelfTimer timer (tl::verbosity () >= 21, "Reading MAGIC file tree"); + tl::SelfTimer timer (tl::verbosity () >= 11, "Reading MAGIC file tree"); // This is the seed do_read (layout, top_cell, m_stream); diff --git a/src/plugins/streamers/oasis/db_plugin/dbOASISReader.cc b/src/plugins/streamers/oasis/db_plugin/dbOASISReader.cc index 2d084c313..6311ff2cf 100644 --- a/src/plugins/streamers/oasis/db_plugin/dbOASISReader.cc +++ b/src/plugins/streamers/oasis/db_plugin/dbOASISReader.cc @@ -689,8 +689,6 @@ static const char magic_bytes[] = { "%SEMI-OASIS\015\012" }; void OASISReader::do_read (db::Layout &layout) { - tl::SelfTimer timer (tl::verbosity () >= 21, "File read"); - unsigned char r; char *mb; From 9825245e0cb99f0973cb08ce45026ad51a4f4806 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sun, 19 Apr 2020 12:16:55 +0200 Subject: [PATCH 028/121] Implemented LEF MACRO FOREIGN --- .../lefdef/db_plugin/dbDEFImporter.cc | 43 ---------------- .../lefdef/db_plugin/dbDEFImporter.h | 3 -- .../lefdef/db_plugin/dbLEFDEFImporter.cc | 43 ++++++++++++++++ .../lefdef/db_plugin/dbLEFDEFImporter.h | 18 +++++++ .../lefdef/db_plugin/dbLEFImporter.cc | 38 ++++++++++++-- .../lefdef/unit_tests/dbLEFDEFImportTests.cc | 31 +++++++---- testdata/lefdef/foreigncell/au.oas.gz | Bin 0 -> 859 bytes testdata/lefdef/foreigncell/foreign.gds | Bin 0 -> 3484 bytes testdata/lefdef/foreigncell/in.lef | 48 ++++++++++++++++++ testdata/lefdef/foreigncell/in_tech.lef | 36 +++++++++++++ testdata/lefdef/issue-489b/in.lef | 1 - 11 files changed, 201 insertions(+), 60 deletions(-) create mode 100644 testdata/lefdef/foreigncell/au.oas.gz create mode 100644 testdata/lefdef/foreigncell/foreign.gds create mode 100644 testdata/lefdef/foreigncell/in.lef create mode 100644 testdata/lefdef/foreigncell/in_tech.lef diff --git a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc index ea5de1c3f..3c047f817 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc @@ -65,49 +65,6 @@ DEFImporter::read_lef (tl::InputStream &stream, db::Layout &layout, LEFDEFReader } -db::FTrans -DEFImporter::get_orient (bool optional) -{ - if (test ("N")) { - return db::FTrans (db::FTrans::r0); - } else if (test ("S")) { - return db::FTrans (db::FTrans::r180); - } else if (test ("W")) { - return db::FTrans (db::FTrans::r90); - } else if (test ("E")) { - return db::FTrans (db::FTrans::r270); - } else if (test ("FN")) { - return db::FTrans (db::FTrans::m90); - } else if (test ("FS")) { - return db::FTrans (db::FTrans::m0); - } else if (test ("FW")) { - return db::FTrans (db::FTrans::m45); - } else if (test ("FE")) { - return db::FTrans (db::FTrans::m135); - } else if (optional) { - return db::FTrans (db::FTrans::r0); - } else { - error (tl::to_string (tr ("Invalid orientation specification: ")) + get ()); - return db::FTrans (db::FTrans::r0); - } -} - -db::Point -DEFImporter::get_point (double scale) -{ - double x = get_double (); - double y = get_double (); - return db::Point (db::DPoint (x * scale, y * scale)); -} - -db::Vector -DEFImporter::get_vector (double scale) -{ - double x = get_double (); - double y = get_double (); - return db::Vector (db::DVector (x * scale, y * scale)); -} - void DEFImporter::read_polygon (db::Polygon &poly, double scale) { diff --git a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.h b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.h index b0f421ad8..dc9e36488 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.h +++ b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.h @@ -67,7 +67,6 @@ private: std::map m_via_desc; std::map m_styles; - db::FTrans get_orient (bool optional); void read_polygon (db::Polygon &poly, double scale); void read_rect (db::Polygon &poly, double scale); std::pair get_wire_width_for_rule(const std::string &rule, const std::string &ln, double dbu); @@ -84,8 +83,6 @@ private: void read_components (std::list > &instances, double scale); void read_single_net (std::string &nondefaultrule, db::Layout &layout, db::Cell &design, double scale, properties_id_type prop_id, bool specialnets); void produce_routing_geometry (db::Cell &design, const db::Polygon *style, unsigned int layer, properties_id_type prop_id, const std::vector &pts, const std::vector > &ext, std::pair w); - db::Point get_point (double scale); - db::Vector get_vector (double scale); }; } diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc index a574da6a7..d045b7534 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc @@ -830,5 +830,48 @@ LEFDEFImporter::create_generated_via (std::vector &bottom, } +db::FTrans +LEFDEFImporter::get_orient (bool optional) +{ + if (test ("N")) { + return db::FTrans (db::FTrans::r0); + } else if (test ("S")) { + return db::FTrans (db::FTrans::r180); + } else if (test ("W")) { + return db::FTrans (db::FTrans::r90); + } else if (test ("E")) { + return db::FTrans (db::FTrans::r270); + } else if (test ("FN")) { + return db::FTrans (db::FTrans::m90); + } else if (test ("FS")) { + return db::FTrans (db::FTrans::m0); + } else if (test ("FW")) { + return db::FTrans (db::FTrans::m45); + } else if (test ("FE")) { + return db::FTrans (db::FTrans::m135); + } else if (optional) { + return db::FTrans (db::FTrans::r0); + } else { + error (tl::to_string (tr ("Invalid orientation specification: ")) + get ()); + return db::FTrans (db::FTrans::r0); + } +} + +db::Point +LEFDEFImporter::get_point (double scale) +{ + double x = get_double (); + double y = get_double (); + return db::Point (db::DPoint (x * scale, y * scale)); +} + +db::Vector +LEFDEFImporter::get_vector (double scale) +{ + double x = get_double (); + double y = get_double (); + return db::Vector (db::DVector (x * scale, y * scale)); +} + } diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h index c6ca07a68..83e84ecb0 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h @@ -705,6 +705,24 @@ protected: */ long get_long (); + /** + * @brief Gets an orientation code + * The orientation code is read employing the LEF/DEF convention ("N" for r0 etc.) + */ + db::FTrans get_orient (bool optional); + + /** + * @brief Reads a point + * A point is given by two coordinates, x and y + */ + db::Point get_point (double scale); + + /** + * @brief Reads a vector + * A vector is given by two coordinates, x and y + */ + db::Vector get_vector (double scale); + /** * @brief Create a new layer or return the index of the given layer */ diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc index 72f6140da..fccdd779b 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc @@ -742,10 +742,8 @@ LEFImporter::read_macro (Layout &layout) } else if (test ("ORIGIN")) { - double x = get_double (); - double y = get_double (); + origin = get_point (1.0 / layout.dbu ()); expect (";"); - origin = db::Point (db::DPoint (x / layout.dbu (), y / layout.dbu ())); } else if (test ("SIZE")) { @@ -761,11 +759,16 @@ LEFImporter::read_macro (Layout &layout) std::string dir; while (! at_end ()) { + if (test ("END")) { + break; + } else if (test ("DIRECTION")) { + dir = get (); test (";"); + } else if (test ("PORT")) { // produce pin labels @@ -806,6 +809,35 @@ LEFImporter::read_macro (Layout &layout) expect (pn); + } else if (test ("FOREIGN")) { + + std::string cn = get (); + + if (cn == mn) { + // rename out macro placeholder cell so we don't create a recursive hierarchy + layout.rename_cell (cell.cell_index (), ("LEF_" + mn).c_str ()); + } + + db::cell_index_type ci; + std::pair c = layout.cell_by_name (cn.c_str ()); + if (c.first) { + ci = c.second; + } else { + ci = layout.add_cell (cn.c_str ()); + layout.cell (ci).set_ghost_cell (true); + } + + db::Point origin; + db::FTrans ft; + if (! peek (";")) { + origin = get_point (1.0 / layout.dbu ()); + ft = get_orient (true); + } + + expect (";"); + + cell.insert (db::CellInstArray (db::CellInst (ci), (db::Trans (origin - db::Point ()) * db::Trans (ft)).inverted ())); + } else if (test ("OBS")) { read_geometries (layout, cell, Obstructions); diff --git a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc index 0908b18e9..7dbd7772c 100644 --- a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc +++ b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc @@ -51,6 +51,11 @@ static db::LEFDEFReaderOptions default_options () static void run_test (tl::TestBase *_this, const char *lef_dir, const char *filename, const char *au, const db::LEFDEFReaderOptions &tc, bool priv = true) { + std::string fn_path (priv ? tl::testsrc_private () : tl::testsrc ()); + fn_path += "/testdata/lefdef/"; + fn_path += lef_dir; + fn_path += "/"; + db::LEFDEFReaderState ld (&tc); db::Manager m (false); @@ -66,11 +71,7 @@ static void run_test (tl::TestBase *_this, const char *lef_dir, const char *file if (ex.test ("def:")) { - std::string fn (priv ? tl::testsrc_private () : tl::testsrc ()); - fn += "/testdata/lefdef/"; - fn += lef_dir; - fn += "/"; - std::string f; + std::string fn = fn_path, f; ex.read_word_or_quoted (f); fn += f; @@ -79,17 +80,23 @@ static void run_test (tl::TestBase *_this, const char *lef_dir, const char *file } else if (ex.test ("lef:")) { - std::string fn (priv ? tl::testsrc_private () : tl::testsrc ()); - fn += "/testdata/lefdef/"; - fn += lef_dir; - fn += "/"; - std::string f; + std::string fn = fn_path, f; ex.read_word_or_quoted (f); fn += f; tl::InputStream stream (fn); imp.read_lef (stream, layout, ld); + } else if (ex.test ("gds:")) { + + std::string fn = fn_path, f; + ex.read_word_or_quoted (f); + fn += f; + + tl::InputStream stream (fn); + db::Reader reader (stream); + reader.read (layout, db::LoadLayoutOptions ()); + } else { break; @@ -305,3 +312,7 @@ TEST(108_scanchain) run_test (_this, "scanchain", "def:test.def", "au.oas.gz", default_options (), false); } +TEST(109_foreigncell) +{ + run_test (_this, "foreigncell", "gds:foreign.gds+lef:in_tech.lef+lef:in.lef", "au.oas.gz", default_options (), false); +} diff --git a/testdata/lefdef/foreigncell/au.oas.gz b/testdata/lefdef/foreigncell/au.oas.gz new file mode 100644 index 0000000000000000000000000000000000000000..a46321b03e36bc56c9ec2e5bd21b35ef0920623e GIT binary patch literal 859 zcmV-h1El;PiwFo#B%EFV19WY0E^lFT0Oe6lXj54fzUSWeoA=Yi<{?N{c80zv(|Kt+ z!ysmn)~7xuKX1&dww-YvZ_=a&+H_2+R=R0H#DxoW;lf1;rHGVF7cOL$LmA3Y2G@cc zDN?cw(g`j^=Ds$~v_pmNy_@r$@0|19^WFPp&P-chWs^B8rv!k+`V7?I(f$+BPUPHl za>UJ97c%BK*UC8N1@n@7#X9F)6qtw-*)0!e4r_>Lft>4PZFk5_rQ|@$Jnv3<`O0)W z5|X(c)ZaldzU%u`ax^>axICqW64u_>yCqnO^a@ ztrw@uGj7?ND$qi8X597jUQx64N$+-{5>5QL6VD9ve;vOn%C>w}&L0 zjuD~SSf6cWD8}+WED02+l7nW7W*{HPB%XeJ%F3AJG!@#PC=h9(E)}VuVwI?j z%Bq~otAZ-30aa3ERZ&$feu^;NE3m{pgEwRq9+PEQ!()HqpYF0h|A9x=aE)?xxDT4a z$eTh97K#0c)L=_khDYQHah`I2ahd_beHhn%i0WDt(N1Xv*7zE-Yf~S%R@9tm8UdUWFDc!xC)ZW!NGO+6vrkG(4_F?=ji{1Um9j`xPUh zvq1&5-E~oS!B4uwM{)O-)doK0u7M@ggrIN#IkSP^K@Fb5M|e+nr3T?|{DPTh|F>Zi zB-Fq`%CV+^qni7Xe`lFgSf$A_ILMtq$mgLRJ3A)JJ8I_x`q=s1wi z0wSeK5rk-{D4=nHgoF?cE~wlfkrdR>P*6k^sVGuWVE+Hv9rD1B7?2PRYmI)pGqW@M z_G4^IBw;uqok7_Ax1{AOX~oZ~cwaJMG&Z_dq$Aa|YtO~OgZFPd`*#1`Epyj?DoAJ3 z+vlx`qMn|fedGB;ZlX{e&5w*@DCriFmemn;J=>(UJtfwnjiIzj+otG;eYvr*VR{I4 zD^%B4IbEM!KioZ_x>i{OzrJ#%QkpG#^9W=u zJ!Z@2v2(qJBe{Ix$MJm5TZQ|IlO5h$YE&mh(yJgios2u3&u8-iXS3}+&PH#rKbw*9 z!-opFT)tOxCZ0^Q{O@aPiR?|KGdTSfp=^+-EtF8k^o@1+XGVVS`^FKBvk)WoT@WL> z;^ylec_aRB8sB1(j1!lY7$1a?haq1>ihev5Bj?m1Ms(GWTD;G&{O}eM#$g`*S7Tu0e*S~85$`20$?NqjB}esrA=ayg_34{1Vtw3uz2_v>r*GMa^{L&6p>Ip~ zB_(>lxCh$evDv4dGUdtoMLmgorFtXok=8TXSr2VK^^9S4l51vtBpH`_l5s39X?Aq| z`jXbK=c@ILeyoR_XLXTvj=4$Zxd5U4n&%uyJxRZtG16}i!p8YYbtonCiS_U?yczE) zg!`}%BhTp(gruL*xr03vo0i0@Fl5#OovjTSfgoLv5CX2(2|d0EGd%*#4x zWZpk8HZm{mM&`9TNTO-nvOT_DOga7~l literal 0 HcmV?d00001 diff --git a/testdata/lefdef/foreigncell/in.lef b/testdata/lefdef/foreigncell/in.lef new file mode 100644 index 000000000..d796cba46 --- /dev/null +++ b/testdata/lefdef/foreigncell/in.lef @@ -0,0 +1,48 @@ +MACRO macro1 + CLASS CORE ; + FOREIGN foreign1 0.5 -0.2 W ; + ORIGIN 0.000 0.000 ; + SIZE 0.384 BY 0.480 ; + PIN Z + PORT + LAYER M1 ; + RECT 0.306 0.357 0.318 0.403 ; + RECT 0.318 0.115 0.352 0.403 ; + VIA 0.336 0.167 square ; + VIA 0.336 0.351 square ; + END + END Z +END macro1 + +MACRO macro2 + CLASS CORE ; + FOREIGN foreign2 -0.15 0.25 ; + ORIGIN 0.000 0.000 ; + SIZE 0.384 BY 0.480 ; + PIN Z + PORT + LAYER M1 ; + RECT 0.306 0.357 0.318 0.403 ; + RECT 0.318 0.115 0.352 0.403 ; + VIA 0.336 0.167 square ; + VIA 0.336 0.351 square ; + END + END Z +END macro2 + +MACRO macro3 + CLASS CORE ; + FOREIGN macro3 ; + ORIGIN 0.000 0.000 ; + SIZE 0.384 BY 0.480 ; + PIN Z + PORT + LAYER M1 ; + RECT 0.306 0.357 0.318 0.403 ; + RECT 0.318 0.115 0.352 0.403 ; + VIA 0.336 0.167 square ; + VIA 0.336 0.351 square ; + END + END Z +END macro3 + diff --git a/testdata/lefdef/foreigncell/in_tech.lef b/testdata/lefdef/foreigncell/in_tech.lef new file mode 100644 index 000000000..eb0e75b0b --- /dev/null +++ b/testdata/lefdef/foreigncell/in_tech.lef @@ -0,0 +1,36 @@ +LAYER OD + TYPE IMPLANT ; +END OD +LAYER VTS_N + TYPE IMPLANT ; +END VTS_N +LAYER VTS_P + TYPE IMPLANT ; +END VTS_P +LAYER M0OD + TYPE IMPLANT ; +END M0OD +LAYER M0PO + TYPE MASTERSLICE ; +END M0PO +LAYER VIA0 + TYPE CUT ; +END VIA0 +LAYER M1 + TYPE MASTERSLICE ; +END M1 +LAYER VIA1 + TYPE CUT ; +END VIA1 +LAYER M2 + TYPE MASTERSLICE ; +END M2 + +VIA square + LAYER M0PO ; + RECT -0.006 -0.006 0.006 0.006 ; + LAYER VIA0 ; + RECT -0.006 -0.006 0.006 0.006 ; + LAYER M1 ; + RECT -0.006 -0.006 0.006 0.006 ; +END square diff --git a/testdata/lefdef/issue-489b/in.lef b/testdata/lefdef/issue-489b/in.lef index 857ae0d04..05832b7bd 100644 --- a/testdata/lefdef/issue-489b/in.lef +++ b/testdata/lefdef/issue-489b/in.lef @@ -1,6 +1,5 @@ MACRO dummy CLASS CORE ; - FOREIGN dummy 0.000 0.000 ; ORIGIN 0.000 0.000 ; SIZE 0.384 BY 0.480 ; SYMMETRY X Y ; From e51f15b1167dc2a0c53cdedce917cf3eba9ecb7d Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sun, 19 Apr 2020 14:38:14 +0200 Subject: [PATCH 029/121] New layer flavors: special nets, LEF pins. --- .../lefdef/db_plugin/dbDEFImporter.cc | 8 +- .../lefdef/db_plugin/dbLEFDEFImporter.cc | 34 ++++ .../lefdef/db_plugin/dbLEFDEFImporter.h | 86 ++++++++- .../lefdef/db_plugin/dbLEFDEFPlugin.cc | 11 +- .../lefdef/db_plugin/dbLEFImporter.cc | 2 +- .../lefdef/db_plugin/gsiDeclDbLEFDEF.cc | 60 ++++++ .../LEFDEFTechnologyComponentEditor.ui | 176 ++++++++++++------ .../lay_plugin/layLEFDEFImportDialogs.cc | 18 ++ .../lefdef/unit_tests/dbLEFDEFImportTests.cc | 23 +++ .../foreigncell/au_lefpins_mapped.oas.gz | Bin 0 -> 859 bytes .../lefdef/foreigncell/au_no_lefpins.oas.gz | Bin 0 -> 796 bytes .../lefdef/specialnets_geo/au_no_spnet.oas.gz | Bin 0 -> 224 bytes .../specialnets_geo/au_spnet_mapped.oas.gz | Bin 0 -> 378 bytes testdata/ruby/dbReaders.rb | 24 +++ 14 files changed, 367 insertions(+), 75 deletions(-) create mode 100644 testdata/lefdef/foreigncell/au_lefpins_mapped.oas.gz create mode 100644 testdata/lefdef/foreigncell/au_no_lefpins.oas.gz create mode 100644 testdata/lefdef/specialnets_geo/au_no_spnet.oas.gz create mode 100644 testdata/lefdef/specialnets_geo/au_spnet_mapped.oas.gz diff --git a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc index 3c047f817..708e29b12 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc @@ -543,7 +543,7 @@ DEFImporter::read_single_net (std::string &nondefaultrule, Layout &layout, db::C test (")"); - std::pair dl = open_layer (layout, ln, Routing); + std::pair dl = open_layer (layout, ln, specialnets ? SpecialRouting : Routing); if (dl.first) { db::Point p (x, y); @@ -597,7 +597,7 @@ DEFImporter::read_single_net (std::string &nondefaultrule, Layout &layout, db::C } if (pts.size () > 1) { - std::pair dl = open_layer (layout, ln, Routing); + std::pair dl = open_layer (layout, ln, specialnets ? SpecialRouting : Routing); if (dl.first) { produce_routing_geometry (design, style, dl.second, prop_id, pts, ext, w); } @@ -749,7 +749,7 @@ DEFImporter::read_nets (db::Layout &layout, db::Cell &design, double scale, bool db::Polygon p; read_polygon (p, scale); - std::pair dl = open_layer (layout, ln, Routing); + std::pair dl = open_layer (layout, ln, specialnets ? SpecialRouting : Routing); if (dl.first) { if (prop_id != 0) { design.shapes (dl.second).insert (db::object_with_properties (p, prop_id)); @@ -767,7 +767,7 @@ DEFImporter::read_nets (db::Layout &layout, db::Cell &design, double scale, bool db::Polygon p; read_rect (p, scale); - std::pair dl = open_layer (layout, ln, Routing); + std::pair dl = open_layer (layout, ln, specialnets ? SpecialRouting : Routing); if (dl.first) { if (prop_id != 0) { design.shapes (dl.second).insert (db::object_with_properties (p, prop_id)); diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc index d045b7534..07122526d 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc @@ -56,6 +56,9 @@ LEFDEFReaderOptions::LEFDEFReaderOptions () m_produce_pins (true), m_pins_suffix (".PIN"), m_pins_datatype (2), + m_produce_lef_pins (true), + m_lef_pins_suffix (".PIN"), + m_lef_pins_datatype (2), m_produce_obstructions (true), m_obstructions_suffix (".OBS"), m_obstructions_datatype (3), @@ -68,6 +71,9 @@ LEFDEFReaderOptions::LEFDEFReaderOptions () m_produce_routing (true), m_routing_suffix (""), m_routing_datatype (0), + m_produce_special_routing (true), + m_special_routing_suffix (""), + m_special_routing_datatype (0), m_separate_groups (false) { // .. nothing yet .. @@ -96,6 +102,9 @@ LEFDEFReaderOptions::LEFDEFReaderOptions (const LEFDEFReaderOptions &d) m_produce_pins (d.m_produce_pins), m_pins_suffix (d.m_pins_suffix), m_pins_datatype (d.m_pins_datatype), + m_produce_lef_pins (d.m_produce_lef_pins), + m_lef_pins_suffix (d.m_lef_pins_suffix), + m_lef_pins_datatype (d.m_lef_pins_datatype), m_produce_obstructions (d.m_produce_obstructions), m_obstructions_suffix (d.m_obstructions_suffix), m_obstructions_datatype (d.m_obstructions_datatype), @@ -108,6 +117,9 @@ LEFDEFReaderOptions::LEFDEFReaderOptions (const LEFDEFReaderOptions &d) m_produce_routing (d.m_produce_routing), m_routing_suffix (d.m_routing_suffix), m_routing_datatype (d.m_routing_datatype), + m_produce_special_routing (d.m_produce_special_routing), + m_special_routing_suffix (d.m_special_routing_suffix), + m_special_routing_datatype (d.m_special_routing_datatype), m_separate_groups (d.m_separate_groups), m_lef_files (d.m_lef_files) { @@ -216,6 +228,9 @@ LEFDEFReaderState::open_layer (db::Layout &layout, const std::string &n, LayerPu default: produce = mp_tech_comp->produce_routing (); break; + case SpecialRouting: + produce = mp_tech_comp->produce_special_routing (); + break; case ViaGeometry: produce = mp_tech_comp->produce_via_geometry (); break; @@ -225,6 +240,9 @@ LEFDEFReaderState::open_layer (db::Layout &layout, const std::string &n, LayerPu case Pins: produce = mp_tech_comp->produce_pins (); break; + case LEFPins: + produce = mp_tech_comp->produce_lef_pins (); + break; case Obstructions: produce = mp_tech_comp->produce_obstructions (); break; @@ -255,6 +273,11 @@ LEFDEFReaderState::open_layer (db::Layout &layout, const std::string &n, LayerPu canonical_purpose = "NET"; dt += mp_tech_comp->routing_datatype (); break; + case SpecialRouting: + name += mp_tech_comp->special_routing_suffix (); + canonical_purpose = "SPNET"; + dt += mp_tech_comp->special_routing_datatype (); + break; case ViaGeometry: name += mp_tech_comp->via_geometry_suffix (); dt += mp_tech_comp->via_geometry_datatype (); @@ -270,6 +293,11 @@ LEFDEFReaderState::open_layer (db::Layout &layout, const std::string &n, LayerPu dt += mp_tech_comp->pins_datatype (); canonical_purpose = "PIN"; break; + case LEFPins: + name += mp_tech_comp->lef_pins_suffix (); + dt += mp_tech_comp->lef_pins_datatype (); + canonical_purpose = "LEFPIN"; + break; case Obstructions: name += mp_tech_comp->obstructions_suffix (); dt += mp_tech_comp->obstructions_datatype (); @@ -360,6 +388,9 @@ LEFDEFReaderState::finish (db::Layout &layout) default: dt = mp_tech_comp->routing_datatype (); break; + case SpecialRouting: + dt = mp_tech_comp->special_routing_datatype (); + break; case ViaGeometry: dt = mp_tech_comp->via_geometry_datatype (); break; @@ -369,6 +400,9 @@ LEFDEFReaderState::finish (db::Layout &layout) case Pins: dt = mp_tech_comp->pins_datatype (); break; + case LEFPins: + dt = mp_tech_comp->lef_pins_datatype (); + break; case Obstructions: dt = mp_tech_comp->obstructions_datatype (); break; diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h index 83e84ecb0..6c9adf325 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h @@ -295,6 +295,36 @@ public: m_pins_datatype = s; } + bool produce_lef_pins () const + { + return m_produce_lef_pins; + } + + void set_produce_lef_pins (bool f) + { + m_produce_lef_pins = f; + } + + const std::string &lef_pins_suffix () const + { + return m_lef_pins_suffix; + } + + void set_lef_pins_suffix (const std::string &s) + { + m_lef_pins_suffix = s; + } + + int lef_pins_datatype () const + { + return m_lef_pins_datatype; + } + + void set_lef_pins_datatype (int s) + { + m_lef_pins_datatype = s; + } + bool produce_obstructions () const { return m_produce_obstructions; @@ -415,6 +445,36 @@ public: m_routing_datatype = s; } + bool produce_special_routing () const + { + return m_produce_special_routing; + } + + void set_produce_special_routing (bool f) + { + m_produce_special_routing = f; + } + + const std::string &special_routing_suffix () const + { + return m_special_routing_suffix; + } + + void set_special_routing_suffix (const std::string &s) + { + m_special_routing_suffix = s; + } + + int special_routing_datatype () const + { + return m_special_routing_datatype; + } + + void set_special_routing_datatype (int s) + { + m_special_routing_datatype = s; + } + void clear_lef_files () { m_lef_files.clear (); @@ -478,6 +538,9 @@ private: bool m_produce_pins; std::string m_pins_suffix; int m_pins_datatype; + bool m_produce_lef_pins; + std::string m_lef_pins_suffix; + int m_lef_pins_datatype; bool m_produce_obstructions; std::string m_obstructions_suffix; int m_obstructions_datatype; @@ -490,6 +553,9 @@ private: bool m_produce_routing; std::string m_routing_suffix; int m_routing_datatype; + bool m_produce_special_routing; + std::string m_special_routing_suffix; + int m_special_routing_datatype; bool m_separate_groups; std::vector m_lef_files; }; @@ -499,15 +565,17 @@ private: */ enum LayerPurpose { - Routing = 0, - ViaGeometry = 1, - Label = 2, - Pins = 3, - Obstructions = 4, - Outline = 5, - Blockage = 6, - PlacementBlockage = 7, - Region = 8 + Routing = 0, // from DEF only + SpecialRouting, // from DEF only + ViaGeometry, // from LEF+DEF + Label, // from LEF+DEF + Pins, // from DEF + LEFPins, // from LEF + Obstructions, // from LEF only + Outline, // from LEF+DEF + Blockage, // from DEF only + PlacementBlockage, // from DEF only + Region, // from DEF only }; /** diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc index 5c196d026..699518e7a 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc @@ -96,9 +96,10 @@ read_map_file (const std::string &path, db::LEFDEFReaderState &layers) tl::TextInputStream ts (file_stream); std::map purpose_translation; - purpose_translation ["LEFPIN"] = "PIN"; + purpose_translation ["LEFPIN"] = "LEFPIN"; + purpose_translation ["PIN"] = "PIN"; purpose_translation ["LEFOBS"] = "OBS"; - purpose_translation ["SPNET"] = "NET"; + purpose_translation ["SPNET"] = "SPNET"; purpose_translation ["NET"] = "NET"; purpose_translation ["VIA"] = "VIA"; purpose_translation ["BLOCKAGE"] = "BLK"; @@ -406,6 +407,9 @@ class LEFDEFFormatDeclaration tl::make_member (&LEFDEFReaderOptions::produce_pins, &LEFDEFReaderOptions::set_produce_pins, "produce-pins") + tl::make_member (&LEFDEFReaderOptions::pins_suffix, &LEFDEFReaderOptions::set_pins_suffix, "pins-suffix") + tl::make_member (&LEFDEFReaderOptions::pins_datatype, &LEFDEFReaderOptions::set_pins_datatype, "pins-datatype") + + tl::make_member (&LEFDEFReaderOptions::produce_lef_pins, &LEFDEFReaderOptions::set_produce_lef_pins, "produce-lef-pins") + + tl::make_member (&LEFDEFReaderOptions::lef_pins_suffix, &LEFDEFReaderOptions::set_lef_pins_suffix, "lef-pins-suffix") + + tl::make_member (&LEFDEFReaderOptions::lef_pins_datatype, &LEFDEFReaderOptions::set_lef_pins_datatype, "lef-pins-datatype") + tl::make_member (&LEFDEFReaderOptions::produce_obstructions, &LEFDEFReaderOptions::set_produce_obstructions, "produce-obstructions") + tl::make_member (&LEFDEFReaderOptions::obstructions_suffix, &LEFDEFReaderOptions::set_obstructions_suffix, "obstructions-suffix") + tl::make_member (&LEFDEFReaderOptions::obstructions_datatype, &LEFDEFReaderOptions::set_obstructions_datatype, "obstructions-datatype") + @@ -418,6 +422,9 @@ class LEFDEFFormatDeclaration tl::make_member (&LEFDEFReaderOptions::produce_routing, &LEFDEFReaderOptions::set_produce_routing, "produce-routing") + tl::make_member (&LEFDEFReaderOptions::routing_suffix, &LEFDEFReaderOptions::set_routing_suffix, "routing-suffix") + tl::make_member (&LEFDEFReaderOptions::routing_datatype, &LEFDEFReaderOptions::set_routing_datatype, "routing-datatype") + + tl::make_member (&LEFDEFReaderOptions::produce_special_routing, &LEFDEFReaderOptions::set_produce_special_routing, "produce-special-routing") + + tl::make_member (&LEFDEFReaderOptions::special_routing_suffix, &LEFDEFReaderOptions::set_special_routing_suffix, "special-routing-suffix") + + tl::make_member (&LEFDEFReaderOptions::special_routing_datatype, &LEFDEFReaderOptions::set_special_routing_datatype, "special-routing-datatype") + tl::make_member (&LEFDEFReaderOptions::begin_lef_files, &LEFDEFReaderOptions::end_lef_files, &LEFDEFReaderOptions::push_lef_file, "lef-files") ); } diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc index fccdd779b..090fdfae8 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc @@ -789,7 +789,7 @@ LEFImporter::read_macro (Layout &layout) } std::map bboxes; - read_geometries (layout, cell, Pins, &bboxes, prop_id); + read_geometries (layout, cell, LEFPins, &bboxes, prop_id); for (std::map ::const_iterator b = bboxes.begin (); b != bboxes.end (); ++b) { std::pair dl = open_layer (layout, b->first, Label); diff --git a/src/plugins/streamers/lefdef/db_plugin/gsiDeclDbLEFDEF.cc b/src/plugins/streamers/lefdef/db_plugin/gsiDeclDbLEFDEF.cc index 55191416e..6d31e64cc 100644 --- a/src/plugins/streamers/lefdef/db_plugin/gsiDeclDbLEFDEF.cc +++ b/src/plugins/streamers/lefdef/db_plugin/gsiDeclDbLEFDEF.cc @@ -296,6 +296,30 @@ gsi::Class decl_lefdef_config ("db", "LEFDEFReaderConfi "@brief Sets the pin geometry layer datatype value.\n" "See \\produce_via_geometry for details about the layer production rules." ) + + gsi::method ("produce_lef_pins", &db::LEFDEFReaderOptions::produce_lef_pins, + "@brief Gets a value indicating whether LEF pin geometries shall be produced.\n" + "See \\produce_via_geometry for details about the layer production rules." + ) + + gsi::method ("produce_lef_pins=", &db::LEFDEFReaderOptions::set_produce_lef_pins, gsi::arg ("produce"), + "@brief Sets a value indicating whether LEF pin geometries shall be produced.\n" + "See \\produce_via_geometry for details about the layer production rules." + ) + + gsi::method ("lef_pins_suffix", &db::LEFDEFReaderOptions::lef_pins_suffix, + "@brief Gets the LEF pin geometry layer name suffix.\n" + "See \\produce_via_geometry for details about the layer production rules." + ) + + gsi::method ("lef_pins_suffix=", &db::LEFDEFReaderOptions::set_lef_pins_suffix, gsi::arg ("suffix"), + "@brief Sets the LEF pin geometry layer name suffix.\n" + "See \\produce_via_geometry for details about the layer production rules." + ) + + gsi::method ("lef_pins_datatype", &db::LEFDEFReaderOptions::lef_pins_datatype, + "@brief Gets the LEF pin geometry layer datatype value.\n" + "See \\produce_via_geometry for details about the layer production rules." + ) + + gsi::method ("lef_pins_datatype=", &db::LEFDEFReaderOptions::set_lef_pins_datatype, gsi::arg ("datatype"), + "@brief Sets the LEF pin geometry layer datatype value.\n" + "See \\produce_via_geometry for details about the layer production rules." + ) + gsi::method ("produce_obstructions", &db::LEFDEFReaderOptions::produce_obstructions, "@brief Gets a value indicating whether obstruction markers shall be produced.\n" "See \\produce_via_geometry for details about the layer production rules." @@ -392,6 +416,42 @@ gsi::Class decl_lefdef_config ("db", "LEFDEFReaderConfi "@brief Sets the routing layer datatype value.\n" "See \\produce_via_geometry for details about the layer production rules." ) + + gsi::method ("produce_special_routing", &db::LEFDEFReaderOptions::produce_special_routing, + "@brief Gets a value indicating whether special routing geometry shall be produced.\n" + "See \\produce_via_geometry for details about the layer production rules.\n" + "\n" + "The differentiation between special and normal routing has been introduced in version 0.26.5." + ) + + gsi::method ("produce_special_routing=", &db::LEFDEFReaderOptions::set_produce_special_routing, gsi::arg ("produce"), + "@brief Sets a value indicating whether special routing geometry shall be produced.\n" + "See \\produce_via_geometry for details about the layer production rules." + "\n" + "The differentiation between special and normal routing has been introduced in version 0.26.5." + ) + + gsi::method ("special_routing_suffix", &db::LEFDEFReaderOptions::special_routing_suffix, + "@brief Gets the special routing layer name suffix.\n" + "See \\produce_via_geometry for details about the layer production rules." + "\n" + "The differentiation between special and normal routing has been introduced in version 0.26.5." + ) + + gsi::method ("special_routing_suffix=", &db::LEFDEFReaderOptions::set_special_routing_suffix, gsi::arg ("suffix"), + "@brief Sets the special routing layer name suffix.\n" + "See \\produce_via_geometry for details about the layer production rules." + "\n" + "The differentiation between special and normal routing has been introduced in version 0.26.5." + ) + + gsi::method ("special_routing_datatype", &db::LEFDEFReaderOptions::special_routing_datatype, + "@brief Gets the special routing layer datatype value.\n" + "See \\produce_via_geometry for details about the layer production rules." + "\n" + "The differentiation between special and normal routing has been introduced in version 0.26.5." + ) + + gsi::method ("special_routing_datatype=", &db::LEFDEFReaderOptions::set_special_routing_datatype, gsi::arg ("datatype"), + "@brief Sets the special routing layer datatype value.\n" + "See \\produce_via_geometry for details about the layer production rules." + "\n" + "The differentiation between special and normal routing has been introduced in version 0.26.5." + ) + gsi::method ("separate_groups", &db::LEFDEFReaderOptions::separate_groups, "@brief Gets a value indicating whether to create separate parent cells for individual groups.\n" "If this property is set to true, instances belonging to different groups are separated by putting them into " diff --git a/src/plugins/streamers/lefdef/lay_plugin/LEFDEFTechnologyComponentEditor.ui b/src/plugins/streamers/lefdef/lay_plugin/LEFDEFTechnologyComponentEditor.ui index 3833de8a3..845452c8e 100644 --- a/src/plugins/streamers/lefdef/lay_plugin/LEFDEFTechnologyComponentEditor.ui +++ b/src/plugins/streamers/lefdef/lay_plugin/LEFDEFTechnologyComponentEditor.ui @@ -590,13 +590,6 @@ - - - - Obstructions - - - @@ -613,19 +606,6 @@ - - - - - - - - - - Routing - - - @@ -642,43 +622,14 @@ - - - - - - - - - - Pin labels - - - - + Blockages - - - - - 0 - 0 - - - - - - - :/right.png - - - - + @@ -694,18 +645,125 @@ - - - - - - - + - + + + + + + 0 + 0 + + + + + + + :/right.png + + + + + + + + 0 + 0 + + + + + + + :/right.png + + + + + + + + 0 + 0 + + + + + + + :/right.png + + + + + + + Pin labels + + + + + + + + + + + + + Special routing + + + + + + + + + + + + + Routing + + + + + + + + + + + + + Obstructions + + + + + + + + + + + + + + + + + + + LEF Pins + + + diff --git a/src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImportDialogs.cc b/src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImportDialogs.cc index 8aeef44bd..16b70262d 100644 --- a/src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImportDialogs.cc +++ b/src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImportDialogs.cc @@ -353,9 +353,11 @@ LEFDEFReaderOptionsEditor::LEFDEFReaderOptionsEditor (QWidget *parent) connect (produce_regions, SIGNAL (stateChanged (int)), this, SLOT (checkbox_changed ())); connect (produce_via_geometry, SIGNAL (stateChanged (int)), this, SLOT (checkbox_changed ())); connect (produce_pins, SIGNAL (stateChanged (int)), this, SLOT (checkbox_changed ())); + connect (produce_lef_pins, SIGNAL (stateChanged (int)), this, SLOT (checkbox_changed ())); connect (produce_obstructions, SIGNAL (stateChanged (int)), this, SLOT (checkbox_changed ())); connect (produce_blockages, SIGNAL (stateChanged (int)), this, SLOT (checkbox_changed ())); connect (produce_routing, SIGNAL (stateChanged (int)), this, SLOT (checkbox_changed ())); + connect (produce_special_routing, SIGNAL (stateChanged (int)), this, SLOT (checkbox_changed ())); connect (produce_labels, SIGNAL (stateChanged (int)), this, SLOT (checkbox_changed ())); connect (add_lef_file, SIGNAL (clicked ()), this, SLOT (add_lef_file_clicked ())); connect (del_lef_files, SIGNAL (clicked ()), this, SLOT (del_lef_files_clicked ())); @@ -429,6 +431,9 @@ LEFDEFReaderOptionsEditor::commit (db::FormatSpecificReaderOptions *options, con data->set_produce_pins (produce_pins->isChecked ()); data->set_pins_suffix (tl::to_string (suffix_pins->text ())); data->set_pins_datatype (datatype_pins->text ().toInt ()); + data->set_produce_lef_pins (produce_lef_pins->isChecked ()); + data->set_lef_pins_suffix (tl::to_string (suffix_lef_pins->text ())); + data->set_lef_pins_datatype (datatype_lef_pins->text ().toInt ()); data->set_produce_obstructions (produce_obstructions->isChecked ()); data->set_obstructions_suffix (tl::to_string (suffix_obstructions->text ())); data->set_obstructions_datatype (datatype_obstructions->text ().toInt ()); @@ -438,6 +443,9 @@ LEFDEFReaderOptionsEditor::commit (db::FormatSpecificReaderOptions *options, con data->set_produce_routing (produce_routing->isChecked ()); data->set_routing_suffix (tl::to_string (suffix_routing->text ())); data->set_routing_datatype (datatype_routing->text ().toInt ()); + data->set_produce_special_routing (produce_special_routing->isChecked ()); + data->set_special_routing_suffix (tl::to_string (suffix_special_routing->text ())); + data->set_special_routing_datatype (datatype_special_routing->text ().toInt ()); data->set_produce_labels (produce_labels->isChecked ()); data->set_labels_suffix (tl::to_string (suffix_labels->text ())); data->set_labels_datatype (datatype_labels->text ().toInt ()); @@ -483,6 +491,9 @@ LEFDEFReaderOptionsEditor::setup (const db::FormatSpecificReaderOptions *options produce_pins->setChecked (data->produce_pins ()); suffix_pins->setText (tl::to_qstring (data->pins_suffix ())); datatype_pins->setText (QString::number (data->pins_datatype ())); + produce_lef_pins->setChecked (data->produce_lef_pins ()); + suffix_lef_pins->setText (tl::to_qstring (data->lef_pins_suffix ())); + datatype_lef_pins->setText (QString::number (data->lef_pins_datatype ())); produce_obstructions->setChecked (data->produce_obstructions ()); suffix_obstructions->setText (tl::to_qstring (data->obstructions_suffix ())); datatype_obstructions->setText (QString::number (data->obstructions_datatype ())); @@ -492,6 +503,9 @@ LEFDEFReaderOptionsEditor::setup (const db::FormatSpecificReaderOptions *options produce_routing->setChecked (data->produce_routing ()); suffix_routing->setText (tl::to_qstring (data->routing_suffix ())); datatype_routing->setText (QString::number (data->routing_datatype ())); + produce_special_routing->setChecked (data->produce_special_routing ()); + suffix_special_routing->setText (tl::to_qstring (data->special_routing_suffix ())); + datatype_special_routing->setText (QString::number (data->special_routing_datatype ())); produce_labels->setChecked (data->produce_labels ()); suffix_labels->setText (tl::to_qstring (data->labels_suffix ())); datatype_labels->setText (QString::number (data->labels_datatype ())); @@ -523,15 +537,19 @@ LEFDEFReaderOptionsEditor::checkbox_changed () placement_blockage_layer->setEnabled (produce_placement_blockages->isChecked ()); suffix_via_geometry->setEnabled (produce_via_geometry->isChecked ()); suffix_pins->setEnabled (produce_pins->isChecked ()); + suffix_lef_pins->setEnabled (produce_lef_pins->isChecked ()); suffix_obstructions->setEnabled (produce_obstructions->isChecked ()); suffix_blockages->setEnabled (produce_blockages->isChecked ()); suffix_routing->setEnabled (produce_routing->isChecked ()); + suffix_special_routing->setEnabled (produce_special_routing->isChecked ()); suffix_labels->setEnabled (produce_labels->isChecked ()); datatype_via_geometry->setEnabled (produce_via_geometry->isChecked ()); datatype_pins->setEnabled (produce_pins->isChecked ()); + datatype_lef_pins->setEnabled (produce_lef_pins->isChecked ()); datatype_obstructions->setEnabled (produce_obstructions->isChecked ()); datatype_blockages->setEnabled (produce_blockages->isChecked ()); datatype_routing->setEnabled (produce_routing->isChecked ()); + datatype_special_routing->setEnabled (produce_special_routing->isChecked ()); datatype_labels->setEnabled (produce_labels->isChecked ()); } diff --git a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc index 7dbd7772c..45b21683b 100644 --- a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc +++ b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc @@ -295,6 +295,19 @@ TEST(104_doxy_vias) TEST(105_specialnets_geo) { run_test (_this, "specialnets_geo", "lef:test.lef+def:test.def", "au.oas.gz", default_options (), false); + + db::LEFDEFReaderOptions options = default_options (); + options.set_produce_special_routing (false); + run_test (_this, "specialnets_geo", "lef:test.lef+def:test.def", "au_no_spnet.oas.gz", options, false); + + options.set_produce_special_routing (true); + options.set_special_routing_datatype (10); + options.set_special_routing_suffix (".SPNET"); + + options.set_via_geometry_datatype (11); + options.set_via_geometry_suffix (".VIA"); + + run_test (_this, "specialnets_geo", "lef:test.lef+def:test.def", "au_spnet_mapped.oas.gz", options, false); } TEST(106_wrongdirection) @@ -315,4 +328,14 @@ TEST(108_scanchain) TEST(109_foreigncell) { run_test (_this, "foreigncell", "gds:foreign.gds+lef:in_tech.lef+lef:in.lef", "au.oas.gz", default_options (), false); + + db::LEFDEFReaderOptions options = default_options (); + options.set_produce_lef_pins (false); + run_test (_this, "foreigncell", "gds:foreign.gds+lef:in_tech.lef+lef:in.lef", "au_no_lefpins.oas.gz", options, false); + + options.set_produce_lef_pins (true); + options.set_lef_pins_datatype (10); + options.set_lef_pins_suffix (".LEFPIN"); + + run_test (_this, "foreigncell", "gds:foreign.gds+lef:in_tech.lef+lef:in.lef", "au_lefpins_mapped.oas.gz", options, false); } diff --git a/testdata/lefdef/foreigncell/au_lefpins_mapped.oas.gz b/testdata/lefdef/foreigncell/au_lefpins_mapped.oas.gz new file mode 100644 index 0000000000000000000000000000000000000000..7416d50b67a50f24160c04775a45aca30886ad1c GIT binary patch literal 859 zcmV-h1El;PiwFo?H=JGo19WY0E^lFT0Oe6jXd71)efPcj|18-W3PGzT#iNEgBg-wN zR0}zoBt!I>MB`7~IKxDiT!AgOlG`|V<3I>mWYJ`iMHWFA6M|8_=%RF4OfbQOt_$6S z5R8^0q#}z_`o@+OE5zV^-{#(P?!D*T^WG&^Rx>OvwK zR=C}4xSPfKz6hrJC?6E2uIkswSEiBMXo z7R$4hcsCm+(zu=SYTy6hSBs?c;+;rq?|!DkC0Lk}nT+Y=2uqOC&18nkn1lSNiL#i94^c(O&Qd5Ty-*ecm>RXx6oJx%WS)M1+Rj?!B$Yb|REV}wpN2HhutqdS zV>M3WH9-?KNs~22Q#DObd`g&sby($|zzebg56Bv9;;E-mK*Z?PZm>uB_tV08qR3`ElixgFj+~guRd6k4)=x6+fs5sn$ zCV!8peE2O>XaAu4{09BumVi)XnU_AUWi7h`r53mQSJ;@`50w la=nA3f&V5)9A$e(+w{+x{Lx17%K!Nw^dGl~vHvIr0059ru(ALE literal 0 HcmV?d00001 diff --git a/testdata/lefdef/foreigncell/au_no_lefpins.oas.gz b/testdata/lefdef/foreigncell/au_no_lefpins.oas.gz new file mode 100644 index 0000000000000000000000000000000000000000..f0e21a2099c706a17290cee957a3e57c28b1237f GIT binary patch literal 796 zcmV+%1LOQ3iwFowH=JGo19WY0E^lFT0OgTQXcIvc$LG!LXEwV{G>ag)Rp~}iH%%20 zbEvwl!8BQ$txf$})-k**DI(%o@FGP@j-k}x zNt|tyXvKne=knhC{%_vQ|INXa(HA?C>`ui}vIj``sE(>U`h5k}{VBVzJ8h?8y$R!- z9ZOh7uhDN0#?D#i1tus5x8;Gv-wJ}NCuLhn(>`m&<6ckP=&{F~OmRFC^n1Cjth1Gc z`L+x3?xEy>WuHybCTU9)yGPN6dr?gcdwwYR{bj!))3nMKsx&zP#*<8-f+}rM`pJNZ(Z5ZG ziw&Y57d_iPD9~x{jw-rke{ajPHE1NPp=84NySL73gmX_Eh!Dn&M97U7v-y!ixRrGh z&!t$mUAle8DP~Dy;*ChPUq91e5sB&3%_Lz7^0qRGp*?iMxvZH_iM0ek%oPOsoHWfgb?s?K=VgfcuQ<}4}0x-bv3;1TBs~Y0Yp{wdaA_IpFb{L^9?!!%snSy5 zCPRT?HS~~CyTH?GA2L5N5<2aZQNvvub?4jF9sU=0Us<(lH+NMmp&IyH`!AXIcmv9? z06*Y6eJeExAMh(?iv8n-HIPsh`zURA(3(AD_mVniF2XXH?qJr1O;~~oOv+5)GmE^k z9GK<;)4WXlHS_{+5*hnzQ01QxnfHHZ%Irt_p4YI)UlR}tWDcV#@`cFUPKi|TH_{T> a9b%o%y~;O5JoP^>gnk0f#ioIg1poj>IfOO< literal 0 HcmV?d00001 diff --git a/testdata/lefdef/specialnets_geo/au_no_spnet.oas.gz b/testdata/lefdef/specialnets_geo/au_no_spnet.oas.gz new file mode 100644 index 0000000000000000000000000000000000000000..4bf45b0312df6e018c5d1584253c6957ddcc26cf GIT binary patch literal 224 zcmV<603ZJ!iwFojGn`%k19WY0E^lFT08Z@2gEzO`uOm0 zBxht6#Fyk3Fe6xeVV;ihKx`PFQkt7v$<6K`8sg*W=gQ2&%)o=p;b!tRWM%{kLTMo1 zh?yD82h-dvAXAu`fFf`fFQce6BLgFoO@OAns3kKaQ%Z`lv8W{zBa?=Ps37yzyJVUeg2RN0ssIj8)hf~ literal 0 HcmV?d00001 diff --git a/testdata/lefdef/specialnets_geo/au_spnet_mapped.oas.gz b/testdata/lefdef/specialnets_geo/au_spnet_mapped.oas.gz new file mode 100644 index 0000000000000000000000000000000000000000..7decf1260d997e1cf39da23007c07dbec4fafd37 GIT binary patch literal 378 zcmV-=0fqh_iwFpyHJn}m19WY0E^lFT0OgE5Pr^_XhVMDI(n1T3375f?=wie{LS>QY zLZrbaP#SLWW4eP3IuIFjaAR~}@Fy522Syh+qX}t@adL2UboUQ8`b^+~w&MP`g+nA1aBD#TK||R`&&W>z-2+t`|6Ur!Dr}TCk%jR@(ZmJKkS{ z#Zp`ZEnjRqjfSBe9v%0^=}BMBa8a*u;kR49(+&=jbKSFE@0?Brn%Q-$LOxqWjjpyj zLBsVNs!(FYK~FU8q7*4m-H7cnUypVg<LRO9z;3r(W)%c16c|gB`F98*`>2o+=00i4RI?z15UdrVfl1hgqCVjR zhBz=^aE#A*3$K{}jW5i5oWw(u4MC=WA&l^nl8K>QC$17ViLvpfj4+?OgCvoMiR_j@ YI-&efic5JM{O2L$3*NHe>hb~r0R5=4a{vGU literal 0 HcmV?d00001 diff --git a/testdata/ruby/dbReaders.rb b/testdata/ruby/dbReaders.rb index 9cc558f75..c874c782f 100644 --- a/testdata/ruby/dbReaders.rb +++ b/testdata/ruby/dbReaders.rb @@ -269,6 +269,18 @@ class DBReaders_TestClass < TestBase conf.pins_datatype = 18 assert_equal(conf.pins_datatype, 18) + assert_equal(conf.produce_lef_pins, true) + conf.produce_lef_pins = false + assert_equal(conf.produce_lef_pins, false) + + assert_equal(conf.lef_pins_suffix, ".PIN") + conf.lef_pins_suffix = "LEFPIN" + assert_equal(conf.lef_pins_suffix, "LEFPIN") + + assert_equal(conf.lef_pins_datatype, 2) + conf.lef_pins_datatype = 181 + assert_equal(conf.lef_pins_datatype, 181) + assert_equal(conf.produce_obstructions, true) conf.produce_obstructions = false assert_equal(conf.produce_obstructions, false) @@ -317,6 +329,18 @@ class DBReaders_TestClass < TestBase conf.routing_datatype = 22 assert_equal(conf.routing_datatype, 22) + assert_equal(conf.produce_special_routing, true) + conf.produce_special_routing = false + assert_equal(conf.produce_special_routing, false) + + assert_equal(conf.special_routing_suffix, "") + conf.special_routing_suffix = "SPROUT" + assert_equal(conf.special_routing_suffix, "SPROUT") + + assert_equal(conf.special_routing_datatype, 0) + conf.special_routing_datatype = 23 + assert_equal(conf.special_routing_datatype, 23) + assert_equal(conf.separate_groups, false) conf.separate_groups = true assert_equal(conf.separate_groups, true) From 040af426dcfa8dd3cd11b2643fd19bde2c5d6981 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sun, 19 Apr 2020 16:54:41 +0200 Subject: [PATCH 030/121] WIP: refactoring of map file reading. --- src/db/db/dbLayoutUtils.h | 2 +- .../lefdef/db_plugin/dbLEFDEFImporter.cc | 268 +++++++++++++++--- .../lefdef/db_plugin/dbLEFDEFImporter.h | 48 +++- .../lefdef/db_plugin/dbLEFDEFPlugin.cc | 155 +--------- .../lefdef/db_plugin/gsiDeclDbLEFDEF.cc | 16 +- .../LEFDEFTechnologyComponentEditor.ui | 178 ++++++++---- .../lay_plugin/layLEFDEFImportDialogs.cc | 10 + .../lay_plugin/layLEFDEFImportDialogs.h | 1 + .../lefdef/unit_tests/dbLEFDEFImportTests.cc | 11 +- testdata/ruby/dbReaders.rb | 4 + 10 files changed, 444 insertions(+), 249 deletions(-) diff --git a/src/db/db/dbLayoutUtils.h b/src/db/db/dbLayoutUtils.h index 07ba86332..badbf8ae6 100644 --- a/src/db/db/dbLayoutUtils.h +++ b/src/db/db/dbLayoutUtils.h @@ -42,7 +42,7 @@ namespace db * * This implementation will create new layers if required. */ -class DirectLayerMapping +class DB_PUBLIC DirectLayerMapping : public ImportLayerMapping { public: diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc index 07122526d..431ff911f 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc @@ -22,9 +22,11 @@ #include "dbLEFDEFImporter.h" +#include "dbLayoutUtils.h" #include "tlStream.h" #include "tlProgress.h" +#include "tlFileUtils.h" #include @@ -74,7 +76,8 @@ LEFDEFReaderOptions::LEFDEFReaderOptions () m_produce_special_routing (true), m_special_routing_suffix (""), m_special_routing_datatype (0), - m_separate_groups (false) + m_separate_groups (false), + m_consider_map_file (true) { // .. nothing yet .. } @@ -121,6 +124,7 @@ LEFDEFReaderOptions::LEFDEFReaderOptions (const LEFDEFReaderOptions &d) m_special_routing_suffix (d.m_special_routing_suffix), m_special_routing_datatype (d.m_special_routing_datatype), m_separate_groups (d.m_separate_groups), + m_consider_map_file (d.m_consider_map_file), m_lef_files (d.m_lef_files) { // .. nothing yet .. @@ -142,8 +146,20 @@ LEFDEFReaderOptions::format_name () const // ----------------------------------------------------------------------------------- // LEFDEFLayerDelegate implementation +static db::LayerProperties lp_from_string (const std::string &ld) +{ + db::LayerProperties lp; + tl::Extractor ex (ld.c_str ()); + try { + ex.read (lp); + return lp; + } catch (...) { + return db::LayerProperties (0, 0); + } +} + LEFDEFReaderState::LEFDEFReaderState (const LEFDEFReaderOptions *tc) - : m_create_layers (true), m_laynum (1), mp_tech_comp (tc) + : m_create_layers (true), m_has_explicit_layer_mapping (false), m_laynum (1), mp_tech_comp (tc) { if (tc) { m_layer_map = tc->layer_map (); @@ -158,8 +174,208 @@ LEFDEFReaderState::register_layer (const std::string &ln) ++m_laynum; } -std::pair +void +LEFDEFReaderState::set_explicit_layer_mapping (bool f) +{ + m_has_explicit_layer_mapping = f; + if (! f) { + m_layers.clear (); + } +} + +void +LEFDEFReaderState::map_layer_explicit (const std::string &n, LayerPurpose purpose, unsigned int layer) +{ + m_layers [std::make_pair (n, purpose)] = std::make_pair (true, layer); +} + +void +LEFDEFReaderState::read_map_file (const std::string &path, db::Layout &layout) +{ + tl::log << tl::to_string (tr ("Reading LEF/DEF map file")) << " " << path; + + tl::InputFile file (path); + tl::InputStream file_stream (file); + tl::TextInputStream ts (file_stream); + + std::map purpose_translation; + purpose_translation ["LEFPIN"] = LEFPins; + purpose_translation ["PIN"] = Pins; + purpose_translation ["LEFOBS"] = Obstructions; + purpose_translation ["SPNET"] = SpecialRouting; + purpose_translation ["NET"] = Routing; + purpose_translation ["VIA"] = ViaGeometry; + purpose_translation ["BLOCKAGE"] = Blockage; + + std::map, db::LayerProperties> layer_map; + + if (tech_comp ()) { + + const db::LEFDEFReaderOptions &options = *tech_comp (); + + if (options.produce_placement_blockages ()) { + layer_map [std::make_pair (std::string (), Blockage)] = lp_from_string (options.placement_blockage_layer ()); + } + if (options.produce_cell_outlines ()) { + layer_map [std::make_pair (std::string (), Outline)] = lp_from_string (options.cell_outline_layer ()); + } + if (options.produce_regions ()) { + layer_map [std::make_pair (std::string (), Region)] = lp_from_string (options.region_layer ()); + } + + } + + while (! ts.at_end ()) { + + const std::string &l = ts.get_line (); + + tl::Extractor ex (l.c_str ()); + if (ex.at_end () || ex.test ("#")) { + + // ignore empty of comment lines + + } else { + + std::string w1, w2; + int layer = 0, datatype = 0; + + if (ex.try_read_word (w1) && ex.try_read_word (w2, "._$,/:") && ex.try_read (layer) && ex.try_read (datatype)) { + + if (w1 == "DIEAREA") { + + layer_map [std::make_pair (std::string (), Outline)] = db::LayerProperties (layer, datatype, "OUTLINE"); + + } else if (w1 == "NAME") { + + // converts a line like + // "NAME M1/PINS,M2/PINS ..." + // into a canonical name mapping like + // "(M1/LABELS): M1.LABEL" + // "(M2/LABELS): M2.LABEL" + + std::vector layers; + std::vector purposes = tl::split (w2, ","); + for (std::vector::const_iterator p = purposes.begin (); p != purposes.end (); ++p) { + layers.push_back (tl::split (*p, "/").front ()); + } + + std::string final_name = tl::join (layers, "/") + ".LABEL"; + for (std::vector::const_iterator l = layers.begin (); l != layers.end (); ++l) { + layer_map [std::make_pair (*l, Label)] = db::LayerProperties (layer, datatype, final_name); + } + + } else { + + // converts a line like + // "M1 SPNET,NET,PINS,LEFPINS ..." + // into a canonical name mapping like + // "(M1,NET): M1.NET/PINS" + // "(M1,PINS): M1.NET/PINS" + // (separating, translating and recombing the purposes) + + std::set translated_purposes; + std::string purpose_str; + std::vector purposes = tl::split (w2, ","); + for (std::vector::const_iterator p = purposes.begin (); p != purposes.end (); ++p) { + + std::map::const_iterator i = purpose_translation.find (tl::to_upper_case (*p)); + if (i != purpose_translation.end ()) { + + translated_purposes.insert (i->second); + + if (! purpose_str.empty ()) { + purpose_str += "/"; + } + purpose_str += i->first; + + } + } + + std::string final_name = w1 + "." + purpose_str; + + for (std::set::const_iterator p = translated_purposes.begin (); p != translated_purposes.end (); ++p) { + layer_map [std::make_pair (w1, *p)] = db::LayerProperties (layer, datatype, final_name); + } + + } + + } + + } + + } + + set_explicit_layer_mapping (true); + + db::DirectLayerMapping lm (&layout); + for (std::map, db::LayerProperties>::const_iterator i = layer_map.begin (); i != layer_map.end (); ++i) { + map_layer_explicit (i->first.first, i->first.second, lm.map_layer (i->second).second); + } + + // @@@ TODO: need to assign layer/datatype for all layers present. +} + +void +LEFDEFReaderState::import_map_file_heuristics (const std::string &main_path, db::Layout &layout) +{ + std::string input_dir = tl::absolute_path (main_path); + if (! tl::file_exists (input_dir)) { + return; + } + + std::string bn = tl::basename (tl::filename (main_path)); + std::vector map_files; + std::string map_file_exact; + + std::vector entries = tl::dir_entries (input_dir); + for (std::vector::const_iterator e = entries.begin (); e != entries.end (); ++e) { + + if (tl::to_lower_case (tl::extension (*e)) == "map") { + + if (tl::basename (*e) == bn) { + map_file_exact = *e; + } else { + map_files.push_back (*e); + } + + } + + } + + try { + if (! map_file_exact.empty ()) { + read_map_file (tl::combine_path (input_dir, map_file_exact), layout); + } else if (map_files.size () == 1) { + read_map_file (tl::combine_path (input_dir, map_files.front ()), layout); + } + } catch (tl::Exception &ex) { + // ignore read errors on map file (this is a heuristics!) + tl::error << ex.msg (); + } +} + +std::pair LEFDEFReaderState::open_layer (db::Layout &layout, const std::string &n, LayerPurpose purpose) +{ + std::map , std::pair >::const_iterator nl = m_layers.find (std::make_pair (n, purpose)); + if (nl == m_layers.end ()) { + + std::pair ll (false, 0); + + if (! m_has_explicit_layer_mapping) { + ll = open_layer_uncached (layout, n, purpose); + } + + m_layers.insert (std::make_pair (std::make_pair (n, purpose), ll)); + return ll; + + } else { + return nl->second; + } +} + +std::pair +LEFDEFReaderState::open_layer_uncached (db::Layout &layout, const std::string &n, LayerPurpose purpose) { if (purpose == Outline || purpose == PlacementBlockage || purpose == Region) { @@ -167,21 +383,17 @@ LEFDEFReaderState::open_layer (db::Layout &layout, const std::string &n, LayerPu // as is "(name)". It's used for implementing the automatic map file import // feature. std::string ld; - std::string canonical_name; bool produce; if (purpose == Outline) { produce = mp_tech_comp->produce_cell_outlines (); ld = mp_tech_comp->cell_outline_layer (); - canonical_name = "(OUTLINE)"; } else if (purpose == Region) { produce = mp_tech_comp->produce_regions (); ld = mp_tech_comp->region_layer (); - canonical_name = "(REGION)"; } else { produce = mp_tech_comp->produce_placement_blockages (); ld = mp_tech_comp->placement_blockage_layer (); - canonical_name = "(BLK)"; } if (! produce) { @@ -203,10 +415,6 @@ LEFDEFReaderState::open_layer (db::Layout &layout, const std::string &n, LayerPu return ll; - } else if ((ll = m_layer_map.logical (db::LayerProperties (canonical_name), layout)).first) { - - return ll; - } else if (! m_create_layers) { return std::pair (false, 0); @@ -256,74 +464,54 @@ LEFDEFReaderState::open_layer (db::Layout &layout, const std::string &n, LayerPu } // Note: "name" is the decorated name as provided by the tech component's - // x_suffix specifications. As this is a variable entity, we also provide - // a canonical name of the form "(layer,purpose)" where purpose is a - // predefined suffix. The canonical name is the last fallback. Hence this - // allows importing layer mapping files as canonical name mapping. + // x_suffix specifications. std::string name (n); int dt = 0; - std::string canonical_purpose; - if (mp_tech_comp) { switch (purpose) { case Routing: default: name += mp_tech_comp->routing_suffix (); - canonical_purpose = "NET"; dt += mp_tech_comp->routing_datatype (); break; case SpecialRouting: name += mp_tech_comp->special_routing_suffix (); - canonical_purpose = "SPNET"; dt += mp_tech_comp->special_routing_datatype (); break; case ViaGeometry: name += mp_tech_comp->via_geometry_suffix (); dt += mp_tech_comp->via_geometry_datatype (); - canonical_purpose = "VIA"; break; case Label: name += mp_tech_comp->labels_suffix (); dt += mp_tech_comp->labels_datatype (); - canonical_purpose = "LABEL"; break; case Pins: name += mp_tech_comp->pins_suffix (); dt += mp_tech_comp->pins_datatype (); - canonical_purpose = "PIN"; break; case LEFPins: name += mp_tech_comp->lef_pins_suffix (); dt += mp_tech_comp->lef_pins_datatype (); - canonical_purpose = "LEFPIN"; break; case Obstructions: name += mp_tech_comp->obstructions_suffix (); dt += mp_tech_comp->obstructions_datatype (); - canonical_purpose = "OBS"; break; case Blockage: name += mp_tech_comp->blockages_suffix (); dt += mp_tech_comp->blockages_datatype (); - canonical_purpose = "BLK"; break; } } - std::string canonical_name = std::string ("(") + n + "," + canonical_purpose + ")"; - std::pair ll = m_layer_map.logical (name, layout); if (ll.first) { return ll; - } else if ((ll = m_layer_map.logical (db::LayerProperties (canonical_name), layout)).first) { - - // final fallback: try canonical name - return ll; - } else { ll = m_layer_map.logical (n, layout); @@ -341,14 +529,14 @@ LEFDEFReaderState::open_layer (db::Layout &layout, const std::string &n, LayerPu } else { - std::map , unsigned int>::const_iterator nl = m_layers.find (std::make_pair (n, purpose)); - if (nl == m_layers.end ()) { - unsigned int li = layout.insert_layer (db::LayerProperties (name)); - m_layer_map.map (db::LayerProperties (name), li); - m_layers.insert (std::make_pair (std::make_pair (n, purpose), li)); - return std::pair (true, li); + std::map , unsigned int>::const_iterator l = m_unassigned_layers.find (std::make_pair (n, purpose)); + if (l != m_unassigned_layers.end ()) { + return std::pair (true, l->second); } else { - return std::pair (true, nl->second); + unsigned int li = layout.insert_layer (db::LayerProperties (name)); + m_unassigned_layers.insert (std::make_pair (std::make_pair (n, purpose), li)); + m_layer_map.map (db::LayerProperties (name), li); + return std::pair (true, li); } } @@ -380,7 +568,7 @@ LEFDEFReaderState::finish (db::Layout &layout) used_numbers.insert (ln->second); } - for (std::map, unsigned int>::const_iterator l = m_layers.begin (); l != m_layers.end (); ++l) { + for (std::map, unsigned int>::const_iterator l = m_unassigned_layers.begin (); l != m_unassigned_layers.end (); ++l) { int dt = 0; switch (l->first.second) { diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h index 6c9adf325..df61cf62e 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h @@ -515,6 +515,16 @@ public: m_separate_groups = f; } + bool consider_map_file () const + { + return m_consider_map_file; + } + + void set_consider_map_file (bool f) + { + m_consider_map_file = f; + } + private: bool m_read_all_layers; db::LayerMap m_layer_map; @@ -557,6 +567,7 @@ private: std::string m_special_routing_suffix; int m_special_routing_datatype; bool m_separate_groups; + bool m_consider_map_file; std::vector m_lef_files; }; @@ -592,7 +603,32 @@ public: LEFDEFReaderState (const LEFDEFReaderOptions *tc); /** - * @brief Set the layer map + * @brief Provides an explicit layer mapping + * This method is used when reading the layer map file. + */ + void map_layer_explicit (const std::string &n, LayerPurpose purpose, unsigned int layer); + + /** + * @brief Provides an explicit layer mapping + * If this flag is set, the layer mapping specified in the reader options are ignored. + */ + void set_explicit_layer_mapping (bool f); + + /** + * @brief Reads a map file + */ + void read_map_file (const std::string &path, db::Layout &layout); + + /** + * @brief Imports a .map file present next to the input files + * "main_path" path of an input file (DEF). If a suitable .map file is found at this path, + * it is loaded into the reader state object. This will eventually disable any other layer + * mapping except for the global layers (region, outline, placement blockage). + */ + void import_map_file_heuristics (const std::string &main_path, db::Layout &layout); + + /** + * @brief Sets the layer map */ virtual void set_layer_map (const db::LayerMap &lm, bool create_layers) { @@ -601,7 +637,7 @@ public: } /** - * @brief Get the layer map + * @brief Gets the layer map */ const db::LayerMap &layer_map () const { @@ -609,7 +645,7 @@ public: } /** - * @brief Get the layer map (non-const version) + * @brief Gets the layer map (non-const version) */ db::LayerMap &layer_map () { @@ -655,13 +691,17 @@ public: } private: - std::map , unsigned int> m_layers; + std::map , std::pair > m_layers; + std::map , unsigned int> m_unassigned_layers; db::LayerMap m_layer_map; bool m_create_layers; + bool m_has_explicit_layer_mapping; int m_laynum; std::map m_default_number; std::map m_via_cells; const LEFDEFReaderOptions *mp_tech_comp; + + std::pair open_layer_uncached (db::Layout &layout, const std::string &name, LayerPurpose purpose); }; /** diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc index 699518e7a..f42a438e2 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc @@ -30,6 +30,7 @@ #include "dbLEFImporter.h" #include "dbDEFImporter.h" #include "dbLEFDEFImporter.h" +#include "dbLayoutUtils.h" namespace db { @@ -77,156 +78,6 @@ static bool is_def_format (const std::string &fn) return false; } -/** - * @brief Reads a map file - * - * NOTE: this is rather experimental ... no idea what is the specification of - * the map file. - */ -static void -read_map_file (const std::string &path, db::LEFDEFReaderState &layers) -{ - tl::log << tl::to_string (tr ("Reading LEF/DEF map file")) << " " << path; - - db::LayerMap &lm = layers.layer_map (); - unsigned int n = lm.next_index (); - - tl::InputFile file (path); - tl::InputStream file_stream (file); - tl::TextInputStream ts (file_stream); - - std::map purpose_translation; - purpose_translation ["LEFPIN"] = "LEFPIN"; - purpose_translation ["PIN"] = "PIN"; - purpose_translation ["LEFOBS"] = "OBS"; - purpose_translation ["SPNET"] = "SPNET"; - purpose_translation ["NET"] = "NET"; - purpose_translation ["VIA"] = "VIA"; - purpose_translation ["BLOCKAGE"] = "BLK"; - - while (! ts.at_end ()) { - - const std::string &l = ts.get_line (); - - tl::Extractor ex (l.c_str ()); - if (ex.at_end () || ex.test ("#")) { - - // ignore empty of comment lines - - } else { - - std::string w1, w2; - int layer = 0, datatype = 0; - - if (ex.try_read_word (w1) && ex.try_read_word (w2, "._$,/:") && ex.try_read (layer) && ex.try_read (datatype)) { - - if (w1 == "DIEAREA") { - - std::string canonical_name = "OUTLINE"; - lm.map (db::LayerProperties (canonical_name), n++, db::LayerProperties (layer, datatype)); - - } else if (w1 == "NAME") { - - // converts a line like - // "NAME M1/PINS,M2/PINS ..." - // into a canonical name mapping like - // "(M1/LABELS): M1.LABEL" - // "(M2/LABELS): M2.LABEL" - - std::vector layers; - std::vector purposes = tl::split (w2, ","); - for (std::vector::const_iterator p = purposes.begin (); p != purposes.end (); ++p) { - layers.push_back (tl::split (*p, "/").front ()); - } - - std::string final_name = tl::join (layers, "/") + ".LABEL"; - for (std::vector::const_iterator l = layers.begin (); l != layers.end (); ++l) { - std::string canonical_name = std::string ("(") + *l + ",LABEL)"; - lm.map (db::LayerProperties (canonical_name), n, db::LayerProperties (layer, datatype, final_name)); - } - ++n; - - } else { - - // converts a line like - // "M1 SPNET,NET,PINS,LEFPINS ..." - // into a canonical name mapping like - // "(M1,NET): M1.NET/PINS" - // "(M1,PINS): M1.NET/PINS" - // (separating, translating and recombing the purposes) - - std::vector translated_purposes; - std::vector purposes = tl::split (w2, ","); - for (std::vector::const_iterator p = purposes.begin (); p != purposes.end (); ++p) { - std::map::const_iterator i = purpose_translation.find (tl::to_upper_case (*p)); - if (i != purpose_translation.end ()) { - translated_purposes.push_back (i->second); - } - } - - std::sort (translated_purposes.begin (), translated_purposes.end ()); - translated_purposes.erase (std::unique (translated_purposes.begin (), translated_purposes.end ()), translated_purposes.end ()); - std::string final_name = w1 + "." + tl::join (translated_purposes, "/"); - - for (std::vector::const_iterator p = translated_purposes.begin (); p != translated_purposes.end (); ++p) { - std::string canonical_name = std::string ("(") + w1 + "," + *p + ")"; - lm.map (db::LayerProperties (canonical_name), n, db::LayerProperties (layer, datatype, final_name)); - } - ++n; - - } - - } - - } - - } -} - -/** - * @brief Imports a .map file present next to the input files - */ -static void -import_map_file_heuristics (const std::string &main_path, db::LEFDEFReaderState &layers) -{ - std::string input_dir = tl::absolute_path (main_path); - if (! tl::file_exists (input_dir)) { - return; - } - - std::string bn = tl::basename (tl::filename (main_path)); - std::vector map_files; - std::string map_file_exact; - - std::vector entries = tl::dir_entries (input_dir); - for (std::vector::const_iterator e = entries.begin (); e != entries.end (); ++e) { - - if (tl::to_lower_case (tl::extension (*e)) == "map") { - - if (tl::basename (*e) == bn) { - map_file_exact = *e; - } else { - map_files.push_back (*e); - } - - } - - } - - try { - if (! map_file_exact.empty ()) { - read_map_file (tl::combine_path (input_dir, map_file_exact), layers); - tl::log << layers.layer_map ().to_string_file_format (); // @@@ - } else if (map_files.size () == 1) { - read_map_file (tl::combine_path (input_dir, map_files.front ()), layers); - tl::log << layers.layer_map ().to_string_file_format (); // @@@ - } - } catch (tl::Exception &ex) { - // ignore read errors on map file (this is a heuristics!) - tl::error << ex.msg (); - } -} - class LEFDEFReader : public db::ReaderBase { @@ -275,7 +126,9 @@ private: db::LEFDEFReaderState state (lefdef_options); - import_map_file_heuristics (m_stream.absolute_path (), state); + if (lefdef_options->consider_map_file ()) { + state.import_map_file_heuristics (m_stream.absolute_path (), layout); + } state.prepare (layout); layout.dbu (lefdef_options->dbu ()); diff --git a/src/plugins/streamers/lefdef/db_plugin/gsiDeclDbLEFDEF.cc b/src/plugins/streamers/lefdef/db_plugin/gsiDeclDbLEFDEF.cc index 6d31e64cc..14336a90b 100644 --- a/src/plugins/streamers/lefdef/db_plugin/gsiDeclDbLEFDEF.cc +++ b/src/plugins/streamers/lefdef/db_plugin/gsiDeclDbLEFDEF.cc @@ -461,11 +461,25 @@ gsi::Class decl_lefdef_config ("db", "LEFDEFReaderConfi "This property has been added in version 0.26.5.\n" ) + gsi::method ("separate_groups=", &db::LEFDEFReaderOptions::set_separate_groups, gsi::arg ("flag"), - "@brief Gets a value indicating whether to create separate parent cells for individual groups.\n" + "@brief Sets a value indicating whether to create separate parent cells for individual groups.\n" "See \\seperate_groups for details about this property.\n" "\n" "This property has been added in version 0.26.5.\n" ) + + gsi::method ("consider_map_file", &db::LEFDEFReaderOptions::consider_map_file, + "@brief Gets a value indicating whether to consider reading .map files next to DEF files.\n" + "If this property is set to true (the default), the DEF reader will look for .map files next to the " + "DEF file. If such a file is found, it will be used to map DEF layers to layout layers. The layer mapping " + "settings specified in the reader options are ignored in this case.\n" + "\n" + "This property has been added in version 0.26.5.\n" + ) + + gsi::method ("consider_map_file=", &db::LEFDEFReaderOptions::set_consider_map_file, gsi::arg ("flag"), + "@brief Sets a value indicating whether to consider reading .map files next to DEF files.\n" + "See \\consider_map_file for details about this property.\n" + "\n" + "This property has been added in version 0.26.5.\n" + ) + gsi::method ("lef_files", &db::LEFDEFReaderOptions::lef_files, "@brief Gets the list technology LEF files to additionally import\n" "Returns a list of path names for technology LEF files to read in addition to the primary file. " diff --git a/src/plugins/streamers/lefdef/lay_plugin/LEFDEFTechnologyComponentEditor.ui b/src/plugins/streamers/lefdef/lay_plugin/LEFDEFTechnologyComponentEditor.ui index 845452c8e..1ae4b3c64 100644 --- a/src/plugins/streamers/lefdef/lay_plugin/LEFDEFTechnologyComponentEditor.ui +++ b/src/plugins/streamers/lefdef/lay_plugin/LEFDEFTechnologyComponentEditor.ui @@ -207,17 +207,13 @@ 4 - - - - Layout database unit - - - - - - - Via cell name prefix + + + + + 0 + 0 + @@ -234,6 +230,34 @@ + + + + Produce a parent cell for each group + + + + + + + Via cell name prefix + + + + + + + Layout database unit + + + + + + + Separate groups + + + @@ -244,27 +268,20 @@ - - - - - 0 - 0 - + + + + Consider map files - - + + - Produce a parent cell for each group + Look for .map files next to DEF files and use them to map layers - - - - - - Separate groups + + true @@ -517,13 +534,6 @@ - - - - Produce ... - - - @@ -764,6 +774,56 @@ + + + + QFrame::NoFrame + + + QFrame::Raised + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Layer assignment is not used if a .map file is present for DEF layer mapping + + + + + + :/warn_16.png + + + + + + + + 1 + 0 + + + + Produce ... + + + + + + @@ -781,10 +841,7 @@ true - - - 6 - + 9 @@ -797,21 +854,14 @@ 4 - + Read all layers (additionally to the ones in the mapping table) - - - - Qt::Horizontal - - - - + @@ -833,6 +883,32 @@ + + + + + 0 + 0 + + + + This table is not used if a .map file is present for DEF layer mapping + + + + + + :/warn_16.png + + + + + + + Qt::Horizontal + + + @@ -881,12 +957,12 @@ setChecked(bool) - 186 - 598 + 229 + 838 - 155 - 553 + 198 + 701 diff --git a/src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImportDialogs.cc b/src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImportDialogs.cc index 16b70262d..fec570018 100644 --- a/src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImportDialogs.cc +++ b/src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImportDialogs.cc @@ -363,6 +363,7 @@ LEFDEFReaderOptionsEditor::LEFDEFReaderOptionsEditor (QWidget *parent) connect (del_lef_files, SIGNAL (clicked ()), this, SLOT (del_lef_files_clicked ())); connect (move_lef_files_up, SIGNAL (clicked ()), this, SLOT (move_lef_files_up_clicked ())); connect (move_lef_files_down, SIGNAL (clicked ()), this, SLOT (move_lef_files_down_clicked ())); + connect (consider_map_file, SIGNAL (stateChanged (int)), this, SLOT (consider_map_file_state_changed ())); lay::activate_help_links (help_label); } @@ -450,6 +451,7 @@ LEFDEFReaderOptionsEditor::commit (db::FormatSpecificReaderOptions *options, con data->set_labels_suffix (tl::to_string (suffix_labels->text ())); data->set_labels_datatype (datatype_labels->text ().toInt ()); data->set_separate_groups (separate_groups->isChecked ()); + data->set_consider_map_file (consider_map_file->isChecked ()); data->clear_lef_files (); for (int i = 0; i < lef_files->count (); ++i) { @@ -510,6 +512,7 @@ LEFDEFReaderOptionsEditor::setup (const db::FormatSpecificReaderOptions *options suffix_labels->setText (tl::to_qstring (data->labels_suffix ())); datatype_labels->setText (QString::number (data->labels_datatype ())); separate_groups->setChecked (data->separate_groups ()); + consider_map_file->setChecked (data->consider_map_file ()); checkbox_changed (); @@ -526,6 +529,13 @@ LEFDEFReaderOptionsEditor::setup (const db::FormatSpecificReaderOptions *options } } +void +LEFDEFReaderOptionsEditor::consider_map_file_state_changed () +{ + warn1->setVisible (consider_map_file->isChecked ()); + warn2->setVisible (consider_map_file->isChecked ()); +} + void LEFDEFReaderOptionsEditor::checkbox_changed () { diff --git a/src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImportDialogs.h b/src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImportDialogs.h index 7234c76aa..1da4f81b2 100644 --- a/src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImportDialogs.h +++ b/src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImportDialogs.h @@ -98,6 +98,7 @@ private slots: void del_lef_files_clicked (); void move_lef_files_up_clicked (); void move_lef_files_down_clicked (); + void consider_map_file_state_changed (); private: tl::weak_ptr mp_tech; diff --git a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc index 45b21683b..97e36f7d9 100644 --- a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc +++ b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc @@ -69,7 +69,15 @@ static void run_test (tl::TestBase *_this, const char *lef_dir, const char *file while (! ex.at_end ()) { - if (ex.test ("def:")) { + if (ex.test ("map:")) { + + std::string fn = fn_path, f; + ex.read_word_or_quoted (f); + fn += f; + + ld.read_map_file (fn, layout); + + } else if (ex.test ("def:")) { std::string fn = fn_path, f; ex.read_word_or_quoted (f); @@ -230,6 +238,7 @@ TEST(15) TEST(16) { run_test (_this, "def7", "lef:cells.lef+lef:tech.lef+def:in.def.gz", "au.oas.gz", default_options ()); + run_test (_this, "def7", "map:in.map+lef:cells.lef+lef:tech.lef+def:in.def.gz", "au_with_map_file.oas.gz", default_options ()); } TEST(17) diff --git a/testdata/ruby/dbReaders.rb b/testdata/ruby/dbReaders.rb index c874c782f..b17092355 100644 --- a/testdata/ruby/dbReaders.rb +++ b/testdata/ruby/dbReaders.rb @@ -345,6 +345,10 @@ class DBReaders_TestClass < TestBase conf.separate_groups = true assert_equal(conf.separate_groups, true) + assert_equal(conf.consider_map_file, true) + conf.consider_map_file = false + assert_equal(conf.consider_map_file, false) + assert_equal(conf.lef_files.join(","), "") conf.lef_files = [ "u.lef", "v.lef" ] assert_equal(conf.lef_files.join(","), "u.lef,v.lef") From 71906a5681f1feede10997dbd5809d2dcb435c8a Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sun, 19 Apr 2020 19:12:03 +0200 Subject: [PATCH 031/121] WIP: some further refactoring of the layer mapping scheme. --- .../lefdef/db_plugin/dbLEFDEFImporter.cc | 24 +++---------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc index 431ff911f..78e8e26cc 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc @@ -209,22 +209,6 @@ LEFDEFReaderState::read_map_file (const std::string &path, db::Layout &layout) std::map, db::LayerProperties> layer_map; - if (tech_comp ()) { - - const db::LEFDEFReaderOptions &options = *tech_comp (); - - if (options.produce_placement_blockages ()) { - layer_map [std::make_pair (std::string (), Blockage)] = lp_from_string (options.placement_blockage_layer ()); - } - if (options.produce_cell_outlines ()) { - layer_map [std::make_pair (std::string (), Outline)] = lp_from_string (options.cell_outline_layer ()); - } - if (options.produce_regions ()) { - layer_map [std::make_pair (std::string (), Region)] = lp_from_string (options.region_layer ()); - } - - } - while (! ts.at_end ()) { const std::string &l = ts.get_line (); @@ -311,8 +295,6 @@ LEFDEFReaderState::read_map_file (const std::string &path, db::Layout &layout) for (std::map, db::LayerProperties>::const_iterator i = layer_map.begin (); i != layer_map.end (); ++i) { map_layer_explicit (i->first.first, i->first.second, lm.map_layer (i->second).second); } - - // @@@ TODO: need to assign layer/datatype for all layers present. } void @@ -362,7 +344,7 @@ LEFDEFReaderState::open_layer (db::Layout &layout, const std::string &n, LayerPu std::pair ll (false, 0); - if (! m_has_explicit_layer_mapping) { + if (n.empty () || ! m_has_explicit_layer_mapping) { ll = open_layer_uncached (layout, n, purpose); } @@ -377,13 +359,13 @@ LEFDEFReaderState::open_layer (db::Layout &layout, const std::string &n, LayerPu std::pair LEFDEFReaderState::open_layer_uncached (db::Layout &layout, const std::string &n, LayerPurpose purpose) { - if (purpose == Outline || purpose == PlacementBlockage || purpose == Region) { + if (n.empty ()) { // NOTE: the canonical name is independent from the tech component's settings // as is "(name)". It's used for implementing the automatic map file import // feature. std::string ld; - bool produce; + bool produce = false; if (purpose == Outline) { produce = mp_tech_comp->produce_cell_outlines (); From c7de5420702f7f889b1890392a1ca69cdca63be9 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sun, 19 Apr 2020 20:14:12 +0200 Subject: [PATCH 032/121] Some more refactoring of DEF layer mapping --- .../lefdef/db_plugin/dbDEFImporter.cc | 4 +- .../lefdef/db_plugin/dbLEFDEFImporter.cc | 39 ++++++++----------- .../lefdef/db_plugin/dbLEFDEFImporter.h | 11 ++---- .../lefdef/db_plugin/dbLEFDEFPlugin.cc | 3 +- .../lefdef/lay_plugin/layLEFDEFImport.cc | 15 ++++--- .../lefdef/unit_tests/dbLEFDEFImportTests.cc | 4 +- 6 files changed, 30 insertions(+), 46 deletions(-) diff --git a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc index 708e29b12..3c6e00563 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc @@ -1398,7 +1398,7 @@ DEFImporter::do_read (db::Layout &layout) } else { - std::pair dl = open_layer (layout, std::string (), Region); + std::pair dl = open_layer (layout, std::string (), Regions); if (dl.first) { for (std::vector::const_iterator p = r->second.begin (); p != r->second.end (); ++p) { group_cell->shapes (dl.second).insert (*p); @@ -1441,7 +1441,7 @@ DEFImporter::do_read (db::Layout &layout) if (! regions.empty ()) { - std::pair dl = open_layer (layout, std::string (), Region); + std::pair dl = open_layer (layout, std::string (), Regions); if (dl.first) { for (std::map >::const_iterator r = regions.begin (); r != regions.end (); ++r) { diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc index 78e8e26cc..11105b085 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc @@ -146,25 +146,15 @@ LEFDEFReaderOptions::format_name () const // ----------------------------------------------------------------------------------- // LEFDEFLayerDelegate implementation -static db::LayerProperties lp_from_string (const std::string &ld) -{ - db::LayerProperties lp; - tl::Extractor ex (ld.c_str ()); - try { - ex.read (lp); - return lp; - } catch (...) { - return db::LayerProperties (0, 0); - } -} - -LEFDEFReaderState::LEFDEFReaderState (const LEFDEFReaderOptions *tc) +LEFDEFReaderState::LEFDEFReaderState (const LEFDEFReaderOptions *tc, db::Layout &layout) : m_create_layers (true), m_has_explicit_layer_mapping (false), m_laynum (1), mp_tech_comp (tc) { if (tc) { m_layer_map = tc->layer_map (); m_create_layers = tc->read_all_layers (); } + + m_layer_map.prepare (layout); } void @@ -184,9 +174,10 @@ LEFDEFReaderState::set_explicit_layer_mapping (bool f) } void -LEFDEFReaderState::map_layer_explicit (const std::string &n, LayerPurpose purpose, unsigned int layer) +LEFDEFReaderState::map_layer_explicit (const std::string &n, LayerPurpose purpose, const db::LayerProperties &lp, unsigned int layer) { m_layers [std::make_pair (n, purpose)] = std::make_pair (true, layer); + m_layer_map.map (lp, layer); } void @@ -229,6 +220,14 @@ LEFDEFReaderState::read_map_file (const std::string &path, db::Layout &layout) layer_map [std::make_pair (std::string (), Outline)] = db::LayerProperties (layer, datatype, "OUTLINE"); + } else if (w1 == "REGIONS") { + + layer_map [std::make_pair (std::string (), Regions)] = db::LayerProperties (layer, datatype, "REGIONS"); + + } else if (w1 == "BLOCKAGE") { + + layer_map [std::make_pair (std::string (), PlacementBlockage)] = db::LayerProperties (layer, datatype, "PLACEMENT_BLK"); + } else if (w1 == "NAME") { // converts a line like @@ -293,7 +292,7 @@ LEFDEFReaderState::read_map_file (const std::string &path, db::Layout &layout) db::DirectLayerMapping lm (&layout); for (std::map, db::LayerProperties>::const_iterator i = layer_map.begin (); i != layer_map.end (); ++i) { - map_layer_explicit (i->first.first, i->first.second, lm.map_layer (i->second).second); + map_layer_explicit (i->first.first, i->first.second, i->second, lm.map_layer (i->second).second); } } @@ -370,10 +369,10 @@ LEFDEFReaderState::open_layer_uncached (db::Layout &layout, const std::string &n if (purpose == Outline) { produce = mp_tech_comp->produce_cell_outlines (); ld = mp_tech_comp->cell_outline_layer (); - } else if (purpose == Region) { + } else if (purpose == Regions) { produce = mp_tech_comp->produce_regions (); ld = mp_tech_comp->region_layer (); - } else { + } else if (purpose == PlacementBlockage) { produce = mp_tech_comp->produce_placement_blockages (); ld = mp_tech_comp->placement_blockage_layer (); } @@ -528,12 +527,6 @@ LEFDEFReaderState::open_layer_uncached (db::Layout &layout, const std::string &n } } -void -LEFDEFReaderState::prepare (db::Layout &layout) -{ - m_layer_map.prepare (layout); -} - void LEFDEFReaderState::finish (db::Layout &layout) { diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h index df61cf62e..40838f89d 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h @@ -586,7 +586,7 @@ enum LayerPurpose Outline, // from LEF+DEF Blockage, // from DEF only PlacementBlockage, // from DEF only - Region, // from DEF only + Regions, // from DEF only }; /** @@ -600,13 +600,13 @@ public: /** * @brief Constructor */ - LEFDEFReaderState (const LEFDEFReaderOptions *tc); + LEFDEFReaderState (const LEFDEFReaderOptions *tc, db::Layout &layout); /** * @brief Provides an explicit layer mapping * This method is used when reading the layer map file. */ - void map_layer_explicit (const std::string &n, LayerPurpose purpose, unsigned int layer); + void map_layer_explicit (const std::string &n, LayerPurpose purpose, const LayerProperties &lp, unsigned int layer); /** * @brief Provides an explicit layer mapping @@ -662,11 +662,6 @@ public: */ void register_layer (const std::string &l); - /** - * @brief Prepare, i.e. create layers required by the layer map - */ - void prepare (db::Layout &layout); - /** * @brief Finish, i.e. assign GDS layer numbers to the layers */ diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc index f42a438e2..4caffcf97 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc @@ -124,13 +124,12 @@ private: lefdef_options = &default_options; } - db::LEFDEFReaderState state (lefdef_options); + db::LEFDEFReaderState state (lefdef_options, layout); if (lefdef_options->consider_map_file ()) { state.import_map_file_heuristics (m_stream.absolute_path (), layout); } - state.prepare (layout); layout.dbu (lefdef_options->dbu ()); if (import_lef) { diff --git a/src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImport.cc b/src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImport.cc index 14d8c7463..f16b275ef 100644 --- a/src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImport.cc +++ b/src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImport.cc @@ -140,8 +140,7 @@ public: } } - db::LEFDEFReaderState layers (&options); - layers.prepare (*layout); + db::LEFDEFReaderState state (&options, *layout); layout->dbu (options.dbu ()); if (import_lef) { @@ -153,11 +152,11 @@ public: for (std::vector::const_iterator l = options.begin_lef_files (); l != options.end_lef_files (); ++l) { tl::InputStream lef_stream (*l); tl::log << tl::to_string (QObject::tr ("Reading")) << " " << *l; - importer.read (lef_stream, *layout, layers); + importer.read (lef_stream, *layout, state); } tl::log << tl::to_string (QObject::tr ("Reading")) << " " << data.file; - importer.read (stream, *layout, layers); + importer.read (stream, *layout, state); } else { @@ -177,23 +176,23 @@ public: if (fi.isAbsolute ()) { tl::InputStream lef_stream (*l); tl::log << tl::to_string (QObject::tr ("Reading")) << " " << *l; - importer.read_lef (lef_stream, *layout, layers); + importer.read_lef (lef_stream, *layout, state); } else { std::string ex_l = tl::to_string (def_fi.absoluteDir ().absoluteFilePath (tl::to_qstring (*l))); tl::InputStream lef_stream (ex_l); tl::log << tl::to_string (QObject::tr ("Reading")) << " " << *l; - importer.read_lef (lef_stream, *layout, layers); + importer.read_lef (lef_stream, *layout, state); } } tl::log << tl::to_string (QObject::tr ("Reading")) << " " << data.file; - importer.read (stream, *layout, layers); + importer.read (stream, *layout, state); } - layers.finish (*layout); + state.finish (*layout); lay::LayoutView *view = lay::LayoutView::current (); if (! view || data.mode == 1) { diff --git a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc index 97e36f7d9..cdd6bf28c 100644 --- a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc +++ b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc @@ -56,14 +56,12 @@ static void run_test (tl::TestBase *_this, const char *lef_dir, const char *file fn_path += lef_dir; fn_path += "/"; - db::LEFDEFReaderState ld (&tc); - db::Manager m (false); db::Layout layout (&m), layout2 (&m), layout_au (&m); tl::Extractor ex (filename); - ld.prepare (layout); + db::LEFDEFReaderState ld (&tc, layout); db::DEFImporter imp; From f6140055d653944bb5fa36da95524672578b54a9 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Fri, 24 Apr 2020 23:21:27 +0200 Subject: [PATCH 033/121] Modified reader scheme for FOREIGNCELL --- src/laybasic/laybasic/layLayerProperties.cc | 13 +++-- .../lefdef/db_plugin/dbDEFImporter.cc | 6 +-- .../lefdef/db_plugin/dbLEFImporter.cc | 47 ++++++++++++------ .../lefdef/db_plugin/dbLEFImporter.h | 4 +- .../lefdef/unit_tests/dbLEFDEFImportTests.cc | 9 ++-- testdata/lefdef/foreigncell/au.oas.gz | Bin 859 -> 811 bytes .../foreigncell/au_lefpins_mapped.oas.gz | Bin 859 -> 0 bytes .../lefdef/foreigncell/au_no_lefpins.oas.gz | Bin 796 -> 0 bytes testdata/lefdef/foreigncell/foreign.gds | Bin 3484 -> 3722 bytes testdata/lefdef/foreigncell/in.def | 17 +++++++ .../lefdef/lefpins/au_lefpins_mapped.oas.gz | Bin 0 -> 335 bytes testdata/lefdef/lefpins/au_no_lefpins.oas.gz | Bin 0 -> 269 bytes testdata/lefdef/lefpins/in.def | 15 ++++++ testdata/lefdef/lefpins/in.lef | 15 ++++++ testdata/lefdef/lefpins/in_tech.lef | 36 ++++++++++++++ 15 files changed, 135 insertions(+), 27 deletions(-) delete mode 100644 testdata/lefdef/foreigncell/au_lefpins_mapped.oas.gz delete mode 100644 testdata/lefdef/foreigncell/au_no_lefpins.oas.gz create mode 100644 testdata/lefdef/foreigncell/in.def create mode 100644 testdata/lefdef/lefpins/au_lefpins_mapped.oas.gz create mode 100644 testdata/lefdef/lefpins/au_no_lefpins.oas.gz create mode 100644 testdata/lefdef/lefpins/in.def create mode 100644 testdata/lefdef/lefpins/in.lef create mode 100644 testdata/lefdef/lefpins/in_tech.lef diff --git a/src/laybasic/laybasic/layLayerProperties.cc b/src/laybasic/laybasic/layLayerProperties.cc index 53a4e88be..e150fa401 100644 --- a/src/laybasic/laybasic/layLayerProperties.cc +++ b/src/laybasic/laybasic/layLayerProperties.cc @@ -1839,10 +1839,15 @@ LayerPropertiesList::load (tl::XMLSource &stream, std::vector > std::string inst_name = get (); std::string model = get (); - db::Cell *cell = m_lef_importer.macro_by_name (model); + std::pair ct = m_lef_importer.macro_by_name (model); while (test ("+")) { @@ -1158,8 +1158,8 @@ DEFImporter::read_components (std::list > db::FTrans ft = get_orient (false /*mandatory*/); db::Vector d = pt - m_lef_importer.macro_bbox_by_name (model).transformed (ft).lower_left (); - if (cell) { - db::CellInstArray inst (db::CellInst (cell->cell_index ()), db::Trans (ft.rot (), d)); + if (ct.first) { + db::CellInstArray inst (db::CellInst (ct.first->cell_index ()), db::Trans (ft.rot (), d) * ct.second); instances.push_back (std::make_pair (inst_name, inst)); } else { warn (tl::to_string (tr ("Macro not found in LEF file: ")) + model); diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc index 090fdfae8..1f8d4b942 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc @@ -105,14 +105,14 @@ LEFImporter::layer_width (const std::string &layer, const std::string &nondefaul } } -db::Cell * +std::pair LEFImporter::macro_by_name (const std::string &name) const { - std::map::const_iterator m = m_macros_by_name.find (name); + std::map >::const_iterator m = m_macros_by_name.find (name); if (m != m_macros_by_name.end ()) { return m->second; } else { - return 0; + return std::make_pair ((db::Cell *) 0, db::Trans ()); } } @@ -726,9 +726,9 @@ LEFImporter::read_macro (Layout &layout) std::string mn = get (); set_cellname (mn); - db::Cell &cell = layout.cell (layout.add_cell (mn.c_str ())); - - m_macros_by_name.insert (std::make_pair (mn, &cell)); + db::Cell &cell = layout.cell (layout.add_cell ()); + db::Cell *foreign_cell = 0; + db::Trans foreign_trans; db::Point origin; db::Vector size; @@ -811,13 +811,12 @@ LEFImporter::read_macro (Layout &layout) } else if (test ("FOREIGN")) { - std::string cn = get (); - - if (cn == mn) { - // rename out macro placeholder cell so we don't create a recursive hierarchy - layout.rename_cell (cell.cell_index (), ("LEF_" + mn).c_str ()); + if (foreign_cell) { + error ("Duplicate FOREIGN definition"); } + std::string cn = get (); + db::cell_index_type ci; std::pair c = layout.cell_by_name (cn.c_str ()); if (c.first) { @@ -836,7 +835,8 @@ LEFImporter::read_macro (Layout &layout) expect (";"); - cell.insert (db::CellInstArray (db::CellInst (ci), (db::Trans (origin - db::Point ()) * db::Trans (ft)).inverted ())); + foreign_cell = &layout.cell (ci); + foreign_trans = (db::Trans (origin - db::Point ()) * db::Trans (ft)).inverted (); } else if (test ("OBS")) { @@ -851,9 +851,26 @@ LEFImporter::read_macro (Layout &layout) } - std::pair dl = open_layer (layout, std::string (), Outline); - if (dl.first) { - cell.shapes (dl.second).insert (db::Box (-origin, -origin + size)); + if (! foreign_cell) { + + // actually implement the real cell + + layout.rename_cell (cell.cell_index (), mn.c_str ()); + + std::pair dl = open_layer (layout, std::string (), Outline); + if (dl.first) { + cell.shapes (dl.second).insert (db::Box (-origin, -origin + size)); + } + + m_macros_by_name.insert (std::make_pair (mn, std::make_pair (&cell, db::Trans ()))); + + } else { + + // use FOREIGN cell instead of new one + + layout.delete_cell (cell.cell_index ()); + m_macros_by_name.insert (std::make_pair (mn, std::make_pair (foreign_cell, foreign_trans))); + } m_macro_bboxes_by_name.insert (std::make_pair (mn, db::Box (-origin, -origin + size))); diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.h b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.h index f52133996..859ceef54 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.h +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.h @@ -63,7 +63,7 @@ public: * Returns 0 if the name is not a valid macro name. Otherwise it returns the pointer * to the corresponding db::Cell object. */ - db::Cell *macro_by_name (const std::string ¯o_name) const; + std::pair macro_by_name (const std::string ¯o_name) const; /** * @brief Get the cell bbox for the given macro name @@ -125,7 +125,7 @@ private: std::map > m_default_widths; std::map m_default_ext; std::map > m_min_widths; - std::map m_macros_by_name; + std::map > m_macros_by_name; std::map m_macro_bboxes_by_name; std::map m_vias; std::set m_routing_layers, m_cut_layers; diff --git a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc index cdd6bf28c..30090da2b 100644 --- a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc +++ b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc @@ -334,15 +334,18 @@ TEST(108_scanchain) TEST(109_foreigncell) { - run_test (_this, "foreigncell", "gds:foreign.gds+lef:in_tech.lef+lef:in.lef", "au.oas.gz", default_options (), false); + run_test (_this, "foreigncell", "gds:foreign.gds+lef:in_tech.lef+lef:in.lef+def:in.def", "au.oas.gz", default_options (), false); +} +TEST(110_lefpins) +{ db::LEFDEFReaderOptions options = default_options (); options.set_produce_lef_pins (false); - run_test (_this, "foreigncell", "gds:foreign.gds+lef:in_tech.lef+lef:in.lef", "au_no_lefpins.oas.gz", options, false); + run_test (_this, "lefpins", "lef:in_tech.lef+lef:in.lef+def:in.def", "au_no_lefpins.oas.gz", options, false); options.set_produce_lef_pins (true); options.set_lef_pins_datatype (10); options.set_lef_pins_suffix (".LEFPIN"); - run_test (_this, "foreigncell", "gds:foreign.gds+lef:in_tech.lef+lef:in.lef", "au_lefpins_mapped.oas.gz", options, false); + run_test (_this, "lefpins", "lef:in_tech.lef+lef:in.lef+def:in.def", "au_lefpins_mapped.oas.gz", options, false); } diff --git a/testdata/lefdef/foreigncell/au.oas.gz b/testdata/lefdef/foreigncell/au.oas.gz index a46321b03e36bc56c9ec2e5bd21b35ef0920623e..fec13c35bc49f6cff4b3e934555e6673cff62a79 100644 GIT binary patch literal 811 zcmV+`1JwK zIqQt4$Af0IEDyWJQuy;yGClH5p=h&qtP%OFYg88NOMX3A2-!t*Y0mHEBeL!qwcwYq zkxbt{h*!T#T^gH}Ro7Su=9B63=gm<|9&(Lp{Xy7hGHoTOHA7i(jUTE(^PoVEx<mXMx+BSJ5HZUK?{&yhj{Xkl{fQ3&ZTSt2K%PF6_HbPJfroH{@XVL}rN zJ?;o8C}&}jG5x3rIcwB)@(d&O7*-^Pvzc)_%Q8?;WQxeXf~=Fb@dajdJkcPr4^fIK zp*$6+NF^%M2vw*`HA-oe4$+uC_9Z523%1ZB-fM%`f*rI5+u|15fE__M$(i4vCA@++ zcoUxEb$E?#{ekZM%74FwreCwl=eP||fYqsQr8Rho-Br8>d(t|r;uqN45O#Up1nCLP z>E9*|J;|}k_*-e2--O5fHd?{cEx6T%ZPbRTP1uKZXu+Ro9rkdSnL=bBOu8M^BjS-c zC2r_S82JY?Fa2Y88%$jM*xcXno_Vd{J=WkmqH+CI46{|7`PWq-qOamtOvU6qtEpZ; zN5i+_8NRat%lv<9GdR|Tj`$R7DAwhENAIyF$9ARNXkvtuAc|u9cm;RF#5tC5u`X(} pih~5=UJ97c%BK*UC8N1@n@7#X9F)6qtw-*)0!e4r_>Lft>4PZFk5_rQ|@$Jnv3<`O0)W z5|X(c)ZaldzU%u`ax^>axICqW64u_>yCqnO^a@ ztrw@uGj7?ND$qi8X597jUQx64N$+-{5>5QL6VD9ve;vOn%C>w}&L0 zjuD~SSf6cWD8}+WED02+l7nW7W*{HPB%XeJ%F3AJG!@#PC=h9(E)}VuVwI?j z%Bq~otAZ-30aa3ERZ&$feu^;NE3m{pgEwRq9+PEQ!()HqpYF0h|A9x=aE)?xxDT4a z$eTh97K#0c)L=_khDYQHah`I2ahd_beHhn%i0WDt(N1Xv*7zE-Yf~S%R@9tm8UdUWFDc!xC)ZW!NGO+6vrkG(4_F?=ji{1Um9j`xPUh zvq1&5-E~oS!B4uwM{)O-)doK0u7M@ggrIN#IkSP^K@Fb5M|e+nr3T?|{DPTh|F>Zi zB-Fq`%CMB`7~IKxDiT!AgOlG`|V<3I>mWYJ`iMHWFA6M|8_=%RF4OfbQOt_$6S z5R8^0q#}z_`o@+OE5zV^-{#(P?!D*T^WG&^Rx>OvwK zR=C}4xSPfKz6hrJC?6E2uIkswSEiBMXo z7R$4hcsCm+(zu=SYTy6hSBs?c;+;rq?|!DkC0Lk}nT+Y=2uqOC&18nkn1lSNiL#i94^c(O&Qd5Ty-*ecm>RXx6oJx%WS)M1+Rj?!B$Yb|REV}wpN2HhutqdS zV>M3WH9-?KNs~22Q#DObd`g&sby($|zzebg56Bv9;;E-mK*Z?PZm>uB_tV08qR3`ElixgFj+~guRd6k4)=x6+fs5sn$ zCV!8peE2O>XaAu4{09BumVi)XnU_AUWi7h`r53mQSJ;@`50w la=nA3f&V5)9A$e(+w{+x{Lx17%K!Nw^dGl~vHvIr0059ru(ALE diff --git a/testdata/lefdef/foreigncell/au_no_lefpins.oas.gz b/testdata/lefdef/foreigncell/au_no_lefpins.oas.gz deleted file mode 100644 index f0e21a2099c706a17290cee957a3e57c28b1237f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 796 zcmV+%1LOQ3iwFowH=JGo19WY0E^lFT0OgTQXcIvc$LG!LXEwV{G>ag)Rp~}iH%%20 zbEvwl!8BQ$txf$})-k**DI(%o@FGP@j-k}x zNt|tyXvKne=knhC{%_vQ|INXa(HA?C>`ui}vIj``sE(>U`h5k}{VBVzJ8h?8y$R!- z9ZOh7uhDN0#?D#i1tus5x8;Gv-wJ}NCuLhn(>`m&<6ckP=&{F~OmRFC^n1Cjth1Gc z`L+x3?xEy>WuHybCTU9)yGPN6dr?gcdwwYR{bj!))3nMKsx&zP#*<8-f+}rM`pJNZ(Z5ZG ziw&Y57d_iPD9~x{jw-rke{ajPHE1NPp=84NySL73gmX_Eh!Dn&M97U7v-y!ixRrGh z&!t$mUAle8DP~Dy;*ChPUq91e5sB&3%_Lz7^0qRGp*?iMxvZH_iM0ek%oPOsoHWfgb?s?K=VgfcuQ<}4}0x-bv3;1TBs~Y0Yp{wdaA_IpFb{L^9?!!%snSy5 zCPRT?HS~~CyTH?GA2L5N5<2aZQNvvub?4jF9sU=0Us<(lH+NMmp&IyH`!AXIcmv9? z06*Y6eJeExAMh(?iv8n-HIPsh`zURA(3(AD_mVniF2XXH?qJr1O;~~oOv+5)GmE^k z9GK<;)4WXlHS_{+5*hnzQ01QxnfHHZ%Irt_p4YI)UlR}tWDcV#@`cFUPKi|TH_{T> a9b%o%y~;O5JoP^>gnk0f#ioIg1poj>IfOO< diff --git a/testdata/lefdef/foreigncell/foreign.gds b/testdata/lefdef/foreigncell/foreign.gds index d8558194ee5591e8bad6602b2b1263b2351e5532..dce50b5e8bc9622937007a8af423587446394e30 100644 GIT binary patch literal 3722 zcmeH~yH8V59LIn6-g2oG@I`!uxX=Vt6sQWmYNA*Skx*k8h_9wXi#4?x+W1)Aj1JDS zbTBa*<01otad6PZ$-%$CI6FAG;P-pZ`RNrAqb8!plN>(h{@&-Ddw--7itmp}o98#a zk(jKPbm5?8s%Bg*K0J1&zkXbPP5x+mPIt`(`Phst0`A6<;P2v zN#kYnG+NF0*P2jPvVyavd^KXYXNHc9q&iGa z;i=+Q(}(ia(zr-$6((*bVQ(hc`~Pl!;%;{Q+THXnayN~#=(iRR?H3h` zOv;u0Sm!XQKk7(d%E=X&l(RP4k@Tlr<7iw`^;jBz_s-9&f5y~*l|~pObJZOmfUM_w zggmEdOtOx-&5?CdPJ8tu)sE*`$J~HPIqN1l>gKOy0_$6tv}ax=mZrXi_fauf)>CT`d0`jW9^~d9etYmvSZQ^VZ;53Axu|^@jAP zUWujgUpW60?%(U95!i)4^dlLUa^@LzJmcgfz6~Q+;vT)M)9-VnKjkFu&7++0X-6_H z=Se#ymL|S?PrlPf6Sj}y|KFFLH2BS(G?2f$lLqo{bkabUwv%f9 zrRt=C{9BzgkUyi7Y8}x|%8oVbIv2@~$PP!|2iZ|+ucVxI?2ykQ)Xt}b>IXVtQy3O6 sP8CX%mDK#-YIAdQ=Mn6K{k8C&PWm|xdMQeo_shb2k7&C;MT*7bBdwc(4gdfE literal 3484 zcmeH~J#17*5Xa}eJ3n6>V+^qni7Xe`lFgSf$A_ILMtq$mgLRJ3A)JJ8I_x`q=s1wi z0wSeK5rk-{D4=nHgoF?cE~wlfkrdR>P*6k^sVGuWVE+Hv9rD1B7?2PRYmI)pGqW@M z_G4^IBw;uqok7_Ax1{AOX~oZ~cwaJMG&Z_dq$Aa|YtO~OgZFPd`*#1`Epyj?DoAJ3 z+vlx`qMn|fedGB;ZlX{e&5w*@DCriFmemn;J=>(UJtfwnjiIzj+otG;eYvr*VR{I4 zD^%B4IbEM!KioZ_x>i{OzrJ#%QkpG#^9W=u zJ!Z@2v2(qJBe{Ix$MJm5TZQ|IlO5h$YE&mh(yJgios2u3&u8-iXS3}+&PH#rKbw*9 z!-opFT)tOxCZ0^Q{O@aPiR?|KGdTSfp=^+-EtF8k^o@1+XGVVS`^FKBvk)WoT@WL> z;^ylec_aRB8sB1(j1!lY7$1a?haq1>ihev5Bj?m1Ms(GWTD;G&{O}eM#$g`*S7Tu0e*S~85$`20$?NqjB}esrA=ayg_34{1Vtw3uz2_v>r*GMa^{L&6p>Ip~ zB_(>lxCh$evDv4dGUdtoMLmgorFtXok=8TXSr2VK^^9S4l51vtBpH`_l5s39X?Aq| z`jXbK=c@ILeyoR_XLXTvj=4$Zxd5U4n&%uyJxRZtG16}i!p8YYbtonCiS_U?yczE) zg!`}%BhTp(gruL*xr03vo0i0@Fl5#OovjTSfgoLv5CX2(2|d0EGd%*#4x zWZpk8HZm{mM&`9TNTO-nvOT_DOga7~l diff --git a/testdata/lefdef/foreigncell/in.def b/testdata/lefdef/foreigncell/in.def new file mode 100644 index 000000000..04045ef5f --- /dev/null +++ b/testdata/lefdef/foreigncell/in.def @@ -0,0 +1,17 @@ + +VERSION 5.8 ; +DIVIDERCHAR "/" ; +BUSBITCHARS "[]" ; +DESIGN foreigncells ; +UNITS DISTANCE MICRONS 1000 ; + +DIEAREA ( 0 0 ) ( 1000 2000 ) ; + +COMPONENTS 3 ; + - macro1 macro1 + PLACED ( 0 0 ) N ; + - macro2 macro2 + PLACED ( 0 500 ) N ; + - macro3 macro3 + PLACED ( 0 1000 ) N ; +END COMPONENTS + +END DESIGN + diff --git a/testdata/lefdef/lefpins/au_lefpins_mapped.oas.gz b/testdata/lefdef/lefpins/au_lefpins_mapped.oas.gz new file mode 100644 index 0000000000000000000000000000000000000000..80c578b58c1ab2d050ebe49837ecad8425204e8f GIT binary patch literal 335 zcmV-V0kHlbiwFq7R-;}319WY0E^lFT08Z@2gEzO`uOnh zq~#Z-W~S#Qr{?4ov-1VVySoI(2L$;CxCVtpar|lmL?XZGQ-4B zbh0u=akKau1o$(vGBfbNS==l@jRwqYATbz=o5|OZnH?wsrMWqM4fT9n-2y!QfLtyf zR4z9Mi0kO&>I394@}Tgz+5JO9d_4VJnK^*QA#->cL~gS(@bL1AG_r{_vhy+u{$N!p hj5-4cBR_*kG6ygYF7PuojAX#T004gq;E|gG001U{oqqrT literal 0 HcmV?d00001 diff --git a/testdata/lefdef/lefpins/au_no_lefpins.oas.gz b/testdata/lefdef/lefpins/au_no_lefpins.oas.gz new file mode 100644 index 0000000000000000000000000000000000000000..099aeed882a461a3d5e5ce06c40c89cda1901a4f GIT binary patch literal 269 zcmV+o0rLJIiwFoaSEF7419WY0E^lFT08Z@2gEzO`uOnh zq~#Z-W~S#Qr{?4ov-1VVySoI(2L$;CxCVtpar|lmL?XZGQ-4B zbaJ!!8U*+=vobUAz**cZKwSpRY#=chi<`;UkeMAQ0;Rdx{X;{1JpEjmIe>!599{;I z+pG*cyu2cfY$A>9yo`cB7#6UeW8!Am!6+n>%)!vW{D7I4N$>!pj5-4cBR>O3>;?M; Tex`X*yvPFKbKmq^&5KMfG literal 0 HcmV?d00001 diff --git a/testdata/lefdef/lefpins/in.def b/testdata/lefdef/lefpins/in.def new file mode 100644 index 000000000..58d6e328b --- /dev/null +++ b/testdata/lefdef/lefpins/in.def @@ -0,0 +1,15 @@ + +VERSION 5.8 ; +DIVIDERCHAR "/" ; +BUSBITCHARS "[]" ; +DESIGN foreigncells ; +UNITS DISTANCE MICRONS 1000 ; + +DIEAREA ( 0 0 ) ( 1000 2000 ) ; + +COMPONENTS 3 ; + - macro1 macro1 + PLACED ( 0 0 ) N ; +END COMPONENTS + +END DESIGN + diff --git a/testdata/lefdef/lefpins/in.lef b/testdata/lefdef/lefpins/in.lef new file mode 100644 index 000000000..e2751e688 --- /dev/null +++ b/testdata/lefdef/lefpins/in.lef @@ -0,0 +1,15 @@ +MACRO macro1 + CLASS CORE ; + ORIGIN 0.000 0.000 ; + SIZE 0.384 BY 0.480 ; + PIN Z + PORT + LAYER M1 ; + RECT 0.306 0.357 0.318 0.403 ; + RECT 0.318 0.115 0.352 0.403 ; + VIA 0.336 0.167 square ; + VIA 0.336 0.351 square ; + END + END Z +END macro1 + diff --git a/testdata/lefdef/lefpins/in_tech.lef b/testdata/lefdef/lefpins/in_tech.lef new file mode 100644 index 000000000..eb0e75b0b --- /dev/null +++ b/testdata/lefdef/lefpins/in_tech.lef @@ -0,0 +1,36 @@ +LAYER OD + TYPE IMPLANT ; +END OD +LAYER VTS_N + TYPE IMPLANT ; +END VTS_N +LAYER VTS_P + TYPE IMPLANT ; +END VTS_P +LAYER M0OD + TYPE IMPLANT ; +END M0OD +LAYER M0PO + TYPE MASTERSLICE ; +END M0PO +LAYER VIA0 + TYPE CUT ; +END VIA0 +LAYER M1 + TYPE MASTERSLICE ; +END M1 +LAYER VIA1 + TYPE CUT ; +END VIA1 +LAYER M2 + TYPE MASTERSLICE ; +END M2 + +VIA square + LAYER M0PO ; + RECT -0.006 -0.006 0.006 0.006 ; + LAYER VIA0 ; + RECT -0.006 -0.006 0.006 0.006 ; + LAYER M1 ; + RECT -0.006 -0.006 0.006 0.006 ; +END square From 4c6f1475b1ae35af111e104b36f8454e9b78bf26 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sat, 25 Apr 2020 19:45:02 +0200 Subject: [PATCH 034/121] Made rba:layLayoutView test functional without qtbindings enabled. --- src/laybasic/laybasic/gsiDeclLayLayoutView.cc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/laybasic/laybasic/gsiDeclLayLayoutView.cc b/src/laybasic/laybasic/gsiDeclLayLayoutView.cc index 3c57c6f45..76ab0d461 100644 --- a/src/laybasic/laybasic/gsiDeclLayLayoutView.cc +++ b/src/laybasic/laybasic/gsiDeclLayLayoutView.cc @@ -412,11 +412,19 @@ static lay::LayoutView *new_view (QWidget *parent, bool editable, db::Manager *m } return lv; } +#else +static lay::LayoutView *new_view (tl::Variant /*dummy*/, bool editable, db::Manager *manager, unsigned int options) +{ + return new lay::LayoutView (manager, editable, 0 /*plugin parent*/, 0 /*parent*/, "view", options); +} #endif Class decl_LayoutView (QT_EXTERNAL_BASE (QWidget) "lay", "LayoutView", #if defined(HAVE_QTBINDINGS) gsi::constructor ("new", &new_view, gsi::arg ("parent", (QWidget *) 0, "nil"), gsi::arg ("editable", false), gsi::arg ("manager", (db::Manager *) 0, "nil"), gsi::arg ("options", (unsigned int) 0), +#else + gsi::constructor ("new", &new_view, gsi::arg ("parent", tl::Variant (), "nil"), gsi::arg ("editable", false), gsi::arg ("manager", (db::Manager *) 0, "nil"), gsi::arg ("options", (unsigned int) 0), +#endif "@brief Creates a standalone view\n" "\n" "This constructor is for special purposes only. To create a view in the context of a main window, " @@ -430,7 +438,6 @@ Class decl_LayoutView (QT_EXTERNAL_BASE (QWidget) "lay", "Layou "This constructor has been introduced in version 0.25.\n" "It has been enhanced with the arguments in version 0.27.\n" ) + -#endif gsi::constant ("LV_NoLayers", (unsigned int) lay::LayoutView::LV_NoLayers, "@brief With this option, no layers view will be provided (see \\layer_control_frame)\n" "Use this value with the constructor's 'options' argument.\n" From c602871e0e88d3d03d229f964d847817441f8843 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sat, 25 Apr 2020 21:08:11 +0200 Subject: [PATCH 035/121] Implemented Stefan's solution #3 for FOREIGN != MACRO in LEF --- .../lefdef/db_plugin/dbLEFImporter.cc | 22 ++++++++++++++++++ testdata/lefdef/foreigncell/au.oas.gz | Bin 811 -> 828 bytes 2 files changed, 22 insertions(+) diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc index 1f8d4b942..2d20ff902 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc @@ -729,6 +729,7 @@ LEFImporter::read_macro (Layout &layout) db::Cell &cell = layout.cell (layout.add_cell ()); db::Cell *foreign_cell = 0; db::Trans foreign_trans; + std::string foreign_name; db::Point origin; db::Vector size; @@ -837,6 +838,7 @@ LEFImporter::read_macro (Layout &layout) foreign_cell = &layout.cell (ci); foreign_trans = (db::Trans (origin - db::Point ()) * db::Trans (ft)).inverted (); + foreign_name = cn; } else if (test ("OBS")) { @@ -864,6 +866,26 @@ LEFImporter::read_macro (Layout &layout) m_macros_by_name.insert (std::make_pair (mn, std::make_pair (&cell, db::Trans ()))); + } else if (foreign_name != mn) { + + warn ("FOREIGN name differs from MACRO name in macro: " + mn); + + layout.rename_cell (cell.cell_index (), mn.c_str ()); + + // clear imported LEF geometry with a foreign cell, but provide a level of indirection so we have + // both the MACRO and the FOREIGN name + + for (unsigned int l = 0; l < layout.layers (); ++l) { + if (layout.is_valid_layer (l)) { + cell.clear (l); + } + } + + cell.clear_insts (); + + cell.insert (db::CellInstArray (db::CellInst (foreign_cell->cell_index ()), foreign_trans)); + m_macros_by_name.insert (std::make_pair (mn, std::make_pair (&cell, db::Trans ()))); + } else { // use FOREIGN cell instead of new one diff --git a/testdata/lefdef/foreigncell/au.oas.gz b/testdata/lefdef/foreigncell/au.oas.gz index fec13c35bc49f6cff4b3e934555e6673cff62a79..9c3843f9ba7da312a8f14dd2c5098f34cded1bbf 100644 GIT binary patch literal 828 zcmV-C1H=3uiwFqXiKJct19WY0E^lFT0OeFoYa3S-o%`OKFU`zTCeaWm+LW|-)DU+@ zZbJxYA;(j9s6M9B#BtK3!&Dx*0$ENZ_iN{b&{Y<$DOq$;j4&n?)xW`nVnSBhcT=)3 zT67^w>Sf52JyvX*{( zt*ePSHy?EFd=s`KkyeA*nQGuw%AQm4uZzjg3i<2htA22$%mn9sSy&2d?PWWT**H$g za>1R>O^2OEO+M|JE7A8WncT!D<%+|`u_xrSo>^aRtpu%bDPk9$m4#rGPsoO6Hp3sH zb|&}5LA?A?_QR=Lvg(;j;bJCt?wmDg%cnfE(fT%OcUW&dY<419@yxFpVdtPgPI_jo zb33dxT8m?%d4ga9QN142zB^R3E{>V6W9HHk(>$uNW&My@Xvd88v79*EgAo?PBRg{k zw)|)3?CV#{-Xdhwz!6~--m`&7@pEL+7}}T|dlW)q)A<-=g&0gpv92KExPkL^NVWb|zio|dsKkXD)2I`4S5!rW9a7zw8&xDRA z8l?9jNiijqrveqJL}i+w3RS5_DNWK-R5zwRz(noB4!XztJ@C8m1Z}{sxP!LfiC|dd z%x};Y9>HID8y@0Kc#LlRfo}fDf4PI^AG6AbxCak_)v3><4fqv%>v#k9q)k}IzhHk$ z=<|jJ(gRp9KF^p&hGUhfXVNOa4fpw7w1(%qaAOF&s0VY~un(Kig{No}_VAF2LSo#Q z@dju_q!J5C$~2TH@d7g~G~gW>%c}Un>wX*6}0O z#o9+wbEA2VmhZvO_~sU@@^6+iSRcYb{0VDFA9BB==U5Z;A?l%jvBvBBcnuFkP1gHT zKbfB3BuFB?&vWT_8RGQ5Fc1$Qq-y8czp|gyNa|0XQ#CDhS4iCz(dyfLIPN7N2(30! G1^@uZ=%4QZ literal 811 zcmV+`1JwK zIqQt4$Af0IEDyWJQuy;yGClH5p=h&qtP%OFYg88NOMX3A2-!t*Y0mHEBeL!qwcwYq zkxbt{h*!T#T^gH}Ro7Su=9B63=gm<|9&(Lp{Xy7hGHoTOHA7i(jUTE(^PoVEx<mXMx+BSJ5HZUK?{&yhj{Xkl{fQ3&ZTSt2K%PF6_HbPJfroH{@XVL}rN zJ?;o8C}&}jG5x3rIcwB)@(d&O7*-^Pvzc)_%Q8?;WQxeXf~=Fb@dajdJkcPr4^fIK zp*$6+NF^%M2vw*`HA-oe4$+uC_9Z523%1ZB-fM%`f*rI5+u|15fE__M$(i4vCA@++ zcoUxEb$E?#{ekZM%74FwreCwl=eP||fYqsQr8Rho-Br8>d(t|r;uqN45O#Up1nCLP z>E9*|J;|}k_*-e2--O5fHd?{cEx6T%ZPbRTP1uKZXu+Ro9rkdSnL=bBOu8M^BjS-c zC2r_S82JY?Fa2Y88%$jM*xcXno_Vd{J=WkmqH+CI46{|7`PWq-qOamtOvU6qtEpZ; zN5i+_8NRat%lv<9GdR|Tj`$R7DAwhENAIyF$9ARNXkvtuAc|u9cm;RF#5tC5u`X(} pih~5= Date: Sat, 25 Apr 2020 22:05:01 +0200 Subject: [PATCH 036/121] Added LEF reading timer (LEF next to DEF) --- .../lefdef/db_plugin/dbLEFDEFImporter.cc | 4 +- .../lefdef/db_plugin/dbLEFDEFImporter.h | 18 +++++++ .../lefdef/db_plugin/dbLEFDEFPlugin.cc | 3 ++ .../lefdef/db_plugin/dbLEFImporter.cc | 18 ++++++- .../lefdef/db_plugin/gsiDeclDbLEFDEF.cc | 19 +++++++ .../lefdef/unit_tests/dbLEFDEFImportTests.cc | 12 +++++ .../foreigncell/au_ignore_foreign.oas.gz | Bin 0 -> 872 bytes testdata/lefdef/foreigncell/in2.lef | 47 ++++++++++++++++++ 8 files changed, 119 insertions(+), 2 deletions(-) create mode 100644 testdata/lefdef/foreigncell/au_ignore_foreign.oas.gz create mode 100644 testdata/lefdef/foreigncell/in2.lef diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc index 11105b085..2e18707ee 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc @@ -77,7 +77,8 @@ LEFDEFReaderOptions::LEFDEFReaderOptions () m_special_routing_suffix (""), m_special_routing_datatype (0), m_separate_groups (false), - m_consider_map_file (true) + m_consider_map_file (true), + m_macro_resolution_mode (0) { // .. nothing yet .. } @@ -125,6 +126,7 @@ LEFDEFReaderOptions::LEFDEFReaderOptions (const LEFDEFReaderOptions &d) m_special_routing_datatype (d.m_special_routing_datatype), m_separate_groups (d.m_separate_groups), m_consider_map_file (d.m_consider_map_file), + m_macro_resolution_mode (d.m_macro_resolution_mode), m_lef_files (d.m_lef_files) { // .. nothing yet .. diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h index 40838f89d..bb41ade22 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h @@ -525,6 +525,23 @@ public: m_consider_map_file = f; } + /** + * @brief Specify the LEF macro resolution strategy + * Values are: + * 0: propduce LEF geometry unless a FOREIGN cell is specified (default) + * 1: produce LEF geometry always and ignore FOREIGN + * 2: produce a placeholder cell always (even if FOREIGN isn't given) + */ + unsigned int macro_resolution_mode () const + { + return m_macro_resolution_mode; + } + + void set_macro_resolution_mode (unsigned int m) + { + m_macro_resolution_mode = m; + } + private: bool m_read_all_layers; db::LayerMap m_layer_map; @@ -568,6 +585,7 @@ private: int m_special_routing_datatype; bool m_separate_groups; bool m_consider_map_file; + unsigned int m_macro_resolution_mode; std::vector m_lef_files; }; diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc index 4caffcf97..b919fb0c7 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc @@ -180,6 +180,9 @@ private: if (is_lef_format (*e)) { std::string lp = tl::combine_path (input_dir, *e); + + tl::SelfTimer timer (tl::verbosity () >= 21, tl::to_string (tr ("Reading LEF file: ")) + lp); + tl::InputStream lef_stream (lp); tl::log << tl::to_string (tr ("Reading")) << " " << lp; importer.read_lef (lef_stream, layout, state); diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc index 2d20ff902..0cb8fc40d 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc @@ -853,7 +853,7 @@ LEFImporter::read_macro (Layout &layout) } - if (! foreign_cell) { + if (options ().macro_resolution_mode () == 1 || (! foreign_cell && options ().macro_resolution_mode () != 2)) { // actually implement the real cell @@ -866,6 +866,22 @@ LEFImporter::read_macro (Layout &layout) m_macros_by_name.insert (std::make_pair (mn, std::make_pair (&cell, db::Trans ()))); + } else if (! foreign_cell) { + + // macro resolution mode #2 (always create a MACRO reference, no LEF geometry) + + db::cell_index_type ci; + std::pair c = layout.cell_by_name (mn.c_str ()); + if (c.first) { + ci = c.second; + } else { + ci = layout.add_cell (mn.c_str ()); + layout.cell (ci).set_ghost_cell (true); + } + + layout.delete_cell (cell.cell_index ()); + m_macros_by_name.insert (std::make_pair (mn, std::make_pair (&layout.cell (ci), db::Trans ()))); + } else if (foreign_name != mn) { warn ("FOREIGN name differs from MACRO name in macro: " + mn); diff --git a/src/plugins/streamers/lefdef/db_plugin/gsiDeclDbLEFDEF.cc b/src/plugins/streamers/lefdef/db_plugin/gsiDeclDbLEFDEF.cc index 14336a90b..b41e96977 100644 --- a/src/plugins/streamers/lefdef/db_plugin/gsiDeclDbLEFDEF.cc +++ b/src/plugins/streamers/lefdef/db_plugin/gsiDeclDbLEFDEF.cc @@ -480,6 +480,25 @@ gsi::Class decl_lefdef_config ("db", "LEFDEFReaderConfi "\n" "This property has been added in version 0.26.5.\n" ) + + gsi::method ("macro_resolution_mode", &db::LEFDEFReaderOptions::macro_resolution_mode, + "@brief Gets the macro resolution mode.\n" + "This property describes the way LEF macros are turned into GDS cells. There " + "are three modes available:\n" + "\n" + "@ul\n" + " @li 0: propduce LEF geometry unless a FOREIGN cell is specified (default) @/li\n" + " @li 1: produce LEF geometry always and ignore FOREIGN @/li\n" + " @li 2: produce a placeholder cell always (even if FOREIGN isn't given) @/li\n" + "@/ul\n" + "\n" + "This property has been added in version 0.26.5.\n" + ) + + gsi::method ("macro_resolution_mode=", &db::LEFDEFReaderOptions::set_macro_resolution_mode, gsi::arg ("mode"), + "@brief Sets the macro resolution mode.\n" + "See \\macro_resolution_mode for details about this property.\n" + "\n" + "This property has been added in version 0.26.5.\n" + ) + gsi::method ("lef_files", &db::LEFDEFReaderOptions::lef_files, "@brief Gets the list technology LEF files to additionally import\n" "Returns a list of path names for technology LEF files to read in addition to the primary file. " diff --git a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc index 30090da2b..f6f70c009 100644 --- a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc +++ b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc @@ -335,6 +335,18 @@ TEST(108_scanchain) TEST(109_foreigncell) { run_test (_this, "foreigncell", "gds:foreign.gds+lef:in_tech.lef+lef:in.lef+def:in.def", "au.oas.gz", default_options (), false); + + db::LEFDEFReaderOptions options = default_options (); + + run_test (_this, "foreigncell", "gds:foreign.gds+lef:in_tech.lef+lef:in2.lef+def:in.def", "au_default.oas.gz", options, false); + + options.set_macro_resolution_mode (1); + + run_test (_this, "foreigncell", "gds:foreign.gds+lef:in_tech.lef+lef:in2.lef+def:in.def", "au_ignore_foreign.oas.gz", options, false); + + options.set_macro_resolution_mode (2); + + run_test (_this, "foreigncell", "gds:foreign.gds+lef:in_tech.lef+lef:in.lef+def:in.def", "au_always_foreign.oas.gz", options, false); } TEST(110_lefpins) diff --git a/testdata/lefdef/foreigncell/au_ignore_foreign.oas.gz b/testdata/lefdef/foreigncell/au_ignore_foreign.oas.gz new file mode 100644 index 0000000000000000000000000000000000000000..44831e8e56939afe244ce6ca4d300d6263bd7106 GIT binary patch literal 872 zcmV-u1DE_CiwFp7kEC7z19WY0E^lFT0OeFoY};fQ{@(BNZ~T+FwS|Oofr08!QS1Z| zLdqdsO|i(2NxZHr8M0Hv;)eW%QT^? z2M*OVO&k#7OXFs(7?&Nv2fxqzeDCx4eP3ICwdxez*UR~;TU8Q3>?sQ!@aW`~GG43( z#r%9wb!SV?OyHJ$XV$3%7u*^DeSt|Ssp0YY(z6OuMxq+{WiL4A6biCjUuj2;rB*F! zHajUz=9a@+dnHSe5TDp5aE4c_!R$;m@G51`srVQ9np9*pcO7h^q{l47!2|W(eTV> z_;u7y=RP`$@4lINBYRntJ##r+O6Sg=wWe(GjAu4lUq+uVNpC- zaqeg>|Cl-R?9nop2{RB7Zg79aCZpAlkWCVEZa(OI{zcf1NWAYjX5yF~#Zxbsg$0Qz zT3(s31j!>LG1Sl^+<-eq5-!?=r%W6ru4qqrZi!+npTLqpaUnnL6lezWsZ8SOmr-y_ z4w3hhe=_@^Uy-MNWA3x#Ylw$i z>@`MTn?&p60YOONokm#(oN@8bD8wDKm|hU-A< zYgiy$hehMVv}vRft<)b1>+BAE%kJSDWWEOrhp>mY zVQvSWz$WzIKHh|Va!5@fF%qV|13Vz~#G<5|h7=|KBGk)x+T9ivSDrTa2p&_f8)Tn0 z_&cMZcok!G732T93d|TA Date: Sat, 25 Apr 2020 22:13:46 +0200 Subject: [PATCH 037/121] Added missing test files --- .../lefdef/foreigncell/au_always_foreign.oas.gz | Bin 0 -> 828 bytes testdata/lefdef/foreigncell/au_default.oas.gz | Bin 0 -> 870 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 testdata/lefdef/foreigncell/au_always_foreign.oas.gz create mode 100644 testdata/lefdef/foreigncell/au_default.oas.gz diff --git a/testdata/lefdef/foreigncell/au_always_foreign.oas.gz b/testdata/lefdef/foreigncell/au_always_foreign.oas.gz new file mode 100644 index 0000000000000000000000000000000000000000..587178ba318161f20d69712878d7b9c40c69b051 GIT binary patch literal 828 zcmV-C1H=3uiwFn+k)&P#19WY0E^lFT0OeFoYa3S-o%`OKFU`zTCeaWm+LW|-)DU+@ zZbJxYA;(j9s6M9B#BtK3!&Dx*0$ENZ_iN{b&{Y<$DOq$;j4&n?)xW`nVnSBhcT=)3 zT67^w>Sf52JyvX*{( zt*ePSHy?EFd=s`KkyeA*nQGuw%AQm4uZzjg3i<2htA22$%mn9sSy&2d?PWWT**H$g za>1R>O^2OEO+M|JE7A8WncT!D<%+|`u_xrSo>^aRtpu%bDPk9$m4#rGPsoO6Hp3sH zb|&}5LA?A?_QR=Lvg(;j;bJCt?wmDg%cnfE(fT%OcUW&dY<419@yxFpVdtPgPI_jo zb33dxT8m?%d4ga9QN142zB^R3E{>V6W9HHk(>$uNW&My@Xvd88v79*EgAo?PBRg{k zw)|)3?CV#{-Xdhwz!6~--m`&7@pEL+7}}T|dlW)q)A<-=g&0gpv92KExPkL^NVWb|zio|dsKkXD)2I`4S5!rW9a7zw8&xDRA z8l?9jNiijqrveqJL}i+w3RS5_DNWK-R5zwRz(noB4!XztJ@C8m1Z}{sxP!LfiC|dd z%x};Y9>HID8y@0Kc#LlRfo}fDf4PI^AG6AbxCak_)v3><4fqv%>v#k9q)k}IzhHk$ z=<|jJ(gRp9KF^p&hGUhfXVNOa4fpw7w1(%qaAOF&s0VY~un(Kig{No}_VAF2LSo#Q z@dju_q!J5C$~2TH@d7g~G~gW>%c}Un>wX*6}0O z#o9+wbEA2VmhZvO_~sU@@^6+iSRcYb{0VDFA9BB==U5Z;A?l%jvBvBBcnuFkP1gHT zKbfB3BuFB?&vWT_8RGQ5Fc1$Qq-y8czp|gyNa|0XQ#CDhS4iCz(dyfLIPN7N2(30! G1^@sf(w`jw literal 0 HcmV?d00001 diff --git a/testdata/lefdef/foreigncell/au_default.oas.gz b/testdata/lefdef/foreigncell/au_default.oas.gz new file mode 100644 index 0000000000000000000000000000000000000000..bc6f4204d0326bdac5f8eb5d6fd22b044126d043 GIT binary patch literal 870 zcmV-s1DX6EiwFoxkfdG!19WY0E^lFT0OeFoZyQwy&X=oV@&Nx_d9IyivWs@S*RTm{fELc>Q6-5;aS+k5P6jfay@7Yup zin3r~Ri$Eq5YNuoO+@(v@HY3{^X@&m_q@@(SaAyO%cWe!ttbh=_Kd|G^UUd!GM=pj zh1^n5aTkiteBc&+XTd24@455-+X6``sgvuA#itddj6@~yOI~on$>(Lcw%&^BtIcZE zXtYzBEX29ZtCe73z7lxllIN8DOMLR3eC|@|q90r+QMn~wA%Bf7eg&Q85mDm!$T%#`?yXV%u68$mN%i|9prVq-R#!ABWX? zb9GEK&Ja`}s?~z(=O>ER>tp7ln0aHwG)6VHsGTq?t(dW16B8$UP{N{kU}kn`%RhFu zpT64c6+#9L4B-ah1sll7{0tgH8XbQLSoa|7-YB@%nIbpQ;IAsOQc|V zCCp+*9wUiRH4AeCZiFOMurW`WI7(c>p7Gow#YjGdC4u66ZqCWm4CFJJ#M4hB?-m_A zO@&S;3X^&aNfoO^WmQh)RY4Wiges}Bs;H`(RL`lJG5ZoC#x}kUH}TR#SpErJUfh8$ z+=lyjAHKzV@D0Aa3tQ|i+~o|5OnwhtZgjZ=chI2YI{U!^TDpTe!-g9`>*NPQ2X0|+ z8+YJH*nw^Q9rky*9&1=2+<+D1-Lz?>8Ct175VqKT_=-J5bc8M}_u&xj!QwtVhQTEF z&<-5oJ{5(;xH0V=qXD5ORwUgtq$u$hrdr06>2_&z`N?n(;StrkiI3=jzY&G#zp#v~ zDEc){zs4&_>oY%~M_A#sKH5XSV};fJARYE+Br!k2gucn6=R4?6as>KSdFEGgkDc6P zc(}!0C;H|zvxVsa&MXe|FlBp?1 wfF#m-ER%YUB1Y?R$NUh2UY(|Y*IrV=S|5)2uQA&CKOctq8@ve(w0;Hv0P$9-dH?_b literal 0 HcmV?d00001 From 751340c963156a61cdc544cbf4c126d2a1e59f31 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Fri, 1 May 2020 15:16:08 +0200 Subject: [PATCH 038/121] LEF/DEF: Fixed placement of FOREIGN cell --- .../lefdef/db_plugin/dbLEFImporter.cc | 12 +++-- testdata/lefdef/foreigncell/au.oas.gz | Bin 828 -> 800 bytes .../foreigncell/au_always_foreign.oas.gz | Bin 828 -> 800 bytes testdata/lefdef/foreigncell/au_default.oas.gz | Bin 870 -> 864 bytes .../foreigncell/au_ignore_foreign.oas.gz | Bin 872 -> 906 bytes testdata/lefdef/foreigncell/foreign.gds | Bin 3722 -> 3722 bytes testdata/lefdef/foreigncell/in.def | 2 +- testdata/lefdef/foreigncell/in.lef | 45 ++++-------------- testdata/lefdef/foreigncell/in2.lef | 37 +++++++------- 9 files changed, 34 insertions(+), 62 deletions(-) diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc index 0cb8fc40d..cbe6681f5 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc @@ -827,17 +827,19 @@ LEFImporter::read_macro (Layout &layout) layout.cell (ci).set_ghost_cell (true); } - db::Point origin; + db::Point vec; db::FTrans ft; if (! peek (";")) { - origin = get_point (1.0 / layout.dbu ()); + vec = get_point (1.0 / layout.dbu ()); ft = get_orient (true); } expect (";"); foreign_cell = &layout.cell (ci); - foreign_trans = (db::Trans (origin - db::Point ()) * db::Trans (ft)).inverted (); + // What is the definition of the FOREIGN transformation? + // Guessing: this transformation moves the lower-left origin to 0,0 + foreign_trans = db::Trans (db::Point () - vec) * db::Trans (ft); foreign_name = cn; } else if (test ("OBS")) { @@ -899,7 +901,7 @@ LEFImporter::read_macro (Layout &layout) cell.clear_insts (); - cell.insert (db::CellInstArray (db::CellInst (foreign_cell->cell_index ()), foreign_trans)); + cell.insert (db::CellInstArray (db::CellInst (foreign_cell->cell_index ()), db::Trans (db::Point () - origin) * foreign_trans)); m_macros_by_name.insert (std::make_pair (mn, std::make_pair (&cell, db::Trans ()))); } else { @@ -907,7 +909,7 @@ LEFImporter::read_macro (Layout &layout) // use FOREIGN cell instead of new one layout.delete_cell (cell.cell_index ()); - m_macros_by_name.insert (std::make_pair (mn, std::make_pair (foreign_cell, foreign_trans))); + m_macros_by_name.insert (std::make_pair (mn, std::make_pair (foreign_cell, db::Trans (db::Point () - origin) * foreign_trans))); } diff --git a/testdata/lefdef/foreigncell/au.oas.gz b/testdata/lefdef/foreigncell/au.oas.gz index 9c3843f9ba7da312a8f14dd2c5098f34cded1bbf..4aedac249c507b214180efbde321268f6487f6fb 100644 GIT binary patch literal 800 zcmV+*1K<1~iwFo+9jsme19WY0E^lFT0OeFoYZE~j-gjnpvzy(WxHgL*xk#066m^rT zh>%0IX$_{$nyj^cE^E4}fi%^me%)FTPd(Hk9y~}1rHI!40YOWVQuNZ37cb(Wc<>O4 zcoZk;HdfR>pmTYjdFFi{-Vc~Pxny5zf2J#!%BexXu>&UeIlyf_5q)RQ>FXMFa;e__ zWVe&*x0AietaCQiZJ!iLM2&1bpXvWoLPQVd96Mtpg)Adqz2@eN z<>3}l`h{QyUZLRRZ*4f5M_SBPpElD5GNReZ)gECo0EV1&tVW1NZRSbpm{ z_UG0*FAblwMX!3Uip`DK}sO!`bKgL%v;EhH0W zWn!VhZ6X=<#c+Tzev|`j$LUmm67OT=){6>}ZxEuG63SD72B=6S8l*B+s7fgf(QQ=I zJNF`@PvfUBg$LK+{2O#}U>0id6h7hwc!cNSA-*^VJtwU4x(VVW4C$w%h92cuX84mh&M&|{ zei^Y6YH+>|%V-`37T_B+DtU`$VGY-rDFj=>sP!2&h;VR74ja1c1;1nFrT?sMj)}8B zi(7}U%xem-u>!vkmGdXFolU0guam(c}WAfFI eO2Qv_PEpnHgbSf52JyvX*{( zt*ePSHy?EFd=s`KkyeA*nQGuw%AQm4uZzjg3i<2htA22$%mn9sSy&2d?PWWT**H$g za>1R>O^2OEO+M|JE7A8WncT!D<%+|`u_xrSo>^aRtpu%bDPk9$m4#rGPsoO6Hp3sH zb|&}5LA?A?_QR=Lvg(;j;bJCt?wmDg%cnfE(fT%OcUW&dY<419@yxFpVdtPgPI_jo zb33dxT8m?%d4ga9QN142zB^R3E{>V6W9HHk(>$uNW&My@Xvd88v79*EgAo?PBRg{k zw)|)3?CV#{-Xdhwz!6~--m`&7@pEL+7}}T|dlW)q)A<-=g&0gpv92KExPkL^NVWb|zio|dsKkXD)2I`4S5!rW9a7zw8&xDRA z8l?9jNiijqrveqJL}i+w3RS5_DNWK-R5zwRz(noB4!XztJ@C8m1Z}{sxP!LfiC|dd z%x};Y9>HID8y@0Kc#LlRfo}fDf4PI^AG6AbxCak_)v3><4fqv%>v#k9q)k}IzhHk$ z=<|jJ(gRp9KF^p&hGUhfXVNOa4fpw7w1(%qaAOF&s0VY~un(Kig{No}_VAF2LSo#Q z@dju_q!J5C$~2TH@d7g~G~gW>%c}Un>wX*6}0O z#o9+wbEA2VmhZvO_~sU@@^6+iSRcYb{0VDFA9BB==U5Z;A?l%jvBvBBcnuFkP1gHT zKbfB3BuFB?&vWT_8RGQ5Fc1$Qq-y8czp|gyNa|0XQ#CDhS4iCz(dyfLIPN7N2(30! G1^@uZ=%4QZ diff --git a/testdata/lefdef/foreigncell/au_always_foreign.oas.gz b/testdata/lefdef/foreigncell/au_always_foreign.oas.gz index 587178ba318161f20d69712878d7b9c40c69b051..4aedac249c507b214180efbde321268f6487f6fb 100644 GIT binary patch literal 800 zcmV+*1K<1~iwFo+9jsme19WY0E^lFT0OeFoYZE~j-gjnpvzy(WxHgL*xk#066m^rT zh>%0IX$_{$nyj^cE^E4}fi%^me%)FTPd(Hk9y~}1rHI!40YOWVQuNZ37cb(Wc<>O4 zcoZk;HdfR>pmTYjdFFi{-Vc~Pxny5zf2J#!%BexXu>&UeIlyf_5q)RQ>FXMFa;e__ zWVe&*x0AietaCQiZJ!iLM2&1bpXvWoLPQVd96Mtpg)Adqz2@eN z<>3}l`h{QyUZLRRZ*4f5M_SBPpElD5GNReZ)gECo0EV1&tVW1NZRSbpm{ z_UG0*FAblwMX!3Uip`DK}sO!`bKgL%v;EhH0W zWn!VhZ6X=<#c+Tzev|`j$LUmm67OT=){6>}ZxEuG63SD72B=6S8l*B+s7fgf(QQ=I zJNF`@PvfUBg$LK+{2O#}U>0id6h7hwc!cNSA-*^VJtwU4x(VVW4C$w%h92cuX84mh&M&|{ zei^Y6YH+>|%V-`37T_B+DtU`$VGY-rDFj=>sP!2&h;VR74ja1c1;1nFrT?sMj)}8B zi(7}U%xem-u>!vkmGdXFolU0guam(c}WAfFI eO2Qv_PEpnHgbSf52JyvX*{( zt*ePSHy?EFd=s`KkyeA*nQGuw%AQm4uZzjg3i<2htA22$%mn9sSy&2d?PWWT**H$g za>1R>O^2OEO+M|JE7A8WncT!D<%+|`u_xrSo>^aRtpu%bDPk9$m4#rGPsoO6Hp3sH zb|&}5LA?A?_QR=Lvg(;j;bJCt?wmDg%cnfE(fT%OcUW&dY<419@yxFpVdtPgPI_jo zb33dxT8m?%d4ga9QN142zB^R3E{>V6W9HHk(>$uNW&My@Xvd88v79*EgAo?PBRg{k zw)|)3?CV#{-Xdhwz!6~--m`&7@pEL+7}}T|dlW)q)A<-=g&0gpv92KExPkL^NVWb|zio|dsKkXD)2I`4S5!rW9a7zw8&xDRA z8l?9jNiijqrveqJL}i+w3RS5_DNWK-R5zwRz(noB4!XztJ@C8m1Z}{sxP!LfiC|dd z%x};Y9>HID8y@0Kc#LlRfo}fDf4PI^AG6AbxCak_)v3><4fqv%>v#k9q)k}IzhHk$ z=<|jJ(gRp9KF^p&hGUhfXVNOa4fpw7w1(%qaAOF&s0VY~un(Kig{No}_VAF2LSo#Q z@dju_q!J5C$~2TH@d7g~G~gW>%c}Un>wX*6}0O z#o9+wbEA2VmhZvO_~sU@@^6+iSRcYb{0VDFA9BB==U5Z;A?l%jvBvBBcnuFkP1gHT zKbfB3BuFB?&vWT_8RGQ5Fc1$Qq-y8czp|gyNa|0XQ#CDhS4iCz(dyfLIPN7N2(30! G1^@sf(w`jw diff --git a/testdata/lefdef/foreigncell/au_default.oas.gz b/testdata/lefdef/foreigncell/au_default.oas.gz index bc6f4204d0326bdac5f8eb5d6fd22b044126d043..6362bf9f124053c57de0cc3eb048932b3ae22b2b 100644 GIT binary patch literal 864 zcmV-m1E2gKiwFq0AFN&g19WY0E^lFT0OeFmZyQw`dCsL!LQ((&qEk zu$Z3@tKMwMoe8~C;Lf_0@Lg{vcuOE@HGO=2rSzj z!}#WF*;ljIMa8$4qQy+^!UcQM5zqNnv;Aq@>C)at)au5f>{}l+qwcUkO!-!=`%zSD zwiic4>kL5!;zlE^eRiy9zcFGyOqh!&OzWh^5%puH-bonybx}IrgAz8y12c0&TmG@L z^X%28t`lz1@S?*IG5|nE=A#kJVj|6X`LO%(Cs8LRBr%;$K$c6ult9irrO3j9Op3N& z#w=!(5t0d2voSZ|PLPa>4(2J7M42l(lfGA?7%8W)EKpp?PrC)0fpR93dHQJ-ypoG2 zsL<&|h4d3hX;>o~t8p5y37V)$nye|Bs%ctEJE!U9)XRvN8~8Td!t;+{;TLpmZVP&F z8}8#>_!jTLH~88%tg+j0z?n7~`vH2~$>kQ@MT3s7+4uL*{9Uv;Y`6)uPI(|~!uQzU zz?*O+Y{3Tp4hP%ZA#2(o+=ROMPR24b46QUC2y5&ve8uh~IzkT?`mm37U~U(lz+jSJ z(H0!xJ{1LN)R^%fq5)w@b=j~?IhOvyRLgui-8OBmJRR;4Jf>Q=@DUyG526y|ca~99 z)wsbKH+U86eYk@jW0lkU_(%AOsI2}cG1jrnNW5>X^2n;^*0FK%05Z(jD#L?$2N|mq z%;kG{_BX6DiP7h&(PRH=G$u+9_RyDXumeF44ya%I{2uymIVOoDm>}^gc@+ qO20rcqu=9xmWL3G+64Wx9;Q@UK*2gjYyaoNFny&X=oV@&Nx_d9IyivWs@S*RTm{fELc>Q6-5;aS+k5P6jfay@7Yup zin3r~Ri$Eq5YNuoO+@(v@HY3{^X@&m_q@@(SaAyO%cWe!ttbh=_Kd|G^UUd!GM=pj zh1^n5aTkiteBc&+XTd24@455-+X6``sgvuA#itddj6@~yOI~on$>(Lcw%&^BtIcZE zXtYzBEX29ZtCe73z7lxllIN8DOMLR3eC|@|q90r+QMn~wA%Bf7eg&Q85mDm!$T%#`?yXV%u68$mN%i|9prVq-R#!ABWX? zb9GEK&Ja`}s?~z(=O>ER>tp7ln0aHwG)6VHsGTq?t(dW16B8$UP{N{kU}kn`%RhFu zpT64c6+#9L4B-ah1sll7{0tgH8XbQLSoa|7-YB@%nIbpQ;IAsOQc|V zCCp+*9wUiRH4AeCZiFOMurW`WI7(c>p7Gow#YjGdC4u66ZqCWm4CFJJ#M4hB?-m_A zO@&S;3X^&aNfoO^WmQh)RY4Wiges}Bs;H`(RL`lJG5ZoC#x}kUH}TR#SpErJUfh8$ z+=lyjAHKzV@D0Aa3tQ|i+~o|5OnwhtZgjZ=chI2YI{U!^TDpTe!-g9`>*NPQ2X0|+ z8+YJH*nw^Q9rky*9&1=2+<+D1-Lz?>8Ct175VqKT_=-J5bc8M}_u&xj!QwtVhQTEF z&<-5oJ{5(;xH0V=qXD5ORwUgtq$u$hrdr06>2_&z`N?n(;StrkiI3=jzY&G#zp#v~ zDEc){zs4&_>oY%~M_A#sKH5XSV};fJARYE+Br!k2gucn6=R4?6as>KSdFEGgkDc6P zc(}!0C;H|zvxVsa&MXe|FlBp?1 wfF#m-ER%YUB1Y?R$NUh2UY(|Y*IrV=S|5)2uQA&CKOctq8@ve(w0;Hv0P$9-dH?_b diff --git a/testdata/lefdef/foreigncell/au_ignore_foreign.oas.gz b/testdata/lefdef/foreigncell/au_ignore_foreign.oas.gz index 44831e8e56939afe244ce6ca4d300d6263bd7106..c9dd21723297b02c121d520c30bd1668a62c76a4 100644 GIT binary patch literal 906 zcmV;519ki#iwFo$Ago>h19WY0E^lFT0Oe9kZyQw&52@B6_f5TP4%JmdWR3xw+hRT8o{! z({A@7VVPg5)w|0{iUNKnaSq1?wPI&yE4EoKnVGV6LkPW_Pv0nAx9n>r`jM(7jvB=M znDAp#6!W>6)J(0{s*9IRW5xM$C7PO?E0r^J#Kffdf@w6DJ1cglw&c)6Z>3?o_eoJV zjdtxTryEUu;KjG!NW7l7CCa9;R9lRuu3U*t$Hhyg(dvBebbGY6S!?$kQ8JB>TD6`h z5JRR>?|o9Mw>pbsqJ4p&4V-4vu75G=7<+5XeC#t<&zSa^CN73YOrz^Fu{Xuw=pB@Z zQS4fr@@)CXo8!-aTJje1Zo$iOWZj5k>&Ga8!TDU;?tS`Mt?Qugw;vOJOpfD)AI!mm z#1>*^2{~lsF_Ku?FowL#ogs-7;wVtYj}l*qPn)?S#Y8@br2xhG^h_pCZy;Z|Ndn!B ze6E$r{+tBe4r_zR~!n(|g(;ls!521-ou zCm^2C7(z;`4q*eMo_auZZFPz{#JPuI)COu-hY)2vwSJGd>bXPA zK12l~Pa&kD%Bq~otAZL(MK!2Os;nxis)p1{YFJOcN?3gp@4`A(pTNQca&vwg`fwM1 z$6fdy2k;%<+<`T22Zp>JV<&!wK7W?nhWo^=_?G){k5uoIEwA7XP@ViZumwM&xrtkF z6xfDM`~j^U{(#eC5V!*k{k^E6M;WTr9tYOAUHFFErxsQFuy6wVWB~KK@D$uhek0p( zgeSBq1jmI@^O(4V7HmkGp-WEiFQmQnXVdM_;_|cMp1>*XwT?%0z&}`p@twI$otgMo zXONZqut&b;tN~bk7}5vs3wz|hWrY|%5Dr3-NhSax59ze*kit?sVt gK}f;y3EU&6s8A(kHju3SpAWM0Hv;)eW%QT^? z2M*OVO&k#7OXFs(7?&Nv2fxqzeDCx4eP3ICwdxez*UR~;TU8Q3>?sQ!@aW`~GG43( z#r%9wb!SV?OyHJ$XV$3%7u*^DeSt|Ssp0YY(z6OuMxq+{WiL4A6biCjUuj2;rB*F! zHajUz=9a@+dnHSe5TDp5aE4c_!R$;m@G51`srVQ9np9*pcO7h^q{l47!2|W(eTV> z_;u7y=RP`$@4lINBYRntJ##r+O6Sg=wWe(GjAu4lUq+uVNpC- zaqeg>|Cl-R?9nop2{RB7Zg79aCZpAlkWCVEZa(OI{zcf1NWAYjX5yF~#Zxbsg$0Qz zT3(s31j!>LG1Sl^+<-eq5-!?=r%W6ru4qqrZi!+npTLqpaUnnL6lezWsZ8SOmr-y_ z4w3hhe=_@^Uy-MNWA3x#Ylw$i z>@`MTn?&p60YOONokm#(oN@8bD8wDKm|hU-A< zYgiy$hehMVv}vRft<)b1>+BAE%kJSDWWEOrhp>mY zVQvSWz$WzIKHh|Va!5@fF%qV|13Vz~#G<5|h7=|KBGk)x+T9ivSDrTa2p&_f8)Tn0 z_&cMZcok!G732T93d|TA Date: Sat, 2 May 2020 00:14:06 +0200 Subject: [PATCH 039/121] Layer mapping scheme enhancements, UI enhancements * A map file can now be specified and should be read relative to the technology * Giving a map file will disable the pattern-based mapping * UI enhanced accordingly * Added UI option to configure macro resolution mode * Bugfix: LEF files have not been read relative to the tech * Bugfix: Some options where not persistent --- .../lefdef/db_plugin/dbLEFDEFImporter.cc | 43 +- .../lefdef/db_plugin/dbLEFDEFImporter.h | 18 +- .../lefdef/db_plugin/dbLEFDEFPlugin.cc | 70 +- .../lefdef/db_plugin/dbLEFImporter.cc | 89 +- .../lefdef/db_plugin/gsiDeclDbLEFDEF.cc | 34 +- .../LEFDEFTechnologyComponentEditor.ui | 1125 +++++++++-------- .../lay_plugin/layLEFDEFImportDialogs.cc | 32 +- .../lay_plugin/layLEFDEFImportDialogs.h | 2 +- 8 files changed, 781 insertions(+), 632 deletions(-) diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc index 2e18707ee..8195cfbd0 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc @@ -77,7 +77,7 @@ LEFDEFReaderOptions::LEFDEFReaderOptions () m_special_routing_suffix (""), m_special_routing_datatype (0), m_separate_groups (false), - m_consider_map_file (true), + m_map_file (), m_macro_resolution_mode (0) { // .. nothing yet .. @@ -125,7 +125,7 @@ LEFDEFReaderOptions::LEFDEFReaderOptions (const LEFDEFReaderOptions &d) m_special_routing_suffix (d.m_special_routing_suffix), m_special_routing_datatype (d.m_special_routing_datatype), m_separate_groups (d.m_separate_groups), - m_consider_map_file (d.m_consider_map_file), + m_map_file (d.m_map_file), m_macro_resolution_mode (d.m_macro_resolution_mode), m_lef_files (d.m_lef_files) { @@ -298,45 +298,6 @@ LEFDEFReaderState::read_map_file (const std::string &path, db::Layout &layout) } } -void -LEFDEFReaderState::import_map_file_heuristics (const std::string &main_path, db::Layout &layout) -{ - std::string input_dir = tl::absolute_path (main_path); - if (! tl::file_exists (input_dir)) { - return; - } - - std::string bn = tl::basename (tl::filename (main_path)); - std::vector map_files; - std::string map_file_exact; - - std::vector entries = tl::dir_entries (input_dir); - for (std::vector::const_iterator e = entries.begin (); e != entries.end (); ++e) { - - if (tl::to_lower_case (tl::extension (*e)) == "map") { - - if (tl::basename (*e) == bn) { - map_file_exact = *e; - } else { - map_files.push_back (*e); - } - - } - - } - - try { - if (! map_file_exact.empty ()) { - read_map_file (tl::combine_path (input_dir, map_file_exact), layout); - } else if (map_files.size () == 1) { - read_map_file (tl::combine_path (input_dir, map_files.front ()), layout); - } - } catch (tl::Exception &ex) { - // ignore read errors on map file (this is a heuristics!) - tl::error << ex.msg (); - } -} - std::pair LEFDEFReaderState::open_layer (db::Layout &layout, const std::string &n, LayerPurpose purpose) { diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h index bb41ade22..3d7a05412 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h @@ -515,14 +515,14 @@ public: m_separate_groups = f; } - bool consider_map_file () const + const std::string &map_file () const { - return m_consider_map_file; + return m_map_file; } - void set_consider_map_file (bool f) + void set_map_file (const std::string &f) { - m_consider_map_file = f; + m_map_file = f; } /** @@ -584,7 +584,7 @@ private: std::string m_special_routing_suffix; int m_special_routing_datatype; bool m_separate_groups; - bool m_consider_map_file; + std::string m_map_file; unsigned int m_macro_resolution_mode; std::vector m_lef_files; }; @@ -637,14 +637,6 @@ public: */ void read_map_file (const std::string &path, db::Layout &layout); - /** - * @brief Imports a .map file present next to the input files - * "main_path" path of an input file (DEF). If a suitable .map file is found at this path, - * it is loaded into the reader state object. This will eventually disable any other layer - * mapping except for the global layers (region, outline, placement blockage). - */ - void import_map_file_heuristics (const std::string &main_path, db::Layout &layout); - /** * @brief Sets the layer map */ diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc index b919fb0c7..983a68596 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc @@ -31,6 +31,7 @@ #include "dbDEFImporter.h" #include "dbLEFDEFImporter.h" #include "dbLayoutUtils.h" +#include "dbTechnology.h" namespace db { @@ -103,14 +104,32 @@ public: { return "LEFDEF"; } + private: tl::InputStream &m_stream; db::LayerMap m_layer_map; - std::string correct_path (const std::string &fn) + std::string correct_path (const std::string &fn, const db::Layout &layout) { if (! tl::is_absolute (fn)) { + + // if a technology is given and the file can be found in the technology's base path, take it + // from there. + std::string tn = layout.meta_info_value ("technology"); + const db::Technology *tech = 0; + if (! tn.empty ()) { + tech = db::Technologies::instance ()->technology_by_name (tn); + } + + if (tech && ! tech->base_path ().empty ()) { + std::string new_fn = tl::combine_path (tech->base_path (), fn); + if (tl::file_exists (new_fn)) { + return new_fn; + } + } + return tl::combine_path (m_stream.absolute_path (), fn); + } else { return fn; } @@ -126,8 +145,8 @@ private: db::LEFDEFReaderState state (lefdef_options, layout); - if (lefdef_options->consider_map_file ()) { - state.import_map_file_heuristics (m_stream.absolute_path (), layout); + if (! lefdef_options->map_file ().empty ()) { + state.read_map_file (correct_path (lefdef_options->map_file (), layout), layout); } layout.dbu (lefdef_options->dbu ()); @@ -140,7 +159,7 @@ private: for (std::vector::const_iterator l = lefdef_options->begin_lef_files (); l != lefdef_options->end_lef_files (); ++l) { - std::string lp = correct_path (*l); + std::string lp = correct_path (*l, layout); tl::InputStream lef_stream (lp); tl::log << tl::to_string (tr ("Reading")) << " " << lp; @@ -159,7 +178,7 @@ private: for (std::vector::const_iterator l = lefdef_options->begin_lef_files (); l != lefdef_options->end_lef_files (); ++l) { - std::string lp = correct_path (*l); + std::string lp = correct_path (*l, layout); tl::InputStream lef_stream (lp); tl::log << tl::to_string (tr ("Reading")) << " " << lp; @@ -167,8 +186,7 @@ private: } - // Additionally read all LEF files next to the DEF file and if there is a single .map file - // or one with the same name than the input file with ".map" suffix, try to read this one too. + // Additionally read all LEF files next to the DEF file std::string input_dir = tl::absolute_path (m_stream.absolute_path ()); @@ -205,6 +223,39 @@ private: } }; +namespace { + + struct MacroResolutionModeConverter + { + public: + MacroResolutionModeConverter () + { + m_values.push_back ("default"); + m_values.push_back ("always-lef"); + m_values.push_back ("always-cellref"); + } + + std::string to_string (unsigned int v) const + { + return v < m_values.size () ? m_values[v] : std::string (); + } + + void from_string (const std::string &s, unsigned int &v) const + { + v = 0; + for (unsigned int i = 0; i < (unsigned int) m_values.size (); ++i) { + if (m_values [i] == s) { + v = i; + } + } + } + + private: + std::vector m_values; + }; + +} + class LEFDEFFormatDeclaration : public db::StreamFormatDeclaration { @@ -280,7 +331,10 @@ class LEFDEFFormatDeclaration tl::make_member (&LEFDEFReaderOptions::produce_special_routing, &LEFDEFReaderOptions::set_produce_special_routing, "produce-special-routing") + tl::make_member (&LEFDEFReaderOptions::special_routing_suffix, &LEFDEFReaderOptions::set_special_routing_suffix, "special-routing-suffix") + tl::make_member (&LEFDEFReaderOptions::special_routing_datatype, &LEFDEFReaderOptions::set_special_routing_datatype, "special-routing-datatype") + - tl::make_member (&LEFDEFReaderOptions::begin_lef_files, &LEFDEFReaderOptions::end_lef_files, &LEFDEFReaderOptions::push_lef_file, "lef-files") + tl::make_member (&LEFDEFReaderOptions::begin_lef_files, &LEFDEFReaderOptions::end_lef_files, &LEFDEFReaderOptions::push_lef_file, "lef-files") + + tl::make_member (&LEFDEFReaderOptions::macro_resolution_mode, &LEFDEFReaderOptions::set_macro_resolution_mode, "macro-resolution-mode", MacroResolutionModeConverter ()) + + tl::make_member (&LEFDEFReaderOptions::separate_groups, &LEFDEFReaderOptions::set_separate_groups, "separate-groups") + + tl::make_member (&LEFDEFReaderOptions::map_file, &LEFDEFReaderOptions::set_map_file, "map-file") ); } }; diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc index cbe6681f5..b537b532e 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc @@ -347,7 +347,7 @@ LEFImporter::read_geometries (db::Layout &layout, db::Cell &cell, LayerPurpose p std::string vn = get (); db::Cell *vc = reader_state ()->via_cell (vn); if (! vc) { - warn ("Unknown via: " + vn); + warn (tl::to_string (tr ("Unknown via: ")) + vn); } if (iterate) { @@ -549,7 +549,7 @@ LEFImporter::read_viadef_by_geometry (Layout &layout, db::Cell &cell, ViaDesc &v via_desc.m1 = routing_layers[0]; via_desc.m2 = routing_layers[1]; } else { - warn ("Can't determine routing layers for via: " + n); + warn (tl::to_string (tr ("Can't determine routing layers for via: ")) + n); } reset_cellname (); @@ -724,6 +724,11 @@ void LEFImporter::read_macro (Layout &layout) { std::string mn = get (); + + if (m_macros_by_name.find (mn) != m_macros_by_name.end ()) { + error (tl::to_string (tr ("Duplicate MACRO name: ")) + mn); + } + set_cellname (mn); db::Cell &cell = layout.cell (layout.add_cell ()); @@ -813,20 +818,11 @@ LEFImporter::read_macro (Layout &layout) } else if (test ("FOREIGN")) { if (foreign_cell) { - error ("Duplicate FOREIGN definition"); + error (tl::to_string (tr ("Duplicate FOREIGN definition"))); } std::string cn = get (); - db::cell_index_type ci; - std::pair c = layout.cell_by_name (cn.c_str ()); - if (c.first) { - ci = c.second; - } else { - ci = layout.add_cell (cn.c_str ()); - layout.cell (ci).set_ghost_cell (true); - } - db::Point vec; db::FTrans ft; if (! peek (";")) { @@ -836,11 +832,24 @@ LEFImporter::read_macro (Layout &layout) expect (";"); - foreign_cell = &layout.cell (ci); - // What is the definition of the FOREIGN transformation? - // Guessing: this transformation moves the lower-left origin to 0,0 - foreign_trans = db::Trans (db::Point () - vec) * db::Trans (ft); - foreign_name = cn; + if (options ().macro_resolution_mode () != 1) { + + db::cell_index_type ci; + std::pair c = layout.cell_by_name (cn.c_str ()); + if (c.first) { + ci = c.second; + } else { + ci = layout.add_cell (cn.c_str ()); + layout.cell (ci).set_ghost_cell (true); + } + + foreign_cell = &layout.cell (ci); + // What is the definition of the FOREIGN transformation? + // Guessing: this transformation moves the lower-left origin to 0,0 + foreign_trans = db::Trans (db::Point () - vec) * db::Trans (ft); + foreign_name = cn; + + } } else if (test ("OBS")) { @@ -855,38 +864,42 @@ LEFImporter::read_macro (Layout &layout) } - if (options ().macro_resolution_mode () == 1 || (! foreign_cell && options ().macro_resolution_mode () != 2)) { + if (! foreign_cell) { - // actually implement the real cell + if (options ().macro_resolution_mode () != 2) { - layout.rename_cell (cell.cell_index (), mn.c_str ()); + // actually implement the real cell - std::pair dl = open_layer (layout, std::string (), Outline); - if (dl.first) { - cell.shapes (dl.second).insert (db::Box (-origin, -origin + size)); - } + layout.rename_cell (cell.cell_index (), mn.c_str ()); - m_macros_by_name.insert (std::make_pair (mn, std::make_pair (&cell, db::Trans ()))); + std::pair dl = open_layer (layout, std::string (), Outline); + if (dl.first) { + cell.shapes (dl.second).insert (db::Box (-origin, -origin + size)); + } - } else if (! foreign_cell) { + m_macros_by_name.insert (std::make_pair (mn, std::make_pair (&cell, db::Trans ()))); - // macro resolution mode #2 (always create a MACRO reference, no LEF geometry) - - db::cell_index_type ci; - std::pair c = layout.cell_by_name (mn.c_str ()); - if (c.first) { - ci = c.second; } else { - ci = layout.add_cell (mn.c_str ()); - layout.cell (ci).set_ghost_cell (true); - } - layout.delete_cell (cell.cell_index ()); - m_macros_by_name.insert (std::make_pair (mn, std::make_pair (&layout.cell (ci), db::Trans ()))); + // macro resolution mode #2 (always create a MACRO reference, no LEF geometry) + + db::cell_index_type ci; + std::pair c = layout.cell_by_name (mn.c_str ()); + if (c.first) { + ci = c.second; + } else { + ci = layout.add_cell (mn.c_str ()); + layout.cell (ci).set_ghost_cell (true); + } + + layout.delete_cell (cell.cell_index ()); + m_macros_by_name.insert (std::make_pair (mn, std::make_pair (&layout.cell (ci), db::Trans ()))); + + } } else if (foreign_name != mn) { - warn ("FOREIGN name differs from MACRO name in macro: " + mn); + warn (tl::to_string (tr ("FOREIGN name differs from MACRO name in macro: ")) + mn); layout.rename_cell (cell.cell_index (), mn.c_str ()); diff --git a/src/plugins/streamers/lefdef/db_plugin/gsiDeclDbLEFDEF.cc b/src/plugins/streamers/lefdef/db_plugin/gsiDeclDbLEFDEF.cc index b41e96977..30fd2a0b1 100644 --- a/src/plugins/streamers/lefdef/db_plugin/gsiDeclDbLEFDEF.cc +++ b/src/plugins/streamers/lefdef/db_plugin/gsiDeclDbLEFDEF.cc @@ -466,17 +466,20 @@ gsi::Class decl_lefdef_config ("db", "LEFDEFReaderConfi "\n" "This property has been added in version 0.26.5.\n" ) + - gsi::method ("consider_map_file", &db::LEFDEFReaderOptions::consider_map_file, - "@brief Gets a value indicating whether to consider reading .map files next to DEF files.\n" - "If this property is set to true (the default), the DEF reader will look for .map files next to the " - "DEF file. If such a file is found, it will be used to map DEF layers to layout layers. The layer mapping " - "settings specified in the reader options are ignored in this case.\n" + gsi::method ("map_file", &db::LEFDEFReaderOptions::map_file, + "@brief Gets the layer map file to use.\n" + "If a layer map file is given, the reader will pull the layer mapping from this file. The layer mapping rules " + "specified in the reader options are ignored in this case. These are the name suffix rules for vias, blockages, routing, " + "special routing, pins etc. and the corresponding datatype rules. The \\layer_map attribute will also be ignored. " + "\n" + "The layer map file path will be resolved relative to the technology base path if the LEF/DEF reader options are " + "used in the context of a technology.\n" "\n" "This property has been added in version 0.26.5.\n" ) + - gsi::method ("consider_map_file=", &db::LEFDEFReaderOptions::set_consider_map_file, gsi::arg ("flag"), - "@brief Sets a value indicating whether to consider reading .map files next to DEF files.\n" - "See \\consider_map_file for details about this property.\n" + gsi::method ("map_file=", &db::LEFDEFReaderOptions::set_map_file, gsi::arg ("file"), + "@brief Sets the layer map file to use.\n" + "See \\map_file for details about this property.\n" "\n" "This property has been added in version 0.26.5.\n" ) + @@ -513,6 +516,21 @@ gsi::Class decl_lefdef_config ("db", "LEFDEFReaderConfi "@brief Detailed LEF/DEF reader options\n" "This class is a aggregate belonging to the \\LoadLayoutOptions class. It provides options for the LEF/DEF reader. " "These options have been placed into a separate class to account for their complexity." + "\n" + "This class specifically handles layer mapping. This is the process of generating layer names or GDS layer/datatypes " + "from LEF/DEF layers and purpose combinations. There are basically two ways: to use a map file or to use pattern-based production rules.\n" + "\n" + "To use a layer map file, set the \\map_file attribute to the name of the layer map file. The layer map " + "file lists the GDS layer and datatype numbers to generate for the geometry.\n" + "\n" + "The pattern-based approach will use the layer name and attach a purpose-dependent suffix to it. " + "Use the ..._suffix attributes to specify this suffix. For routing, the corresponding attribute is \\routing_suffix for example. " + "A purpose can also be mapped to a specific GDS datatype using the corresponding ..._datatype attributes.\n" + "The decorated or undecorated names are looked up in a layer mapping table in the next step. The layer mapping table " + "is specified using the \\layer_map attribute. This table can be used to map layer names to specific GDS layers " + "by using entries of the form 'NAME: layer-number'.\n" + "\n" + "If a layer map file is present, the pattern-based attributes are ignored.\n" ); } diff --git a/src/plugins/streamers/lefdef/lay_plugin/LEFDEFTechnologyComponentEditor.ui b/src/plugins/streamers/lefdef/lay_plugin/LEFDEFTechnologyComponentEditor.ui index 1ae4b3c64..3b849c53f 100644 --- a/src/plugins/streamers/lefdef/lay_plugin/LEFDEFTechnologyComponentEditor.ui +++ b/src/plugins/streamers/lefdef/lay_plugin/LEFDEFTechnologyComponentEditor.ui @@ -6,8 +6,8 @@ 0 0 - 775 - 855 + 859 + 868 @@ -207,7 +207,84 @@ 4 + + + + FOREIGN macros + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + Via cell name prefix + + + + + + + Layout DBU + + + + + + + + Link to external cells for FOREIGN, LEF macros otherwise + + + + + Ignore FOREIGN, Produce LEF macros always + + + + + Always link to external cells + + + + + + + + Produce a parent cell for each group + + + + + + + Groups + + + + + + + + 0 + 0 + + + + + @@ -230,60 +307,21 @@ - - - - Produce a parent cell for each group + + + + Qt::Horizontal - - - - - - Via cell name prefix + + QSizePolicy::Fixed - - - - - - Layout database unit + + + 5 + 20 + - - - - - - Separate groups - - - - - - - - 0 - 0 - - - - - - - - Consider map files - - - - - - - Look for .map files next to DEF files and use them to map layers - - - true - - + @@ -291,7 +329,7 @@ - Production (specify what objects to produce and on what layers) + Global Production Rules (specify what objects to produce and on what layers) true @@ -312,32 +350,6 @@ 6 - - - - - 0 - 0 - - - - - - - :/right.png - - - - - - - As properties with name ... - - - - - - @@ -368,18 +380,77 @@ - - + + - Produce ... - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + As properties with name ... - - + + + + + + + Qt::Vertical + + + + + + + + + + + + + :/right.png + + + + + + + + + + <html><body>(<a href="int:/about/variant_notation.xml">See here for the name notation</a>)</body></html> + + + Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing + + + + + + + + + + + + + :/right.png + + + + + + + + + + + + + :/right.png + + + + + 0 @@ -387,11 +458,11 @@ - Cell outlines + Blockages - + @@ -422,9 +493,6 @@ - - - @@ -432,63 +500,7 @@ - - - - - 0 - 0 - - - - Blockages - - - - - - - <html><body>(<a href="int:/about/variant_notation.xml">See here for the name notation</a>)</body></html> - - - Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing - - - - - - - - - - GDS datatype ... - - - - - - Layer name suffix ... - - - - - - - - 0 - 0 - - - - - - - :/right.png - - - - On layer with spec ... @@ -498,282 +510,6 @@ - - - - - - - - - - - - - - - - Via geometry - - - - - - - - - - :/right.png - - - - - - - Qt::Vertical - - - - - - - Pins - - - - - - - Regions - - - - - - - - 0 - 0 - - - - - - - :/right.png - - - - - - - - - - :/right.png - - - - - - - - - - - - - Pin names - - - - - - - - - - :/right.png - - - - - - - - - - - 0 - 0 - - - - - - - :/right.png - - - - - - - - 0 - 0 - - - - - - - :/right.png - - - - - - - Blockages - - - - - - - - 0 - 0 - - - - - - - :/right.png - - - - - - - - - - - - - - 0 - 0 - - - - - - - :/right.png - - - - - - - - 0 - 0 - - - - - - - :/right.png - - - - - - - - 0 - 0 - - - - - - - :/right.png - - - - - - - Pin labels - - - - - - - - - - - - - Special routing - - - - - - - - - - - - - Routing - - - - - - - - - - - - - Obstructions - - - - - - - - - - - - - - - - - - - LEF Pins - - - @@ -795,24 +531,11 @@ 0 - - - - Layer assignment is not used if a .map file is present for DEF layer mapping - - - - - - :/warn_16.png - - - - 1 + 0 0 @@ -824,94 +547,480 @@ - - - - - - - - 0 - 1 - - - - Layer Mapping (filter/modify layers, assign GDS layer/datatypes) - - - true - - - - 9 - - - 4 - - - 9 - - - 4 - - - - - Read all layers (additionally to the ones in the mapping table) - - + + - - + + - + 0 - 1 + 0 - - - 16 - 0 - - - - QFrame::NoFrame - - - QFrame::Raised + + Regions - - + + + + Pin names + + + + + + + + 0 + 0 + + + + Cell outlines + + + + + 0 0 - - This table is not used if a .map file is present for DEF layer mapping - - :/warn_16.png - - - - - - - Qt::Horizontal + :/right.png + + + + 0 + + + + Layer Map File + + + + + + Qt::Vertical + + + + 20 + 278 + + + + + + + + Layer map file + + + + + + + ... + + + false + + + + + + + + + + If a layer map file is given, pattern based rules are ignored. +If used inside a technology, the file will be looked up relative to the technology's base path. + + + + + + + + Pattern Based Layer Production Rules + + + + + + + 0 + 150 + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + + + + 0 + 0 + + + + + + + :/right.png + + + + + + + + + + + + + Special routing + + + + + + + + + + + + + + + + + 0 + 0 + + + + + + + :/right.png + + + + + + + + + + + + + + + + + 0 + 0 + + + + + + + :/right.png + + + + + + + + 0 + 0 + + + + + + + :/right.png + + + + + + + Routing + + + + + + + + + + + 0 + 0 + + + + + + + :/right.png + + + + + + + + 0 + 0 + + + + + + + :/right.png + + + + + + + Via geometry + + + + + + + Pin labels + + + + + + + LEF Pins + + + + + + + Layer name suffix ... + + + + + + + Pins + + + + + + + + + + + + + GDS datatype ... + + + + + + + + 0 + 0 + + + + + + + :/right.png + + + + + + + + + + + + + + + + Blockages + + + + + + + Obstructions + + + + + + + + 0 + 0 + + + + + + + :/right.png + + + + + + + + + + Layer name suffix ... + + + + + + + GDS datatype ... + + + + + + + Qt::Vertical + + + + + + + + + + + 0 + 1 + + + + Layer Mapping (filter/modify layers, assign GDS layer/datatypes) + + + true + + + + 9 + + + 4 + + + 9 + + + 4 + + + + + Read all layers (additionally to the ones in the mapping table) + + + + + + + + 0 + 1 + + + + + 16 + 0 + + + + QFrame::NoFrame + + + QFrame::Raised + + + + + + + Qt::Horizontal + + + + + + + + + + @@ -934,16 +1043,6 @@ dbu produce_net_names net_prop_name - produce_outlines - outline_layer - produce_placement_blockages - placement_blockage_layer - produce_via_geometry - suffix_via_geometry - datatype_via_geometry - produce_pins - suffix_pins - datatype_pins read_all_cbx diff --git a/src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImportDialogs.cc b/src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImportDialogs.cc index fec570018..89f4754d3 100644 --- a/src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImportDialogs.cc +++ b/src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImportDialogs.cc @@ -363,7 +363,7 @@ LEFDEFReaderOptionsEditor::LEFDEFReaderOptionsEditor (QWidget *parent) connect (del_lef_files, SIGNAL (clicked ()), this, SLOT (del_lef_files_clicked ())); connect (move_lef_files_up, SIGNAL (clicked ()), this, SLOT (move_lef_files_up_clicked ())); connect (move_lef_files_down, SIGNAL (clicked ()), this, SLOT (move_lef_files_down_clicked ())); - connect (consider_map_file, SIGNAL (stateChanged (int)), this, SLOT (consider_map_file_state_changed ())); + connect (browse_mapfile, SIGNAL (clicked ()), this, SLOT (browse_mapfile_clicked ())); lay::activate_help_links (help_label); } @@ -451,7 +451,8 @@ LEFDEFReaderOptionsEditor::commit (db::FormatSpecificReaderOptions *options, con data->set_labels_suffix (tl::to_string (suffix_labels->text ())); data->set_labels_datatype (datatype_labels->text ().toInt ()); data->set_separate_groups (separate_groups->isChecked ()); - data->set_consider_map_file (consider_map_file->isChecked ()); + data->set_map_file (tl::to_string (mapfile_path->text ())); + data->set_macro_resolution_mode (foreign_mode->currentIndex ()); data->clear_lef_files (); for (int i = 0; i < lef_files->count (); ++i) { @@ -512,7 +513,9 @@ LEFDEFReaderOptionsEditor::setup (const db::FormatSpecificReaderOptions *options suffix_labels->setText (tl::to_qstring (data->labels_suffix ())); datatype_labels->setText (QString::number (data->labels_datatype ())); separate_groups->setChecked (data->separate_groups ()); - consider_map_file->setChecked (data->consider_map_file ()); + mapfile_path->setText (tl::to_qstring (data->map_file ())); + layer_map_mode->setCurrentIndex (data->map_file ().empty () ? 1 : 0); + foreign_mode->setCurrentIndex (data->macro_resolution_mode ()); checkbox_changed (); @@ -529,13 +532,6 @@ LEFDEFReaderOptionsEditor::setup (const db::FormatSpecificReaderOptions *options } } -void -LEFDEFReaderOptionsEditor::consider_map_file_state_changed () -{ - warn1->setVisible (consider_map_file->isChecked ()); - warn2->setVisible (consider_map_file->isChecked ()); -} - void LEFDEFReaderOptionsEditor::checkbox_changed () { @@ -563,6 +559,22 @@ LEFDEFReaderOptionsEditor::checkbox_changed () datatype_labels->setEnabled (produce_labels->isChecked ()); } +void +LEFDEFReaderOptionsEditor::browse_mapfile_clicked () +{ + std::string title, filters; + title = tl::to_string (QObject::tr ("Select Layer Map File")); + filters = tl::to_string (QObject::tr ("LEF/DEF layer map files (*.map);;All files (*)")); + QString file = QFileDialog::getOpenFileName (this, tl::to_qstring (title), QString (), tl::to_qstring (filters)); + if (! file.isNull ()) { + if (mp_tech) { + mapfile_path->setText (tl::to_qstring (mp_tech->correct_path (tl::to_string (file)))); + } else { + mapfile_path->setText (file); + } + } +} + void LEFDEFReaderOptionsEditor::add_lef_file_clicked () { diff --git a/src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImportDialogs.h b/src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImportDialogs.h index 1da4f81b2..695285e0b 100644 --- a/src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImportDialogs.h +++ b/src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImportDialogs.h @@ -98,7 +98,7 @@ private slots: void del_lef_files_clicked (); void move_lef_files_up_clicked (); void move_lef_files_down_clicked (); - void consider_map_file_state_changed (); + void browse_mapfile_clicked (); private: tl::weak_ptr mp_tech; From fd63d1017fd7a517f67d8b8a028795301903df97 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sat, 2 May 2020 09:30:17 +0200 Subject: [PATCH 040/121] Added tests for LEF/DEF mapfile, fixed a few bugs. --- .../lefdef/db_plugin/dbLEFDEFPlugin.cc | 2 +- .../lefdef/db_plugin/dbLEFImporter.cc | 8 ++--- .../lefdef/unit_tests/dbLEFDEFImportTests.cc | 24 +++++++++++-- testdata/lefdef/mapfile/au.oas.gz | Bin 0 -> 508 bytes testdata/lefdef/mapfile/in.def | 32 ++++++++++++++++++ testdata/lefdef/mapfile/in.lef | 19 +++++++++++ testdata/lefdef/mapfile/in_tech.lef | 27 +++++++++++++++ testdata/lefdef/mapfile/test.map | 18 ++++++++++ 8 files changed, 123 insertions(+), 7 deletions(-) create mode 100644 testdata/lefdef/mapfile/au.oas.gz create mode 100644 testdata/lefdef/mapfile/in.def create mode 100644 testdata/lefdef/mapfile/in.lef create mode 100644 testdata/lefdef/mapfile/in_tech.lef create mode 100644 testdata/lefdef/mapfile/test.map diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc index 983a68596..2bd4466ae 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc @@ -128,7 +128,7 @@ private: } } - return tl::combine_path (m_stream.absolute_path (), fn); + return tl::combine_path (tl::dirname (m_stream.absolute_path ()), fn); } else { return fn; diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc index b537b532e..7bf3c307a 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc @@ -604,12 +604,12 @@ LEFImporter::read_layer (Layout & /*layout*/) } else if (test ("TYPE")) { - if (test ("ROUTING")) { + std::string type = get (); + + if (type == "ROUTING" || type == "MASTERSLICE") { m_routing_layers.insert (ln); - } else if (test ("CUT")) { + } else if (type == "CUT") { m_cut_layers.insert (ln); - } else { - get (); } expect (";"); diff --git a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc index f6f70c009..827377a2a 100644 --- a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc +++ b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc @@ -49,7 +49,7 @@ static db::LEFDEFReaderOptions default_options () return tc; } -static void run_test (tl::TestBase *_this, const char *lef_dir, const char *filename, const char *au, const db::LEFDEFReaderOptions &tc, bool priv = true) +static void run_test (tl::TestBase *_this, const char *lef_dir, const char *filename, const char *au, const db::LEFDEFReaderOptions &options, bool priv = true) { std::string fn_path (priv ? tl::testsrc_private () : tl::testsrc ()); fn_path += "/testdata/lefdef/"; @@ -61,7 +61,7 @@ static void run_test (tl::TestBase *_this, const char *lef_dir, const char *file tl::Extractor ex (filename); - db::LEFDEFReaderState ld (&tc, layout); + db::LEFDEFReaderState ld (&options, layout); db::DEFImporter imp; @@ -103,6 +103,18 @@ static void run_test (tl::TestBase *_this, const char *lef_dir, const char *file db::Reader reader (stream); reader.read (layout, db::LoadLayoutOptions ()); + } else if (ex.test("read:")) { + + std::string fn = fn_path, f; + ex.read_word_or_quoted (f); + fn += f; + + tl::InputStream stream (fn); + db::Reader reader (stream); + db::LoadLayoutOptions lo; + lo.set_options (options); + reader.read (layout, lo); + } else { break; @@ -361,3 +373,11 @@ TEST(110_lefpins) run_test (_this, "lefpins", "lef:in_tech.lef+lef:in.lef+def:in.def", "au_lefpins_mapped.oas.gz", options, false); } + +TEST(111_mapfile) +{ + db::LEFDEFReaderOptions options = default_options (); + options.set_map_file ("test.map"); + + run_test (_this, "mapfile", "read:in.def", "au.oas.gz", options, false); +} diff --git a/testdata/lefdef/mapfile/au.oas.gz b/testdata/lefdef/mapfile/au.oas.gz new file mode 100644 index 0000000000000000000000000000000000000000..629c7144bc827d1420891ebf3db05ad7bec45729 GIT binary patch literal 508 zcmVaT?9SNY0W+&HBN7@9_DkNq23#Ns*^) z*R|4DFJI3O_vuBKUdC1OSj|bUg*%Do29jnJMA`67e;9>*PfjB@7~n0O#DiQ0G8x2C ze#QBeVQgiR*Zol+Jr$ISlI9K61&OXEDz3=nc|lcC(nZFzCelO4M8y>u+yJ#AN}4xw zs@M}Ph^oEp;`(Tbs9Mg^PP}mYzU4?Pd?4bl3cv1;uY3<{_}~>ezKLS^2Z^OBO?mze zRwav>qbo`MV&+Pu4#qbILf4HWp&CaVbkaTthos?^;fn*RVypzXTPn yUJuB}`UyE_MOEqktZmc@$uU@R>kA^-c-k2&M0rm#P~QE|2jDl8kqyDK1ONa$2?68) literal 0 HcmV?d00001 diff --git a/testdata/lefdef/mapfile/in.def b/testdata/lefdef/mapfile/in.def new file mode 100644 index 000000000..f24be607b --- /dev/null +++ b/testdata/lefdef/mapfile/in.def @@ -0,0 +1,32 @@ + +VERSION 5.8 ; +DIVIDERCHAR "/" ; +BUSBITCHARS "[]" ; +DESIGN mapfile ; +UNITS DISTANCE MICRONS 1000 ; + +DIEAREA ( 0 0 ) ( 1000 2000 ) ; + +COMPONENTS 3 ; + - macro1 macro1 + PLACED ( 0 0 ) N ; +END COMPONENTS + +SPECIALNETS 1 ; +- VDD ( * VDD ) ++ ROUTED M1 50 + SHAPE STRIPE ( 500 0 ) ( 500 500 25 ) square ( 0 500 ) ++ USE POWER ; +END SPECIALNETS + +PINS 1 ; +- VDD + NET VDD + SPECIAL + DIRECTION INOUT + USE POWER + + LAYER M1 ( 0 0 ) ( 50 70 ) + ; +END PINS + +NETS 1 ; +- TOP ++ ROUTED M1 ( 100 700 ) ( 500 * ) ; +END NETS + +END DESIGN + diff --git a/testdata/lefdef/mapfile/in.lef b/testdata/lefdef/mapfile/in.lef new file mode 100644 index 000000000..38d550efa --- /dev/null +++ b/testdata/lefdef/mapfile/in.lef @@ -0,0 +1,19 @@ +MACRO macro1 + CLASS CORE ; + ORIGIN 0.035 0.235 ; + SIZE 0.07 BY 0.47 ; + PIN Z + PORT + LAYER M1 ; + RECT -0.02 0 0.02 0.2 ; + RECT -0.03 -0.2 0.01 -0.1 ; + VIA 0.0 0.2 square ; + VIA 0.01 -0.2 square ; + END + END Z + OBS + LAYER M1 ; + RECT -0.035 -0.235 0.035 0.235 ; + END +END macro1 + diff --git a/testdata/lefdef/mapfile/in_tech.lef b/testdata/lefdef/mapfile/in_tech.lef new file mode 100644 index 000000000..83f711256 --- /dev/null +++ b/testdata/lefdef/mapfile/in_tech.lef @@ -0,0 +1,27 @@ +LAYER M0PO + TYPE MASTERSLICE ; + WIDTH 0.02 ; +END M0PO +LAYER VIA0 + TYPE CUT ; +END VIA0 +LAYER M1 + TYPE MASTERSLICE ; + WIDTH 0.025 ; +END M1 +LAYER VIA1 + TYPE CUT ; +END VIA1 +LAYER M2 + TYPE MASTERSLICE ; + WIDTH 0.03 ; +END M2 + +VIA square + LAYER M0PO ; + RECT -0.006 -0.006 0.006 0.006 ; + LAYER VIA0 ; + RECT -0.006 -0.006 0.006 0.006 ; + LAYER M1 ; + RECT -0.006 -0.006 0.006 0.006 ; +END square diff --git a/testdata/lefdef/mapfile/test.map b/testdata/lefdef/mapfile/test.map new file mode 100644 index 000000000..7a8609dad --- /dev/null +++ b/testdata/lefdef/mapfile/test.map @@ -0,0 +1,18 @@ +DIEAREA ALL 100 0 +M0PO LEFPIN,LEFOBS,PIN,NET,SPNET,VIA 10 0 +VIA0 LEFPIN,LEFOBS,VIA,PIN,NET,SPNET 11 0 +M1 LEFPIN 12 0 +M1 LEFOBS 12 1 +M1 PIN 12 2 +M1 NET 12 3 +M1 SPNET 12 4 +M1 VIA 12 5 +M1 FILLOPC 12 100 +M1 FILLOPC:MASK:1 12 101 +M1 FILLOPC:MASK:2 12 102 +M1 BLOCKAGEFILL 12 150 +M1 BLOCKAGE 12 151 +M1 FILL 12 152 +NAME M1/PIN 12 10 +VIA1 LEFPIN,LEFOBS,VIA,PIN,NET,SPNET 13 0 +M2 LEFPIN,LEFOBS,PIN,NET,SPNET,VIA 14 0 From b5faa7f6be2ffe46cbb9455858dbc1e0c06d17ae Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sat, 2 May 2020 09:32:00 +0200 Subject: [PATCH 041/121] Fixed RBA tests. --- testdata/ruby/dbReaders.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testdata/ruby/dbReaders.rb b/testdata/ruby/dbReaders.rb index b17092355..eb33d4c61 100644 --- a/testdata/ruby/dbReaders.rb +++ b/testdata/ruby/dbReaders.rb @@ -345,9 +345,9 @@ class DBReaders_TestClass < TestBase conf.separate_groups = true assert_equal(conf.separate_groups, true) - assert_equal(conf.consider_map_file, true) - conf.consider_map_file = false - assert_equal(conf.consider_map_file, false) + assert_equal(conf.map_file, "") + conf.map_file = "xyz.map" + assert_equal(conf.map_file, "xyz.map") assert_equal(conf.lef_files.join(","), "") conf.lef_files = [ "u.lef", "v.lef" ] From 99ec635e5a7afe1a815fbc2eb630e9ec56d9e272 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sat, 2 May 2020 13:19:26 +0200 Subject: [PATCH 042/121] Start LEF browser in tech base dir in the context of a technology --- .../streamers/lefdef/lay_plugin/layLEFDEFImportDialogs.cc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImportDialogs.cc b/src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImportDialogs.cc index 89f4754d3..2ca27a3d8 100644 --- a/src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImportDialogs.cc +++ b/src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImportDialogs.cc @@ -581,7 +581,13 @@ LEFDEFReaderOptionsEditor::add_lef_file_clicked () std::string title, filters; title = tl::to_string (QObject::tr ("Add LEF Files")); filters = tl::to_string (QObject::tr ("LEF files (*.lef *.LEF *.lef.gz *.LEF.gz);;All files (*)")); - QStringList files = QFileDialog::getOpenFileNames (this, tl::to_qstring (title), QString (), tl::to_qstring (filters)); + + std::string dir; + if (mp_tech) { + dir = mp_tech->base_path (); + } + + QStringList files = QFileDialog::getOpenFileNames (this, tl::to_qstring (title), tl::to_qstring (dir), tl::to_qstring (filters)); for (QStringList::const_iterator f = files.begin (); f != files.end (); ++f) { if (mp_tech) { lef_files->addItem (tl::to_qstring (mp_tech->correct_path (tl::to_string (*f)))); From 5fd60e0d49870cb5ecb4f6e8ddcc8172829d8696 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sat, 2 May 2020 13:22:04 +0200 Subject: [PATCH 043/121] Planning LEF/DEF enhancements for 0.27 now as this is a too big change. --- .../lefdef/db_plugin/gsiDeclDbLEFDEF.cc | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/plugins/streamers/lefdef/db_plugin/gsiDeclDbLEFDEF.cc b/src/plugins/streamers/lefdef/db_plugin/gsiDeclDbLEFDEF.cc index 30fd2a0b1..8c4fc324b 100644 --- a/src/plugins/streamers/lefdef/db_plugin/gsiDeclDbLEFDEF.cc +++ b/src/plugins/streamers/lefdef/db_plugin/gsiDeclDbLEFDEF.cc @@ -264,13 +264,13 @@ gsi::Class decl_lefdef_config ("db", "LEFDEFReaderConfi "@brief Gets the via cellname prefix.\n" "Vias are represented by cells. The cell name is formed by combining the via cell name prefix and the via name.\n" "\n" - "This property has been added in version 0.26.5.\n" + "This property has been added in version 0.27.\n" ) + gsi::method ("via_cellname_prefix=", &db::LEFDEFReaderOptions::set_via_cellname_prefix, gsi::arg ("prefix"), "@brief Sets the via cellname prefix.\n" "See \\via_cellname_prefix for details about this property.\n" "\n" - "This property has been added in version 0.26.5.\n" + "This property has been added in version 0.27.\n" ) + gsi::method ("produce_pins", &db::LEFDEFReaderOptions::produce_pins, "@brief Gets a value indicating whether pin geometries shall be produced.\n" @@ -420,37 +420,37 @@ gsi::Class decl_lefdef_config ("db", "LEFDEFReaderConfi "@brief Gets a value indicating whether special routing geometry shall be produced.\n" "See \\produce_via_geometry for details about the layer production rules.\n" "\n" - "The differentiation between special and normal routing has been introduced in version 0.26.5." + "The differentiation between special and normal routing has been introduced in version 0.27." ) + gsi::method ("produce_special_routing=", &db::LEFDEFReaderOptions::set_produce_special_routing, gsi::arg ("produce"), "@brief Sets a value indicating whether special routing geometry shall be produced.\n" "See \\produce_via_geometry for details about the layer production rules." "\n" - "The differentiation between special and normal routing has been introduced in version 0.26.5." + "The differentiation between special and normal routing has been introduced in version 0.27." ) + gsi::method ("special_routing_suffix", &db::LEFDEFReaderOptions::special_routing_suffix, "@brief Gets the special routing layer name suffix.\n" "See \\produce_via_geometry for details about the layer production rules." "\n" - "The differentiation between special and normal routing has been introduced in version 0.26.5." + "The differentiation between special and normal routing has been introduced in version 0.27." ) + gsi::method ("special_routing_suffix=", &db::LEFDEFReaderOptions::set_special_routing_suffix, gsi::arg ("suffix"), "@brief Sets the special routing layer name suffix.\n" "See \\produce_via_geometry for details about the layer production rules." "\n" - "The differentiation between special and normal routing has been introduced in version 0.26.5." + "The differentiation between special and normal routing has been introduced in version 0.27." ) + gsi::method ("special_routing_datatype", &db::LEFDEFReaderOptions::special_routing_datatype, "@brief Gets the special routing layer datatype value.\n" "See \\produce_via_geometry for details about the layer production rules." "\n" - "The differentiation between special and normal routing has been introduced in version 0.26.5." + "The differentiation between special and normal routing has been introduced in version 0.27." ) + gsi::method ("special_routing_datatype=", &db::LEFDEFReaderOptions::set_special_routing_datatype, gsi::arg ("datatype"), "@brief Sets the special routing layer datatype value.\n" "See \\produce_via_geometry for details about the layer production rules." "\n" - "The differentiation between special and normal routing has been introduced in version 0.26.5." + "The differentiation between special and normal routing has been introduced in version 0.27." ) + gsi::method ("separate_groups", &db::LEFDEFReaderOptions::separate_groups, "@brief Gets a value indicating whether to create separate parent cells for individual groups.\n" @@ -458,13 +458,13 @@ gsi::Class decl_lefdef_config ("db", "LEFDEFReaderConfi "individual parent cells. These parent cells are named after the groups and are put into the master top cell.\n" "If this property is set to false (the default), no such group parents will be formed." "\n" - "This property has been added in version 0.26.5.\n" + "This property has been added in version 0.27.\n" ) + gsi::method ("separate_groups=", &db::LEFDEFReaderOptions::set_separate_groups, gsi::arg ("flag"), "@brief Sets a value indicating whether to create separate parent cells for individual groups.\n" "See \\seperate_groups for details about this property.\n" "\n" - "This property has been added in version 0.26.5.\n" + "This property has been added in version 0.27.\n" ) + gsi::method ("map_file", &db::LEFDEFReaderOptions::map_file, "@brief Gets the layer map file to use.\n" @@ -475,13 +475,13 @@ gsi::Class decl_lefdef_config ("db", "LEFDEFReaderConfi "The layer map file path will be resolved relative to the technology base path if the LEF/DEF reader options are " "used in the context of a technology.\n" "\n" - "This property has been added in version 0.26.5.\n" + "This property has been added in version 0.27.\n" ) + gsi::method ("map_file=", &db::LEFDEFReaderOptions::set_map_file, gsi::arg ("file"), "@brief Sets the layer map file to use.\n" "See \\map_file for details about this property.\n" "\n" - "This property has been added in version 0.26.5.\n" + "This property has been added in version 0.27.\n" ) + gsi::method ("macro_resolution_mode", &db::LEFDEFReaderOptions::macro_resolution_mode, "@brief Gets the macro resolution mode.\n" @@ -494,13 +494,13 @@ gsi::Class decl_lefdef_config ("db", "LEFDEFReaderConfi " @li 2: produce a placeholder cell always (even if FOREIGN isn't given) @/li\n" "@/ul\n" "\n" - "This property has been added in version 0.26.5.\n" + "This property has been added in version 0.27.\n" ) + gsi::method ("macro_resolution_mode=", &db::LEFDEFReaderOptions::set_macro_resolution_mode, gsi::arg ("mode"), "@brief Sets the macro resolution mode.\n" "See \\macro_resolution_mode for details about this property.\n" "\n" - "This property has been added in version 0.26.5.\n" + "This property has been added in version 0.27.\n" ) + gsi::method ("lef_files", &db::LEFDEFReaderOptions::lef_files, "@brief Gets the list technology LEF files to additionally import\n" From 9d9e014d628ba2161a905658d578b005a611acb4 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Mon, 1 Jun 2020 13:08:07 +0200 Subject: [PATCH 044/121] Removed temp file. --- TODO | 51 --------------------------------------------------- 1 file changed, 51 deletions(-) delete mode 100644 TODO diff --git a/TODO b/TODO deleted file mode 100644 index 89e60ff94..000000000 --- a/TODO +++ /dev/null @@ -1,51 +0,0 @@ - -Plan: - -DONE 1. Combine AbstractMenuProvider, PluginRoot and the AbstractMenuProvider's - implementation in MainWindow/LayoutView into lay::Dispatcher - -DONE 2. Base MainWindow and LayoutView on lay::Dispatcher - -DONE 3. lay::Plugin::plugin_root -> lay::Dispatcher *lay::Plugin::dispatcher() - This method will find the MainWindow or LayoutView depending - which is the root. - -DONE 4. Don't use AbstractMenuProvider::instance anymore, rather use lay::Dispatcher::instance - when necessary (should not be) - -DONE 5. Instead of slots, bind abstract menu items to symbols passed to - Dispatcher::menu_activated - -DONE 6. MainWindow will automatically dispatch menu_activated to LayoutView - -DONE 7. GSI-expose menu_activated in LayoutView and MainWindow as "call_menu" - -DONE 8. We can move menu initialization of LV-specifics to the LayoutView and - remove the cm_... and the code which just passes signals to the current view! :) - -9. BTW: make QWidget::setParent and QObject::setParent transfer ownership for - Qt binding. - -10. Provide the layer toolbox for GSI - -11. Tests for new features and GSI tests - -12. Default ctor for MainWindow so a pymod script can instantiate one (?) - -DONE 13. Re-think concept of Action as "smart pointers": ConfigureAction - violates this. ConfigureAction should be ActionHandle variant? - Action as pointer and smart pointers for managing? - - -Tests: - - DONE: compare menu layout - - DONE: test every menu function - - adding of new tech - - DONE: adding of rulers/removing - - ruby plugin (debugging, re-running) - - DONE: changing of macro title, move macro to different place - - DONE: funktionieren die check marks vor den menus? (Mode, selection modes, ruler template) - - DONE: check whether there is a replacement for the "cm_..." methods and tests them (at least one) - - DONE: check if changing the default grid works - - Run unit tests -> klayout_main_tests:main is failing - From 4aa1364e4bc75b81d9f58cec3c469f4010891a89 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Mon, 1 Jun 2020 15:04:25 +0200 Subject: [PATCH 045/121] Fixed DEF reader, updated golden test data. --- .../lefdef/db_plugin/dbDEFImporter.cc | 37 ++++++++++++++++-- .../lefdef/unit_tests/dbLEFDEFImportTests.cc | 10 ++++- testdata/lefdef/specialnets_geo/au.oas.gz | Bin 346 -> 682 bytes .../lefdef/specialnets_geo/au_no_spnet.oas.gz | Bin 224 -> 529 bytes .../specialnets_geo/au_spnet_mapped.oas.gz | Bin 378 -> 765 bytes testdata/lefdef/specialnets_geo/test.def | 6 ++- 6 files changed, 46 insertions(+), 7 deletions(-) diff --git a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc index 87c25cfe2..79b23e5a3 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc @@ -730,19 +730,30 @@ DEFImporter::read_nets (db::Layout &layout, db::Cell &design, double scale, bool } else { bool prefixed = false; - bool can_have_rect_or_polygon = true; + bool can_have_rect_polygon_or_via = true; if ((was_shield = test ("SHIELD")) == true || test ("NOSHIELD") || test ("ROUTED") || test ("FIXED") || test ("COVER")) { if (was_shield) { take (); } prefixed = true; - can_have_rect_or_polygon = test ("+"); + can_have_rect_polygon_or_via = test ("+"); } bool any = false; - if (can_have_rect_or_polygon && test ("POLYGON")) { + if (can_have_rect_polygon_or_via) { + if (test ("SHAPE")) { + take (); + test ("+"); + } + if (test ("MASK")) { + get_long (); + test ("+"); + } + } + + if (can_have_rect_polygon_or_via && test ("POLYGON")) { std::string ln = get (); @@ -760,7 +771,7 @@ DEFImporter::read_nets (db::Layout &layout, db::Cell &design, double scale, bool any = true; - } else if (can_have_rect_or_polygon && test ("RECT")) { + } else if (can_have_rect_polygon_or_via && test ("RECT")) { std::string ln = get (); @@ -778,6 +789,24 @@ DEFImporter::read_nets (db::Layout &layout, db::Cell &design, double scale, bool any = true; + } else if (can_have_rect_polygon_or_via && test ("VIA")) { + + std::string vn = get (); + db::FTrans ft = get_orient (true /*optional*/); + + test ("("); + db::Vector pt = get_vector (scale); + test (")"); + + std::map::const_iterator vd = m_via_desc.find (vn); + if (vd != m_via_desc.end ()) { + design.insert (db::CellInstArray (db::CellInst (vd->second.cell->cell_index ()), db::Trans (ft.rot (), pt))); + } else { + error (tl::to_string (tr ("Invalid via name: ")) + vn); + } + + any = true; + } else if (prefixed) { read_single_net (nondefaultrule, layout, design, scale, prop_id, specialnets); diff --git a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc index 827377a2a..a2de90a2a 100644 --- a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc +++ b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc @@ -131,7 +131,15 @@ static void run_test (tl::TestBase *_this, const char *lef_dir, const char *file // normalize the layout by writing to OASIS and reading from .. - std::string tmp_file = _this->tmp_file ("tmp.oas"); + // generate a "unique" name ... + unsigned int hash = 0; + if (au) { + for (const char *cp = au; *cp; ++cp) { + hash = (hash << 4) ^ (hash >> 4) ^ ((unsigned int) *cp); + } + } + + std::string tmp_file = _this->tmp_file (tl::sprintf ("tmp_%x.oas", hash)); { tl::OutputStream stream (tmp_file); diff --git a/testdata/lefdef/specialnets_geo/au.oas.gz b/testdata/lefdef/specialnets_geo/au.oas.gz index cffe301036e98a0a255fff963ec96a3908949e8a..dced1c01d169597f188d940a11aa1f5310af4dcf 100644 GIT binary patch literal 682 zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDB|rrGn#q9V6m{J>C6WUE)3cLR{TlgW|(I zT|zuKSY&u*Akv|J*c8Z!as|hS_y@#0yZZR>a3p7B7Q~n27qIgM$Gf`(#|H%Y2e<}> zL~^pGl;-AEGQ$-x^M!dj#sjfoJXnUC-9I$M$J5W1nT45w2bsgo%m2W_A%qpgNG01q=HrrbA38m>T%cF&$$%!?cC*3KLwogZ}^%NVtbzvf7c3 literal 346 zcmV-g0j2&QiwFo8D3)FT19WY0E^lFT08Z@2gEzO`uOm0 zBxht6#Fyk3u=54SySoI(2L$;CxCVtpa|g?T#01F>N|ScaS3KQzS0 z)6bQeg_(f|nZwQGYskz96ok@1z7aDsm=C78SwN;RGXX{5EM7)YYeoh}CYu0Fc~MJd zMy8Y$V`EWECPpR=4N*~E2Ehl6Cm2NzvoNe-5_`zV&&dGf%BVANF!D2qDljrlU_QYp zD{8>PvWRT~+X}X0JU3Wm#Wpgti!cJ!fut;0*iSJXVmiUpz<-YE7}FW1EsR%~;KCjJ s2be&@J^Z3QAjOPKCm7cN4P^kSKr(X;lPpuiNCpfH08r9-!k+>F07o^Jz5oCK diff --git a/testdata/lefdef/specialnets_geo/au_no_spnet.oas.gz b/testdata/lefdef/specialnets_geo/au_no_spnet.oas.gz index 4bf45b0312df6e018c5d1584253c6957ddcc26cf..021f51106a270a0e6eaf02b9087957147f539168 100644 GIT binary patch literal 529 zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDB|rrGn#q9V6m{J>C6WUE)3cLR{TlgW|(I zT|zuKSY&u*Akv|J*c8Z!as|hS_y@#0yZZR>a3p7B7Q~n27ce7Od|{rB@jz@CpHiBe zTglDt9~$E0>F3JK!py*f%;9G8HDqQ43PNch--wwR%m>rlEFe>unSdg27B8cyH6sHf zlTCo8yr?BJBU4I>v9YKn6C;y`hNvhngWxyD3Ct6i1q)6vGKd^zVOYb&)G(3(0|NjH CakUo! literal 224 zcmV<603ZJ!iwFojGn`%k19WY0E^lFT08Z@2gEzO`uOm0 zBxht6#Fyk3Fe6xeVV;ihKx`PFQkt7v$<6K`8sg*W=gQ2&%)o=p;b!tRWM%{kLTMo1 zh?yD82h-dvAXAu`fFf`fFQce6BLgFoO@OAns3kKaQ%Z`lv8W{zBa?=Ps37yzyJVUeg2RN0ssIj8)hf~ diff --git a/testdata/lefdef/specialnets_geo/au_spnet_mapped.oas.gz b/testdata/lefdef/specialnets_geo/au_spnet_mapped.oas.gz index 7decf1260d997e1cf39da23007c07dbec4fafd37..70d7ce49400a914d3c7979334c442de450e5c290 100644 GIT binary patch literal 765 zcmd^%Jxjw-6o&6PHzqM3#)8*D5_A#kU}A&5pi}fXl_+4ly|The2$;_^ zW|Q1I^l6{wxQY zLZrbaP#SLWW4eP3IuIFjaAR~}@Fy522Syh+qX}t@adL2UboUQ8`b^+~w&MP`g+nA1aBD#TK||R`&&W>z-2+t`|6Ur!Dr}TCk%jR@(ZmJKkS{ z#Zp`ZEnjRqjfSBe9v%0^=}BMBa8a*u;kR49(+&=jbKSFE@0?Brn%Q-$LOxqWjjpyj zLBsVNs!(FYK~FU8q7*4m-H7cnUypVg<LRO9z;3r(W)%c16c|gB`F98*`>2o+=00i4RI?z15UdrVfl1hgqCVjR zhBz=^aE#A*3$K{}jW5i5oWw(u4MC=WA&l^nl8K>QC$17ViLvpfj4+?OgCvoMiR_j@ YI-&efic5JM{O2L$3*NHe>hb~r0R5=4a{vGU diff --git a/testdata/lefdef/specialnets_geo/test.def b/testdata/lefdef/specialnets_geo/test.def index b9b3e39c8..b104eb328 100644 --- a/testdata/lefdef/specialnets_geo/test.def +++ b/testdata/lefdef/specialnets_geo/test.def @@ -16,12 +16,14 @@ VIAS 1 ; END VIAS SPECIALNETS 1 ; - dummy - + ROUTED + RECT M2 ( 350 0 ) ( 200 100 ) + + ROUTED + RECT M2 ( 350 0 ) ( 250 100 ) + POLYGON M1 ( 300 0 ) ( 300 50 ) ( 350 50 ) ( 400 100 ) ( 400 0 ) + ROUTED + POLYGON M2 ( 300 150 ) ( 300 200 ) ( 350 200 ) ( 400 250 ) ( 400 150 ) + RECT M1 ( 0 0 ) ( 100 200 ) - + ROUTED M1 30 ( 0 0 15 ) ( 100 0 0 ) VIA1_dummy ( 100 100 10 ) + + ROUTED M1 30 + MASK 2 ( 0 0 15 ) ( 100 0 0 ) VIA1_dummy ( 100 100 10 ) + ROUTED M2 50 + SHAPE RING + STYLE 1 ( 0 100 ) ( 100 200 ) ( 200 200 ) + + ROUTED + MASK 2 + RECT M2 ( 250 0 ) ( 150 100 ) + + ROUTED + SHAPE RING + MASK 1 + VIA VIA1_dummy E ( 200 200 ) ; END SPECIALNETS END DESIGN From 233574598b696eb73709ebd793f648b1f24e79dc Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Thu, 4 Jun 2020 17:55:06 +0200 Subject: [PATCH 046/121] Support for LEF via definition properties (syntax wise, not semantics wise) --- .../lefdef/db_plugin/dbLEFImporter.cc | 9 ++++- .../lefdef/unit_tests/dbLEFDEFImportTests.cc | 6 ++++ testdata/lefdef/via_properties/au.oas.gz | Bin 0 -> 476 bytes testdata/lefdef/via_properties/in.lef | 33 ++++++++++++++++++ 4 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 testdata/lefdef/via_properties/au.oas.gz create mode 100644 testdata/lefdef/via_properties/in.lef diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc index 7bf3c307a..694114034 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc @@ -361,6 +361,13 @@ LEFImporter::read_geometries (db::Layout &layout, db::Cell &cell, LayerPurpose p expect (";"); + } else if (test ("PROPERTY")) { + + // skip properties + while (! at_end () && ! test (";")) { + take (); + } + } else { // stop at unknown token break; @@ -405,7 +412,7 @@ LEFImporter::read_nondefaultrule (db::Layout & /*layout*/) } } else { - while (! test (";")) { + while (! at_end () && ! test (";")) { take (); } } diff --git a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc index a2de90a2a..2d1f235f6 100644 --- a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc +++ b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc @@ -389,3 +389,9 @@ TEST(111_mapfile) run_test (_this, "mapfile", "read:in.def", "au.oas.gz", options, false); } + +TEST(112_via_properties) +{ + run_test (_this, "via_properties", "lef:in.lef", "au.oas.gz", default_options (), false); +} + diff --git a/testdata/lefdef/via_properties/au.oas.gz b/testdata/lefdef/via_properties/au.oas.gz new file mode 100644 index 0000000000000000000000000000000000000000..d6551998c1ddf76dfab4e905cb9b4c094ef7a7de GIT binary patch literal 476 zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDB|rrGn#q9V6m{J>C6WUE)3cLR{TlgW|(I zT|zuKSY&u*Akv|J*c8Z!as|hS_y@#0yZZR>aD{m~#+PL#8pfM2BeA(zKw`{H%nUqm z7B^dNYDr>_Au}UT6p0NLH)3Xni-Xy`3?jFg7~I_5MKl?E7<(B-7@3(GMlxVv004Fj Bt|$Ni literal 0 HcmV?d00001 diff --git a/testdata/lefdef/via_properties/in.lef b/testdata/lefdef/via_properties/in.lef new file mode 100644 index 000000000..3bc3ed774 --- /dev/null +++ b/testdata/lefdef/via_properties/in.lef @@ -0,0 +1,33 @@ +VERSION 5.6 ; + +UNITS +DATABASE MICRONS 2000 ; +END UNITS + +PROPERTYDEFINITIONS +VIA OR_DEFAULT STRING ; +END PROPERTYDEFINITIONS + +LAYER metal1 +TYPE ROUTING ; +END metal1 + +LAYER via1 +TYPE CUT ; +END via1 + +LAYER metal2 +TYPE ROUTING ; +END metal2 + +VIA via1_4 DEFAULT +LAYER via1 ; +RECT -0.035 -0.035 0.035 0.035 ; +LAYER metal1 ; +RECT -0.035 -0.07 0.035 0.07 ; +LAYER metal2 ; +RECT -0.035 -0.07 0.035 0.07 ; +PROPERTY OR_DEFAULT Y ; +END via1_4 + +END LIBRARY From 339a2a6fd7186adabc849f8de8af00163751e004 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Fri, 5 Jun 2020 00:34:07 +0200 Subject: [PATCH 047/121] Maybe fixed a performance issue (layout object needs to be locked) --- src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc | 4 ++-- src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc index 79b23e5a3..cbbe2119b 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc @@ -1210,6 +1210,8 @@ DEFImporter::read_components (std::list > void DEFImporter::do_read (db::Layout &layout) { + db::LayoutLocker locker (&layout); + double dbu_mic = 1000.0; double scale = 1.0 / (dbu_mic * layout.dbu ()); @@ -1405,8 +1407,6 @@ DEFImporter::do_read (db::Layout &layout) if (! groups.empty () && options ().separate_groups ()) { - db::LayoutLocker locker (&layout); - others_cell = &layout.cell (layout.add_cell ("NOGROUP")); design.insert (db::CellInstArray (others_cell->cell_index (), db::Trans ())); diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc index 694114034..cb78db7a9 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc @@ -941,6 +941,8 @@ LEFImporter::read_macro (Layout &layout) void LEFImporter::do_read (db::Layout &layout) { + db::LayoutLocker locker (&layout); + // TODO: what to do with that value? // double dbu_mic = 1000; From d462a442a8a489910630158af12e043a77f8ec5b Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sat, 13 Jun 2020 15:39:41 +0200 Subject: [PATCH 048/121] LEF/DEF reader More consistently ignore the settings from the "Rule based layer mapping". So if a map file is given, the map file statements shall not be overridden by rules from the rule-based mapping tab. --- src/laybasic/laybasic/layLayoutView.cc | 4 +- .../lefdef/db_plugin/dbLEFDEFImporter.cc | 71 ++++++++++++++----- .../lefdef/db_plugin/dbLEFDEFImporter.h | 42 +++-------- .../lefdef/db_plugin/dbLEFDEFPlugin.cc | 36 +--------- .../lefdef/db_plugin/dbLEFImporter.cc | 8 ++- .../lefdef/unit_tests/dbLEFDEFImportTests.cc | 2 +- 6 files changed, 76 insertions(+), 87 deletions(-) diff --git a/src/laybasic/laybasic/layLayoutView.cc b/src/laybasic/laybasic/layLayoutView.cc index 44d534acf..91d0fe807 100644 --- a/src/laybasic/laybasic/layLayoutView.cc +++ b/src/laybasic/laybasic/layLayoutView.cc @@ -4739,7 +4739,9 @@ LayoutView::active_library_changed (int /*index*/) void LayoutView::cellview_changed (unsigned int index) { - mp_hierarchy_panel->do_update_content (index); + if (mp_hierarchy_panel) { + mp_hierarchy_panel->do_update_content (index); + } cellview_changed_event (index); diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc index 61223bb34..5a8261f98 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc @@ -23,6 +23,7 @@ #include "dbLEFDEFImporter.h" #include "dbLayoutUtils.h" +#include "dbTechnology.h" #include "tlStream.h" #include "tlProgress.h" @@ -33,6 +34,39 @@ namespace db { +// ----------------------------------------------------------------------------------- +// Path resolution utility + +std::string correct_path (const std::string &fn, const db::Layout &layout, const std::string &base_path) +{ + if (! tl::is_absolute (fn)) { + + // if a technology is given and the file can be found in the technology's base path, take it + // from there. + std::string tn = layout.meta_info_value ("technology"); + const db::Technology *tech = 0; + if (! tn.empty ()) { + tech = db::Technologies::instance ()->technology_by_name (tn); + } + + if (tech && ! tech->base_path ().empty ()) { + std::string new_fn = tl::combine_path (tech->base_path (), fn); + if (tl::file_exists (new_fn)) { + return new_fn; + } + } + + if (! base_path.empty ()) { + return tl::combine_path (base_path, fn); + } else { + return fn; + } + + } else { + return fn; + } +} + // ----------------------------------------------------------------------------------- // LEFDEFTechnologyComponent implementation @@ -157,15 +191,24 @@ LEFDEFReaderOptions::format_name () const // ----------------------------------------------------------------------------------- // LEFDEFLayerDelegate implementation -LEFDEFReaderState::LEFDEFReaderState (const LEFDEFReaderOptions *tc, db::Layout &layout) - : m_create_layers (true), m_has_explicit_layer_mapping (false), m_laynum (1), mp_tech_comp (tc) +LEFDEFReaderState::LEFDEFReaderState (const LEFDEFReaderOptions *tc, db::Layout &layout, const std::string &base_path) + : m_create_layers (true), m_laynum (1), mp_tech_comp (tc) { - if (tc) { - m_layer_map = tc->layer_map (); - m_create_layers = tc->read_all_layers (); - } + m_has_explicit_layer_mapping = ! tc->map_file ().empty (); + if (m_has_explicit_layer_mapping) { - m_layer_map.prepare (layout); + read_map_file (correct_path (tc->map_file (), layout, base_path), layout); + + } else { + + if (tc) { + m_layer_map = tc->layer_map (); + m_create_layers = tc->read_all_layers (); + } + + m_layer_map.prepare (layout); + + } } void @@ -175,18 +218,10 @@ LEFDEFReaderState::register_layer (const std::string &ln) ++m_laynum; } -void -LEFDEFReaderState::set_explicit_layer_mapping (bool f) -{ - m_has_explicit_layer_mapping = f; - if (! f) { - m_layers.clear (); - } -} - void LEFDEFReaderState::map_layer_explicit (const std::string &n, LayerPurpose purpose, const db::LayerProperties &lp, unsigned int layer) { + tl_assert (m_has_explicit_layer_mapping); m_layers [std::make_pair (n, purpose)] = std::make_pair (true, layer); m_layer_map.map (lp, layer); } @@ -194,6 +229,8 @@ LEFDEFReaderState::map_layer_explicit (const std::string &n, LayerPurpose purpos void LEFDEFReaderState::read_map_file (const std::string &path, db::Layout &layout) { + tl_assert (m_has_explicit_layer_mapping); + tl::log << tl::to_string (tr ("Reading LEF/DEF map file")) << " " << path; tl::InputFile file (path); @@ -299,8 +336,6 @@ LEFDEFReaderState::read_map_file (const std::string &path, db::Layout &layout) } - set_explicit_layer_mapping (true); - db::DirectLayerMapping lm (&layout); for (std::map, db::LayerProperties>::const_iterator i = layer_map.begin (); i != layer_map.end (); ++i) { map_layer_explicit (i->first.first, i->first.second, i->second, lm.map_layer (i->second).second); diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h index 22858f048..ddeb8e036 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h @@ -43,6 +43,12 @@ namespace tl namespace db { +/** + * @brief Correct a path relative to the stream and technology + */ +DB_PLUGIN_PUBLIC +std::string correct_path (const std::string &fn, const db::Layout &layout, const std::string &base_path); + /** * @brief Generic base class of DXF reader exceptions */ @@ -619,34 +625,15 @@ public: /** * @brief Constructor */ - LEFDEFReaderState (const LEFDEFReaderOptions *tc, db::Layout &layout); + LEFDEFReaderState (const LEFDEFReaderOptions *tc, db::Layout &layout, const std::string &base_path = std::string ()); /** - * @brief Provides an explicit layer mapping - * This method is used when reading the layer map file. - */ - void map_layer_explicit (const std::string &n, LayerPurpose purpose, const LayerProperties &lp, unsigned int layer); - - /** - * @brief Provides an explicit layer mapping - * If this flag is set, the layer mapping specified in the reader options are ignored. - */ - void set_explicit_layer_mapping (bool f); - - /** - * @brief Reads a map file + * @brief Reads the given map file + * + * Usually this file is read by the constructor. This method is provided for test purposes. */ void read_map_file (const std::string &path, db::Layout &layout); - /** - * @brief Sets the layer map - */ - virtual void set_layer_map (const db::LayerMap &lm, bool create_layers) - { - m_layer_map = lm; - m_create_layers = create_layers; - } - /** * @brief Gets the layer map */ @@ -655,14 +642,6 @@ public: return m_layer_map; } - /** - * @brief Gets the layer map (non-const version) - */ - db::LayerMap &layer_map () - { - return m_layer_map; - } - /** * @brief Create a new layer or return the index of the given layer */ @@ -708,6 +687,7 @@ private: const LEFDEFReaderOptions *mp_tech_comp; std::pair open_layer_uncached (db::Layout &layout, const std::string &name, LayerPurpose purpose); + void map_layer_explicit (const std::string &n, LayerPurpose purpose, const LayerProperties &lp, unsigned int layer); }; /** diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc index 2bd4466ae..e69af924e 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc @@ -109,32 +109,6 @@ private: tl::InputStream &m_stream; db::LayerMap m_layer_map; - std::string correct_path (const std::string &fn, const db::Layout &layout) - { - if (! tl::is_absolute (fn)) { - - // if a technology is given and the file can be found in the technology's base path, take it - // from there. - std::string tn = layout.meta_info_value ("technology"); - const db::Technology *tech = 0; - if (! tn.empty ()) { - tech = db::Technologies::instance ()->technology_by_name (tn); - } - - if (tech && ! tech->base_path ().empty ()) { - std::string new_fn = tl::combine_path (tech->base_path (), fn); - if (tl::file_exists (new_fn)) { - return new_fn; - } - } - - return tl::combine_path (tl::dirname (m_stream.absolute_path ()), fn); - - } else { - return fn; - } - } - const db::LayerMap &read_lefdef (db::Layout &layout, const db::LoadLayoutOptions &options, bool import_lef) { const db::LEFDEFReaderOptions *lefdef_options = dynamic_cast (options.get_options (format ())); @@ -143,11 +117,7 @@ private: lefdef_options = &default_options; } - db::LEFDEFReaderState state (lefdef_options, layout); - - if (! lefdef_options->map_file ().empty ()) { - state.read_map_file (correct_path (lefdef_options->map_file (), layout), layout); - } + db::LEFDEFReaderState state (lefdef_options, layout, tl::dirname (m_stream.absolute_path ())); layout.dbu (lefdef_options->dbu ()); @@ -159,7 +129,7 @@ private: for (std::vector::const_iterator l = lefdef_options->begin_lef_files (); l != lefdef_options->end_lef_files (); ++l) { - std::string lp = correct_path (*l, layout); + std::string lp = correct_path (*l, layout, tl::dirname (m_stream.absolute_path ())); tl::InputStream lef_stream (lp); tl::log << tl::to_string (tr ("Reading")) << " " << lp; @@ -178,7 +148,7 @@ private: for (std::vector::const_iterator l = lefdef_options->begin_lef_files (); l != lefdef_options->end_lef_files (); ++l) { - std::string lp = correct_path (*l, layout); + std::string lp = correct_path (*l, layout, tl::dirname (m_stream.absolute_path ())); tl::InputStream lef_stream (lp); tl::log << tl::to_string (tr ("Reading")) << " " << lp; diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc index cb78db7a9..02f482670 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc @@ -352,10 +352,12 @@ LEFImporter::read_geometries (db::Layout &layout, db::Cell &cell, LayerPurpose p if (iterate) { std::vector ti = get_iteration (layout); - for (std::vector::const_iterator t = ti.begin (); t != ti.end (); ++t) { - cell.insert (db::CellInstArray (db::CellInst (vc->cell_index ()), *t * db::Trans (points [0]))); + if (vc) { + for (std::vector::const_iterator t = ti.begin (); t != ti.end (); ++t) { + cell.insert (db::CellInstArray (db::CellInst (vc->cell_index ()), *t * db::Trans (points [0]))); + } } - } else { + } else if (vc) { cell.insert (db::CellInstArray (db::CellInst (vc->cell_index ()), db::Trans (points [0]))); } diff --git a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc index 2d1f235f6..efd68ffa1 100644 --- a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc +++ b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc @@ -61,7 +61,7 @@ static void run_test (tl::TestBase *_this, const char *lef_dir, const char *file tl::Extractor ex (filename); - db::LEFDEFReaderState ld (&options, layout); + db::LEFDEFReaderState ld (&options, layout, fn_path); db::DEFImporter imp; From de12c6247c4621a52d63296068e4097632e1ab0a Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sat, 18 Jul 2020 18:08:50 +0200 Subject: [PATCH 049/121] Removed confusing LEF import option - there is only import LEF macros or don't --- .../LEFDEFTechnologyComponentEditor.ui | 221 +++++++++++++----- .../lay_plugin/layLEFDEFImportDialogs.cc | 4 +- 2 files changed, 166 insertions(+), 59 deletions(-) diff --git a/src/plugins/streamers/lefdef/lay_plugin/LEFDEFTechnologyComponentEditor.ui b/src/plugins/streamers/lefdef/lay_plugin/LEFDEFTechnologyComponentEditor.ui index 3b849c53f..65c1784f4 100644 --- a/src/plugins/streamers/lefdef/lay_plugin/LEFDEFTechnologyComponentEditor.ui +++ b/src/plugins/streamers/lefdef/lay_plugin/LEFDEFTechnologyComponentEditor.ui @@ -6,7 +6,7 @@ 0 0 - 859 + 628 868 @@ -210,7 +210,7 @@ - FOREIGN macros + LEF import @@ -241,29 +241,10 @@ - - - - - Link to external cells for FOREIGN, LEF macros otherwise - - - - - Ignore FOREIGN, Produce LEF macros always - - - - - Always link to external cells - - - - - Produce a parent cell for each group + Produce a parent cell per group @@ -323,6 +304,13 @@ + + + + Produce LEF geometry + + + @@ -605,26 +593,13 @@ - 0 + 1 Layer Map File - - - - Qt::Vertical - - - - 20 - 278 - - - - @@ -645,14 +620,30 @@ - + If a layer map file is given, pattern based rules are ignored. If used inside a technology, the file will be looked up relative to the technology's base path. + + true + + + + + Qt::Vertical + + + + 20 + 278 + + + + @@ -682,7 +673,14 @@ If used inside a technology, the file will be looked up relative to the technolo 0 - + + + + 0 + 0 + + + @@ -701,10 +699,24 @@ If used inside a technology, the file will be looked up relative to the technolo - + + + + 0 + 0 + + + - + + + + 0 + 0 + + + @@ -714,13 +726,34 @@ If used inside a technology, the file will be looked up relative to the technolo - + + + + 0 + 0 + + + - + + + + 0 + 0 + + + - + + + + 0 + 0 + + + @@ -739,13 +772,34 @@ If used inside a technology, the file will be looked up relative to the technolo - + + + + 0 + 0 + + + - + + + + 0 + 0 + + + - + + + + 0 + 0 + + + @@ -787,7 +841,14 @@ If used inside a technology, the file will be looked up relative to the technolo - + + + + 0 + 0 + + + @@ -845,7 +906,8 @@ If used inside a technology, the file will be looked up relative to the technolo - Layer name suffix ... + Layer name +suffix ... @@ -857,15 +919,30 @@ If used inside a technology, the file will be looked up relative to the technolo - + + + + 0 + 0 + + + - + + + + 0 + 0 + + + - GDS datatype ... + GDS data- +type ... @@ -886,13 +963,34 @@ If used inside a technology, the file will be looked up relative to the technolo - + + + + 0 + 0 + + + - + + + + 0 + 0 + + + - + + + + 0 + 0 + + + @@ -925,19 +1023,28 @@ If used inside a technology, the file will be looked up relative to the technolo - + + + + 0 + 0 + + + - Layer name suffix ... + Layer name +suffix ... - GDS datatype ... + GDS data- +type ... diff --git a/src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImportDialogs.cc b/src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImportDialogs.cc index 2ca27a3d8..0cfded15b 100644 --- a/src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImportDialogs.cc +++ b/src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImportDialogs.cc @@ -452,7 +452,7 @@ LEFDEFReaderOptionsEditor::commit (db::FormatSpecificReaderOptions *options, con data->set_labels_datatype (datatype_labels->text ().toInt ()); data->set_separate_groups (separate_groups->isChecked ()); data->set_map_file (tl::to_string (mapfile_path->text ())); - data->set_macro_resolution_mode (foreign_mode->currentIndex ()); + data->set_macro_resolution_mode (produce_lef_geo->isChecked () ? 0 : 2); data->clear_lef_files (); for (int i = 0; i < lef_files->count (); ++i) { @@ -515,7 +515,7 @@ LEFDEFReaderOptionsEditor::setup (const db::FormatSpecificReaderOptions *options separate_groups->setChecked (data->separate_groups ()); mapfile_path->setText (tl::to_qstring (data->map_file ())); layer_map_mode->setCurrentIndex (data->map_file ().empty () ? 1 : 0); - foreign_mode->setCurrentIndex (data->macro_resolution_mode ()); + produce_lef_geo->setChecked (data->macro_resolution_mode () == 0); checkbox_changed (); From f17e3d50f04e5fbdd867124dafaec9a898ed4662 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sat, 18 Jul 2020 18:46:42 +0200 Subject: [PATCH 050/121] Added doc link and manual page for layer specifications. --- src/lay/lay/doc/about/index.xml | 1 + src/lay/lay/doc/about/layer_specs.xml | 104 ++++++++++++++++++ src/lay/lay/layHelpResources.qrc | 1 + .../LEFDEFTechnologyComponentEditor.ui | 10 ++ .../lay_plugin/layLEFDEFImportDialogs.cc | 1 + 5 files changed, 117 insertions(+) create mode 100644 src/lay/lay/doc/about/layer_specs.xml diff --git a/src/lay/lay/doc/about/index.xml b/src/lay/lay/doc/about/index.xml index 71465e8ab..948703245 100644 --- a/src/lay/lay/doc/about/index.xml +++ b/src/lay/lay/doc/about/index.xml @@ -12,6 +12,7 @@ + diff --git a/src/lay/lay/doc/about/layer_specs.xml b/src/lay/lay/doc/about/layer_specs.xml new file mode 100644 index 000000000..eb63bb9a7 --- /dev/null +++ b/src/lay/lay/doc/about/layer_specs.xml @@ -0,0 +1,104 @@ + + + + + + About Layer Specifications + +

+ Layer specifications are used in various places, for example in layer mapping + files (). + Layer specifications are used inside the database to give a layer a name or + a number/datatype pair or both. Layer specifications are the text representation + of LayerInfo objects. +

+ +

+ Blanks within layer specifications are ignored and can be put between + the different components of the specification. +

+ +

+ A simple number for the specification will indicate a layer with this layer number and a + datatype of zero: +

+ + 
17
+ +

will give layer 17, datatype 0. +

+ +

+ A number followed by a slash and another number will indicate a layer number + and datatype: +

+ + 
17/5
+ +

+ will give layer 17, datatype 5. +

+ +

+ Layers can be named. Named layers are present in DXF, CIF or other formats + which don't use the GDS layer/datatype number scheme. Just giving a name + will indicate such a layer: +

+ + 
METAL1
+ +

+ will give a named layer called "METAL1". +

+ +

+ If you want to use a name that is a number, use quotes: +

+ + 
"17"
+ +

+ will give a named layer called "17". +

+ +

+ If you want to use a name that includes blanks, put it into quotes + as well: +

+ + 
"METAL 1"
+ +

+ will give a named layer called "METAL 1" (however, such layer names are usually illegal). +

+ +

+ Finally, a layer can have both a name and layer/datatype numbers. + In this case, add the layer/datatype number to the name in round + brackets: +

+ + 
METAL1 (17)
+ +

+ will give a layer named "METAL1" with layer 17 and datatype 0 and +

+ + 
METAL1 (17/5)
+ +

+ will give a layer named "METAL1" with layer 17 and datatype 5. +

+ +

Layer specifications as targets

+ +

+ When used in a target context (e.g. for layer mapping), a layer specification + can use wildcards and relative layer/datatype specifications. + Using "*" instead of a layer or datatype number means to reuse the source + layer or datatype number. Using "+x" or "-x" for layer or datatype number means + to add or subtract "x" from the source layer or datatype number. +

+ + + diff --git a/src/lay/lay/layHelpResources.qrc b/src/lay/lay/layHelpResources.qrc index 731ef64c8..e840931ef 100644 --- a/src/lay/lay/layHelpResources.qrc +++ b/src/lay/lay/layHelpResources.qrc @@ -21,6 +21,7 @@ doc/about/ide_snapshot.png doc/about/index.xml doc/about/layer_mapping.xml + doc/about/layer_specs.xml doc/about/layer_sources.xml doc/about/macro_editor.xml doc/about/macro_in_menu.xml diff --git a/src/plugins/streamers/lefdef/lay_plugin/LEFDEFTechnologyComponentEditor.ui b/src/plugins/streamers/lefdef/lay_plugin/LEFDEFTechnologyComponentEditor.ui index 65c1784f4..7ddb0871a 100644 --- a/src/plugins/streamers/lefdef/lay_plugin/LEFDEFTechnologyComponentEditor.ui +++ b/src/plugins/streamers/lefdef/lay_plugin/LEFDEFTechnologyComponentEditor.ui @@ -587,6 +587,16 @@ + + + + <html><body>(<a href="int:/about/layer_specs.xml">See here for the layer specification</a>)</body></html> + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + diff --git a/src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImportDialogs.cc b/src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImportDialogs.cc index 0cfded15b..868aca328 100644 --- a/src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImportDialogs.cc +++ b/src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImportDialogs.cc @@ -366,6 +366,7 @@ LEFDEFReaderOptionsEditor::LEFDEFReaderOptionsEditor (QWidget *parent) connect (browse_mapfile, SIGNAL (clicked ()), this, SLOT (browse_mapfile_clicked ())); lay::activate_help_links (help_label); + lay::activate_help_links (help_label2); } void From b9c49f06036e284e2776d6f597092820017e51fa Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sat, 18 Jul 2020 22:28:14 +0200 Subject: [PATCH 051/121] Mask specific suffixes, datatypes for LEF/DEF reader. --- .../lefdef/db_plugin/dbLEFDEFImporter.cc | 238 ++++++++++++++++++ .../lefdef/db_plugin/dbLEFDEFImporter.h | 234 +++++++++++++++++ .../lefdef/db_plugin/dbLEFDEFPlugin.cc | 40 ++- .../lefdef/db_plugin/gsiDeclDbLEFDEF.cc | 200 +++++++++++++++ .../LEFDEFTechnologyComponentEditor.ui | 139 +++++++++- .../lay_plugin/layLEFDEFImportDialogs.cc | 42 ++-- src/tl/tl/tlXMLParser.h | 8 +- 7 files changed, 855 insertions(+), 46 deletions(-) diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc index 5a8261f98..dcc8d4dea 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc @@ -144,14 +144,20 @@ LEFDEFReaderOptions &LEFDEFReaderOptions::operator= (const LEFDEFReaderOptions & m_region_layer = d.m_region_layer; m_produce_via_geometry = d.m_produce_via_geometry; m_via_geometry_suffix = d.m_via_geometry_suffix; + m_via_geometry_suffixes = d.m_via_geometry_suffixes; m_via_geometry_datatype = d.m_via_geometry_datatype; + m_via_geometry_datatypes = d.m_via_geometry_datatypes; m_via_cellname_prefix = d.m_via_cellname_prefix; m_produce_pins = d.m_produce_pins; m_pins_suffix = d.m_pins_suffix; + m_pins_suffixes = d.m_pins_suffixes; m_pins_datatype = d.m_pins_datatype; + m_pins_datatypes = d.m_pins_datatypes; m_produce_lef_pins = d.m_produce_lef_pins; m_lef_pins_suffix = d.m_lef_pins_suffix; + m_lef_pins_suffixes = d.m_lef_pins_suffixes; m_lef_pins_datatype = d.m_lef_pins_datatype; + m_lef_pins_datatypes = d.m_lef_pins_datatypes; m_produce_obstructions = d.m_produce_obstructions; m_obstructions_suffix = d.m_obstructions_suffix; m_obstructions_datatype = d.m_obstructions_datatype; @@ -163,10 +169,14 @@ LEFDEFReaderOptions &LEFDEFReaderOptions::operator= (const LEFDEFReaderOptions & m_labels_datatype = d.m_labels_datatype; m_produce_routing = d.m_produce_routing; m_routing_suffix = d.m_routing_suffix; + m_routing_suffixes = d.m_routing_suffixes; m_routing_datatype = d.m_routing_datatype; + m_routing_datatypes = d.m_routing_datatypes; m_produce_special_routing = d.m_produce_special_routing; m_special_routing_suffix = d.m_special_routing_suffix; + m_special_routing_suffixes = d.m_special_routing_suffixes; m_special_routing_datatype = d.m_special_routing_datatype; + m_special_routing_datatypes = d.m_special_routing_datatypes; m_separate_groups = d.m_separate_groups; m_map_file = d.m_map_file; m_macro_resolution_mode = d.m_macro_resolution_mode; @@ -188,6 +198,234 @@ LEFDEFReaderOptions::format_name () const return n; } +static void set_datatypes (db::LEFDEFReaderOptions *data, void (db::LEFDEFReaderOptions::*clear) (), void (db::LEFDEFReaderOptions::*set_datatype) (int datatype), void (db::LEFDEFReaderOptions::*set_datatype_per_mask) (unsigned int mask, int datatype), const std::string &s) +{ + (data->*clear) (); + + tl::Extractor ex (s.c_str ()); + + while (! ex.at_end ()) { + + tl::Extractor ex_saved = ex; + + unsigned int mask = 0; + if (ex.try_read (mask) && ex.test (":")) { + int dt = 0; + ex.read (dt); + (data->*set_datatype_per_mask) (std::max ((unsigned int) 1, mask) - 1, dt); + } else { + ex = ex_saved; + int dt = 0; + ex.read (dt); + (data->*set_datatype) (dt); + } + + if (ex.at_end ()) { + break; + } else { + ex.expect (","); + } + + } +} + +static void set_suffixes (db::LEFDEFReaderOptions *data, void (db::LEFDEFReaderOptions::*clear) (), void (db::LEFDEFReaderOptions::*set_suffix) (const std::string &suffix), void (db::LEFDEFReaderOptions::*set_suffix_per_mask) (unsigned int mask, const std::string &suffix), const std::string &s) +{ + (data->*clear) (); + + tl::Extractor ex (s.c_str ()); + + while (! ex.at_end ()) { + + tl::Extractor ex_saved = ex; + + unsigned int mask = 0; + if (ex.try_read (mask) && ex.test (":")) { + std::string sfx; + ex.read_word_or_quoted (sfx); + (data->*set_suffix_per_mask) (std::max ((unsigned int) 1, mask) - 1, sfx); + } else { + ex = ex_saved; + std::string sfx; + ex.read_word_or_quoted (sfx); + (data->*set_suffix) (sfx); + } + + if (ex.at_end ()) { + break; + } else { + ex.expect (","); + } + + } +} + +static std::string get_datatypes (const db::LEFDEFReaderOptions *data, int (db::LEFDEFReaderOptions::*get_datatype) () const, int (db::LEFDEFReaderOptions::*get_datatype_per_mask) (unsigned int mask) const, unsigned int max_mask) +{ + std::string res; + int dt0 = (data->*get_datatype) (); + if (dt0 >= 0) { + res += tl::to_string (dt0); + } + + for (unsigned int i = 0; i <= max_mask; ++i) { + int dt = (data->*get_datatype_per_mask) (i); + if (dt >= 0 && dt != dt0) { + if (! res.empty ()) { + res += ","; + } + res += tl::to_string (i + 1); + res += ":"; + res += tl::to_string (dt); + } + } + + return res; +} + +static std::string get_suffixes (const db::LEFDEFReaderOptions *data, const std::string &(db::LEFDEFReaderOptions::*get_suffix) () const, const std::string &(db::LEFDEFReaderOptions::*get_suffix_per_mask) (unsigned int mask) const, unsigned int max_mask) +{ + std::string res; + std::string sfx0 = (data->*get_suffix) (); + if (! sfx0.empty ()) { + res += tl::to_word_or_quoted_string (sfx0); + } + + for (unsigned int i = 0; i <= max_mask; ++i) { + std::string sfx = (data->*get_suffix_per_mask) (i); + if (! sfx.empty () && sfx != sfx0) { + if (! res.empty ()) { + res += ","; + } + res += tl::to_string (i + 1); + res += ":"; + res += tl::to_word_or_quoted_string (sfx); + } + } + + return res; +} + +void +LEFDEFReaderOptions::set_via_geometry_suffix_str (const std::string &s) +{ + set_suffixes (this, &LEFDEFReaderOptions::clear_via_geometry_suffixes_per_mask, &LEFDEFReaderOptions::set_via_geometry_suffix, &LEFDEFReaderOptions::set_via_geometry_suffix_per_mask, s); +} + +std::string +LEFDEFReaderOptions::via_geometry_suffix_str () const +{ + return get_suffixes (this, &LEFDEFReaderOptions::via_geometry_suffix, &LEFDEFReaderOptions::via_geometry_suffix_per_mask, max_mask_number ()); +} + +void +LEFDEFReaderOptions::set_via_geometry_datatype_str (const std::string &s) +{ + set_datatypes (this, &LEFDEFReaderOptions::clear_via_geometry_datatypes_per_mask, &LEFDEFReaderOptions::set_via_geometry_datatype, &LEFDEFReaderOptions::set_via_geometry_datatype_per_mask, s); +} + +std::string +LEFDEFReaderOptions::via_geometry_datatype_str () const +{ + return get_datatypes (this, &LEFDEFReaderOptions::via_geometry_datatype, &LEFDEFReaderOptions::via_geometry_datatype_per_mask, max_mask_number ()); +} + +void +LEFDEFReaderOptions::set_pins_suffix_str (const std::string &s) +{ + set_suffixes (this, &LEFDEFReaderOptions::clear_pins_suffixes_per_mask, &LEFDEFReaderOptions::set_pins_suffix, &LEFDEFReaderOptions::set_pins_suffix_per_mask, s); +} + +std::string +LEFDEFReaderOptions::pins_suffix_str () const +{ + return get_suffixes (this, &LEFDEFReaderOptions::pins_suffix, &LEFDEFReaderOptions::pins_suffix_per_mask, max_mask_number ()); +} + +void +LEFDEFReaderOptions::set_pins_datatype_str (const std::string &s) +{ + set_datatypes (this, &LEFDEFReaderOptions::clear_pins_datatypes_per_mask, &LEFDEFReaderOptions::set_pins_datatype, &LEFDEFReaderOptions::set_pins_datatype_per_mask, s); +} + +std::string +LEFDEFReaderOptions::pins_datatype_str () const +{ + return get_datatypes (this, &LEFDEFReaderOptions::pins_datatype, &LEFDEFReaderOptions::pins_datatype_per_mask, max_mask_number ()); +} + +void +LEFDEFReaderOptions::set_lef_pins_suffix_str (const std::string &s) +{ + set_suffixes (this, &LEFDEFReaderOptions::clear_lef_pins_suffixes_per_mask, &LEFDEFReaderOptions::set_lef_pins_suffix, &LEFDEFReaderOptions::set_lef_pins_suffix_per_mask, s); +} + +std::string +LEFDEFReaderOptions::lef_pins_suffix_str () const +{ + return get_suffixes (this, &LEFDEFReaderOptions::lef_pins_suffix, &LEFDEFReaderOptions::lef_pins_suffix_per_mask, max_mask_number ()); +} + +void +LEFDEFReaderOptions::set_lef_pins_datatype_str (const std::string &s) +{ + set_datatypes (this, &LEFDEFReaderOptions::clear_lef_pins_datatypes_per_mask, &LEFDEFReaderOptions::set_lef_pins_datatype, &LEFDEFReaderOptions::set_lef_pins_datatype_per_mask, s); +} + +std::string +LEFDEFReaderOptions::lef_pins_datatype_str () const +{ + return get_datatypes (this, &LEFDEFReaderOptions::lef_pins_datatype, &LEFDEFReaderOptions::lef_pins_datatype_per_mask, max_mask_number ()); +} + +void +LEFDEFReaderOptions::set_routing_suffix_str (const std::string &s) +{ + set_suffixes (this, &LEFDEFReaderOptions::clear_routing_suffixes_per_mask, &LEFDEFReaderOptions::set_routing_suffix, &LEFDEFReaderOptions::set_routing_suffix_per_mask, s); +} + +std::string +LEFDEFReaderOptions::routing_suffix_str () const +{ + return get_suffixes (this, &LEFDEFReaderOptions::routing_suffix, &LEFDEFReaderOptions::routing_suffix_per_mask, max_mask_number ()); +} + +void +LEFDEFReaderOptions::set_routing_datatype_str (const std::string &s) +{ + set_datatypes (this, &LEFDEFReaderOptions::clear_routing_datatypes_per_mask, &LEFDEFReaderOptions::set_routing_datatype, &LEFDEFReaderOptions::set_routing_datatype_per_mask, s); +} + +std::string +LEFDEFReaderOptions::routing_datatype_str () const +{ + return get_datatypes (this, &LEFDEFReaderOptions::routing_datatype, &LEFDEFReaderOptions::routing_datatype_per_mask, max_mask_number ()); +} + +void +LEFDEFReaderOptions::set_special_routing_suffix_str (const std::string &s) +{ + set_suffixes (this, &LEFDEFReaderOptions::clear_special_routing_suffixes_per_mask, &LEFDEFReaderOptions::set_special_routing_suffix, &LEFDEFReaderOptions::set_special_routing_suffix_per_mask, s); +} + +std::string +LEFDEFReaderOptions::special_routing_suffix_str () const +{ + return get_suffixes (this, &LEFDEFReaderOptions::special_routing_suffix, &LEFDEFReaderOptions::special_routing_suffix_per_mask, max_mask_number ()); +} + +void +LEFDEFReaderOptions::set_special_routing_datatype_str (const std::string &s) +{ + set_datatypes (this, &LEFDEFReaderOptions::clear_special_routing_datatypes_per_mask, &LEFDEFReaderOptions::set_special_routing_datatype, &LEFDEFReaderOptions::set_special_routing_datatype_per_mask, s); +} + +std::string +LEFDEFReaderOptions::special_routing_datatype_str () const +{ + return get_datatypes (this, &LEFDEFReaderOptions::special_routing_datatype, &LEFDEFReaderOptions::special_routing_datatype_per_mask, max_mask_number ()); +} + // ----------------------------------------------------------------------------------- // LEFDEFLayerDelegate implementation diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h index ddeb8e036..633e4e7ef 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h @@ -61,6 +61,34 @@ public: { } }; +template +const Value &per_mask_value (const std::map &map, const Value &def, unsigned int mask) +{ + typename std::map::const_iterator i = map.find (mask); + return i == map.end () ? def : i->second; +} + +inline bool per_mask_value_is_null (int dt) { return dt < 0; } +inline bool per_mask_value_is_null (const std::string &pfx) { return pfx.empty (); } + +template +void set_per_mask_value (std::map &map, unsigned int mask, const Value &value) +{ + if (per_mask_value_is_null (value)) { + map.erase (mask); + } else { + map [mask] = value; + } +} + +template +void get_max_mask_number (unsigned int &mm, const std::map &map) +{ + if (! map.empty ()) { + mm = std::max (mm, (--map.end ())->first); + } +} + /** * @brief The LEF/DEF importer technology component * @@ -262,6 +290,42 @@ public: m_via_geometry_datatype = s; } + void set_via_geometry_suffix_str (const std::string &s); + std::string via_geometry_suffix_str () const; + + void set_via_geometry_datatype_str (const std::string &s); + std::string via_geometry_datatype_str () const; + + void clear_via_geometry_suffixes_per_mask () + { + m_via_geometry_suffixes.clear (); + } + + void clear_via_geometry_datatypes_per_mask () + { + m_via_geometry_datatypes.clear (); + } + + const std::string &via_geometry_suffix_per_mask (unsigned int mask) const + { + return per_mask_value (m_via_geometry_suffixes, m_via_geometry_suffix, mask); + } + + void set_via_geometry_suffix_per_mask (unsigned int mask, const std::string &s) + { + set_per_mask_value (m_via_geometry_suffixes, mask, s); + } + + int via_geometry_datatype_per_mask (unsigned int mask) const + { + return per_mask_value (m_via_geometry_datatypes, m_via_geometry_datatype, mask); + } + + void set_via_geometry_datatype_per_mask (unsigned int mask, int s) + { + set_per_mask_value (m_via_geometry_datatypes, mask, s); + } + const std::string &via_cellname_prefix () const { return m_via_cellname_prefix; @@ -302,6 +366,42 @@ public: m_pins_datatype = s; } + void set_pins_suffix_str (const std::string &s); + std::string pins_suffix_str () const; + + void set_pins_datatype_str (const std::string &s); + std::string pins_datatype_str () const; + + void clear_pins_suffixes_per_mask () + { + m_pins_suffixes.clear (); + } + + void clear_pins_datatypes_per_mask () + { + m_pins_datatypes.clear (); + } + + const std::string &pins_suffix_per_mask (unsigned int mask) const + { + return per_mask_value (m_pins_suffixes, m_pins_suffix, mask); + } + + void set_pins_suffix_per_mask (unsigned int mask, const std::string &s) + { + set_per_mask_value (m_pins_suffixes, mask, s); + } + + int pins_datatype_per_mask (unsigned int mask) const + { + return per_mask_value (m_pins_datatypes, m_pins_datatype, mask); + } + + void set_pins_datatype_per_mask (unsigned int mask, int s) + { + set_per_mask_value (m_pins_datatypes, mask, s); + } + bool produce_lef_pins () const { return m_produce_lef_pins; @@ -332,6 +432,42 @@ public: m_lef_pins_datatype = s; } + void set_lef_pins_suffix_str (const std::string &s); + std::string lef_pins_suffix_str () const; + + void set_lef_pins_datatype_str (const std::string &s); + std::string lef_pins_datatype_str () const; + + void clear_lef_pins_suffixes_per_mask () + { + m_lef_pins_suffixes.clear (); + } + + void clear_lef_pins_datatypes_per_mask () + { + m_lef_pins_datatypes.clear (); + } + + const std::string &lef_pins_suffix_per_mask (unsigned int mask) const + { + return per_mask_value (m_lef_pins_suffixes, m_lef_pins_suffix, mask); + } + + void set_lef_pins_suffix_per_mask (unsigned int mask, const std::string &s) + { + set_per_mask_value (m_lef_pins_suffixes, mask, s); + } + + int lef_pins_datatype_per_mask (unsigned int mask) const + { + return per_mask_value (m_lef_pins_datatypes, m_lef_pins_datatype, mask); + } + + void set_lef_pins_datatype_per_mask (unsigned int mask, int s) + { + set_per_mask_value (m_lef_pins_datatypes, mask, s); + } + bool produce_obstructions () const { return m_produce_obstructions; @@ -452,6 +588,42 @@ public: m_routing_datatype = s; } + void set_routing_suffix_str (const std::string &s); + std::string routing_suffix_str () const; + + void set_routing_datatype_str (const std::string &s); + std::string routing_datatype_str () const; + + void clear_routing_suffixes_per_mask () + { + m_routing_suffixes.clear (); + } + + void clear_routing_datatypes_per_mask () + { + m_routing_datatypes.clear (); + } + + const std::string &routing_suffix_per_mask (unsigned int mask) const + { + return per_mask_value (m_routing_suffixes, m_routing_suffix, mask); + } + + void set_routing_suffix_per_mask (unsigned int mask, const std::string &s) + { + set_per_mask_value (m_routing_suffixes, mask, s); + } + + int routing_datatype_per_mask (unsigned int mask) const + { + return per_mask_value (m_routing_datatypes, m_routing_datatype, mask); + } + + void set_routing_datatype_per_mask (unsigned int mask, int s) + { + set_per_mask_value (m_routing_datatypes, mask, s); + } + bool produce_special_routing () const { return m_produce_special_routing; @@ -482,6 +654,58 @@ public: m_special_routing_datatype = s; } + void set_special_routing_suffix_str (const std::string &s); + std::string special_routing_suffix_str () const; + + void set_special_routing_datatype_str (const std::string &s); + std::string special_routing_datatype_str () const; + + void clear_special_routing_suffixes_per_mask () + { + m_special_routing_suffixes.clear (); + } + + void clear_special_routing_datatypes_per_mask () + { + m_special_routing_datatypes.clear (); + } + + const std::string &special_routing_suffix_per_mask (unsigned int mask) const + { + return per_mask_value (m_special_routing_suffixes, m_special_routing_suffix, mask); + } + + void set_special_routing_suffix_per_mask (unsigned int mask, const std::string &s) + { + set_per_mask_value (m_special_routing_suffixes, mask, s); + } + + int special_routing_datatype_per_mask (unsigned int mask) const + { + return per_mask_value (m_special_routing_datatypes, m_special_routing_datatype, mask); + } + + void set_special_routing_datatype_per_mask (unsigned int mask, int s) + { + set_per_mask_value (m_special_routing_datatypes, mask, s); + } + + unsigned int max_mask_number () const + { + unsigned int mm = 0; + get_max_mask_number (mm, m_via_geometry_suffixes); + get_max_mask_number (mm, m_via_geometry_datatypes); + get_max_mask_number (mm, m_pins_suffixes); + get_max_mask_number (mm, m_pins_datatypes); + get_max_mask_number (mm, m_lef_pins_suffixes); + get_max_mask_number (mm, m_lef_pins_datatypes); + get_max_mask_number (mm, m_routing_suffixes); + get_max_mask_number (mm, m_routing_datatypes); + get_max_mask_number (mm, m_special_routing_suffixes); + get_max_mask_number (mm, m_special_routing_datatypes); + return mm; + } + void clear_lef_files () { m_lef_files.clear (); @@ -568,13 +792,19 @@ private: bool m_produce_via_geometry; std::string m_via_geometry_suffix; int m_via_geometry_datatype; + std::map m_via_geometry_suffixes; + std::map m_via_geometry_datatypes; std::string m_via_cellname_prefix; bool m_produce_pins; std::string m_pins_suffix; int m_pins_datatype; + std::map m_pins_suffixes; + std::map m_pins_datatypes; bool m_produce_lef_pins; std::string m_lef_pins_suffix; int m_lef_pins_datatype; + std::map m_lef_pins_suffixes; + std::map m_lef_pins_datatypes; bool m_produce_obstructions; std::string m_obstructions_suffix; int m_obstructions_datatype; @@ -587,9 +817,13 @@ private: bool m_produce_routing; std::string m_routing_suffix; int m_routing_datatype; + std::map m_routing_suffixes; + std::map m_routing_datatypes; bool m_produce_special_routing; std::string m_special_routing_suffix; int m_special_routing_datatype; + std::map m_special_routing_suffixes; + std::map m_special_routing_datatypes; bool m_separate_groups; std::string m_map_file; unsigned int m_macro_resolution_mode; diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc index e69af924e..8aa4d7ae8 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc @@ -278,14 +278,26 @@ class LEFDEFFormatDeclaration tl::make_member (&LEFDEFReaderOptions::produce_regions, &LEFDEFReaderOptions::set_produce_regions, "produce-regions") + tl::make_member (&LEFDEFReaderOptions::region_layer, &LEFDEFReaderOptions::set_region_layer, "region-layer") + tl::make_member (&LEFDEFReaderOptions::produce_via_geometry, &LEFDEFReaderOptions::set_produce_via_geometry, "produce-via-geometry") + - tl::make_member (&LEFDEFReaderOptions::via_geometry_suffix, &LEFDEFReaderOptions::set_via_geometry_suffix, "via-geometry-suffix") + - tl::make_member (&LEFDEFReaderOptions::via_geometry_datatype, &LEFDEFReaderOptions::set_via_geometry_datatype, "via-geometry-datatype") + + // for backward compatibility + tl::make_member (&LEFDEFReaderOptions::set_via_geometry_suffix, "special-via_geometry-suffix") + + tl::make_member (&LEFDEFReaderOptions::set_via_geometry_datatype, "special-via_geometry-datatype") + + // new: + tl::make_member (&LEFDEFReaderOptions::via_geometry_suffix_str, &LEFDEFReaderOptions::set_via_geometry_suffix_str, "special-via_geometry-suffix-string") + + tl::make_member (&LEFDEFReaderOptions::via_geometry_datatype_str, &LEFDEFReaderOptions::set_via_geometry_datatype_str, "special-via_geometry-datatype-string") + tl::make_member (&LEFDEFReaderOptions::produce_pins, &LEFDEFReaderOptions::set_produce_pins, "produce-pins") + - tl::make_member (&LEFDEFReaderOptions::pins_suffix, &LEFDEFReaderOptions::set_pins_suffix, "pins-suffix") + - tl::make_member (&LEFDEFReaderOptions::pins_datatype, &LEFDEFReaderOptions::set_pins_datatype, "pins-datatype") + + // for backward compatibility + tl::make_member (&LEFDEFReaderOptions::set_pins_suffix, "special-pins-suffix") + + tl::make_member (&LEFDEFReaderOptions::set_pins_datatype, "special-pins-datatype") + + // new: + tl::make_member (&LEFDEFReaderOptions::pins_suffix_str, &LEFDEFReaderOptions::set_pins_suffix_str, "special-pins-suffix-string") + + tl::make_member (&LEFDEFReaderOptions::pins_datatype_str, &LEFDEFReaderOptions::set_pins_datatype_str, "special-pins-datatype-string") + tl::make_member (&LEFDEFReaderOptions::produce_lef_pins, &LEFDEFReaderOptions::set_produce_lef_pins, "produce-lef-pins") + - tl::make_member (&LEFDEFReaderOptions::lef_pins_suffix, &LEFDEFReaderOptions::set_lef_pins_suffix, "lef-pins-suffix") + - tl::make_member (&LEFDEFReaderOptions::lef_pins_datatype, &LEFDEFReaderOptions::set_lef_pins_datatype, "lef-pins-datatype") + + // for backward compatibility + tl::make_member (&LEFDEFReaderOptions::set_lef_pins_suffix, "special-lef_pins-suffix") + + tl::make_member (&LEFDEFReaderOptions::set_lef_pins_datatype, "special-lef_pins-datatype") + + // new: + tl::make_member (&LEFDEFReaderOptions::lef_pins_suffix_str, &LEFDEFReaderOptions::set_lef_pins_suffix_str, "special-lef_pins-suffix-string") + + tl::make_member (&LEFDEFReaderOptions::lef_pins_datatype_str, &LEFDEFReaderOptions::set_lef_pins_datatype_str, "special-lef_pins-datatype-string") + tl::make_member (&LEFDEFReaderOptions::produce_obstructions, &LEFDEFReaderOptions::set_produce_obstructions, "produce-obstructions") + tl::make_member (&LEFDEFReaderOptions::obstructions_suffix, &LEFDEFReaderOptions::set_obstructions_suffix, "obstructions-suffix") + tl::make_member (&LEFDEFReaderOptions::obstructions_datatype, &LEFDEFReaderOptions::set_obstructions_datatype, "obstructions-datatype") + @@ -296,11 +308,19 @@ class LEFDEFFormatDeclaration tl::make_member (&LEFDEFReaderOptions::labels_suffix, &LEFDEFReaderOptions::set_labels_suffix, "labels-suffix") + tl::make_member (&LEFDEFReaderOptions::labels_datatype, &LEFDEFReaderOptions::set_labels_datatype, "labels-datatype") + tl::make_member (&LEFDEFReaderOptions::produce_routing, &LEFDEFReaderOptions::set_produce_routing, "produce-routing") + - tl::make_member (&LEFDEFReaderOptions::routing_suffix, &LEFDEFReaderOptions::set_routing_suffix, "routing-suffix") + - tl::make_member (&LEFDEFReaderOptions::routing_datatype, &LEFDEFReaderOptions::set_routing_datatype, "routing-datatype") + + // for backward compatibility + tl::make_member (&LEFDEFReaderOptions::set_routing_suffix, "special-routing-suffix") + + tl::make_member (&LEFDEFReaderOptions::set_routing_datatype, "special-routing-datatype") + + // new: + tl::make_member (&LEFDEFReaderOptions::routing_suffix_str, &LEFDEFReaderOptions::set_routing_suffix_str, "special-routing-suffix-string") + + tl::make_member (&LEFDEFReaderOptions::routing_datatype_str, &LEFDEFReaderOptions::set_routing_datatype_str, "special-routing-datatype-string") + tl::make_member (&LEFDEFReaderOptions::produce_special_routing, &LEFDEFReaderOptions::set_produce_special_routing, "produce-special-routing") + - tl::make_member (&LEFDEFReaderOptions::special_routing_suffix, &LEFDEFReaderOptions::set_special_routing_suffix, "special-routing-suffix") + - tl::make_member (&LEFDEFReaderOptions::special_routing_datatype, &LEFDEFReaderOptions::set_special_routing_datatype, "special-routing-datatype") + + // for backward compatibility + tl::make_member (&LEFDEFReaderOptions::set_special_routing_suffix, "special-routing-suffix") + + tl::make_member (&LEFDEFReaderOptions::set_special_routing_datatype, "special-routing-datatype") + + // new: + tl::make_member (&LEFDEFReaderOptions::special_routing_suffix_str, &LEFDEFReaderOptions::set_special_routing_suffix_str, "special-routing-suffix-string") + + tl::make_member (&LEFDEFReaderOptions::special_routing_datatype_str, &LEFDEFReaderOptions::set_special_routing_datatype_str, "special-routing-datatype-string") + tl::make_member (&LEFDEFReaderOptions::begin_lef_files, &LEFDEFReaderOptions::end_lef_files, &LEFDEFReaderOptions::push_lef_file, "lef-files") + tl::make_member (&LEFDEFReaderOptions::macro_resolution_mode, &LEFDEFReaderOptions::set_macro_resolution_mode, "macro-resolution-mode", MacroResolutionModeConverter ()) + tl::make_member (&LEFDEFReaderOptions::separate_groups, &LEFDEFReaderOptions::set_separate_groups, "separate-groups") + diff --git a/src/plugins/streamers/lefdef/db_plugin/gsiDeclDbLEFDEF.cc b/src/plugins/streamers/lefdef/db_plugin/gsiDeclDbLEFDEF.cc index 8c4fc324b..fe963515c 100644 --- a/src/plugins/streamers/lefdef/db_plugin/gsiDeclDbLEFDEF.cc +++ b/src/plugins/streamers/lefdef/db_plugin/gsiDeclDbLEFDEF.cc @@ -260,6 +260,46 @@ gsi::Class decl_lefdef_config ("db", "LEFDEFReaderConfi "@brief Sets the via geometry layer datatype value.\n" "See \\produce_via_geometry for details about this property.\n" ) + + gsi::method ("clear_via_geometry_suffixes_per_mask", &db::LEFDEFReaderOptions::clear_via_geometry_suffixes_per_mask, + "@brief Clears the via geometry layer name suffix per mask.\n" + "See \\produce_via_geometry for details about this property.\n" + "\n\n" + "Mask specific rules have been introduced in version 0.27." + ) + + gsi::method ("clear_via_geometry_datatypes_per_mask", &db::LEFDEFReaderOptions::clear_via_geometry_datatypes_per_mask, + "@brief Clears the via geometry layer datatypes per mask.\n" + "See \\produce_via_geometry for details about this property.\n" + "\n\n" + "Mask specific rules have been introduced in version 0.27." + ) + + gsi::method ("via_geometry_suffix_per_mask", &db::LEFDEFReaderOptions::via_geometry_suffix_per_mask, gsi::arg ("mask"), + "@brief Gets the via geometry layer name suffix per mask.\n" + "See \\produce_via_geometry for details about this property.\n" + "The mask number is a zero-based mask index (0: MASK 1, 1: MASK 2 ...)." + "\n\n" + "Mask specific rules have been introduced in version 0.27." + ) + + gsi::method ("set_via_geometry_suffix_per_mask", &db::LEFDEFReaderOptions::set_via_geometry_suffix_per_mask, gsi::arg ("mask"), gsi::arg ("suffix"), + "@brief Sets the via geometry layer name suffix per mask.\n" + "See \\produce_via_geometry for details about this property.\n" + "The mask number is a zero-based mask index (0: MASK 1, 1: MASK 2 ...)." + "\n\n" + "Mask specific rules have been introduced in version 0.27." + ) + + gsi::method ("via_geometry_datatype", &db::LEFDEFReaderOptions::via_geometry_datatype_per_mask, + "@brief Gets the via geometry layer datatype value per mask.\n" + "See \\produce_via_geometry for details about this property.\n" + "The mask number is a zero-based mask index (0: MASK 1, 1: MASK 2 ...)." + "\n\n" + "Mask specific rules have been introduced in version 0.27." + ) + + gsi::method ("set_via_geometry_datatype_per_mask", &db::LEFDEFReaderOptions::set_via_geometry_datatype_per_mask, gsi::arg ("mask"), gsi::arg ("datatype"), + "@brief Sets the via geometry layer datatype value.\n" + "See \\produce_via_geometry for details about this property.\n" + "The mask number is a zero-based mask index (0: MASK 1, 1: MASK 2 ...)." + "\n\n" + "Mask specific rules have been introduced in version 0.27." + ) + gsi::method ("via_cellname_prefix", &db::LEFDEFReaderOptions::via_cellname_prefix, "@brief Gets the via cellname prefix.\n" "Vias are represented by cells. The cell name is formed by combining the via cell name prefix and the via name.\n" @@ -296,6 +336,46 @@ gsi::Class decl_lefdef_config ("db", "LEFDEFReaderConfi "@brief Sets the pin geometry layer datatype value.\n" "See \\produce_via_geometry for details about the layer production rules." ) + + gsi::method ("clear_pins_suffixes_per_mask", &db::LEFDEFReaderOptions::clear_pins_suffixes_per_mask, + "@brief Clears the pin layer name suffix per mask.\n" + "See \\produce_via_geometry for details about this property.\n" + "\n\n" + "Mask specific rules have been introduced in version 0.27." + ) + + gsi::method ("clear_pin_datatypes_per_mask", &db::LEFDEFReaderOptions::clear_pins_datatypes_per_mask, + "@brief Clears the pin layer datatypes per mask.\n" + "See \\produce_via_geometry for details about this property.\n" + "\n\n" + "Mask specific rules have been introduced in version 0.27." + ) + + gsi::method ("pins_suffix_per_mask", &db::LEFDEFReaderOptions::pins_suffix_per_mask, gsi::arg ("mask"), + "@brief Gets the pin geometry layer name suffix per mask.\n" + "See \\produce_via_geometry for details about the layer production rules." + "The mask number is a zero-based mask index (0: MASK 1, 1: MASK 2 ...)." + "\n\n" + "Mask specific rules have been introduced in version 0.27." + ) + + gsi::method ("set_pins_suffix_per_mask", &db::LEFDEFReaderOptions::set_pins_suffix_per_mask, gsi::arg ("mask"), gsi::arg ("suffix"), + "@brief Sets the pin geometry layer name suffix per mask.\n" + "See \\produce_via_geometry for details about the layer production rules." + "The mask number is a zero-based mask index (0: MASK 1, 1: MASK 2 ...)." + "\n\n" + "Mask specific rules have been introduced in version 0.27." + ) + + gsi::method ("pins_datatype", &db::LEFDEFReaderOptions::pins_datatype_per_mask, + "@brief Gets the pin geometry layer datatype value per mask.\n" + "See \\produce_via_geometry for details about the layer production rules." + "The mask number is a zero-based mask index (0: MASK 1, 1: MASK 2 ...)." + "\n\n" + "Mask specific rules have been introduced in version 0.27." + ) + + gsi::method ("set_pins_datatype_per_mask", &db::LEFDEFReaderOptions::set_pins_datatype_per_mask, gsi::arg ("mask"), gsi::arg ("datatype"), + "@brief Sets the pin geometry layer datatype value.\n" + "See \\produce_via_geometry for details about the layer production rules." + "The mask number is a zero-based mask index (0: MASK 1, 1: MASK 2 ...)." + "\n\n" + "Mask specific rules have been introduced in version 0.27." + ) + gsi::method ("produce_lef_pins", &db::LEFDEFReaderOptions::produce_lef_pins, "@brief Gets a value indicating whether LEF pin geometries shall be produced.\n" "See \\produce_via_geometry for details about the layer production rules." @@ -320,6 +400,46 @@ gsi::Class decl_lefdef_config ("db", "LEFDEFReaderConfi "@brief Sets the LEF pin geometry layer datatype value.\n" "See \\produce_via_geometry for details about the layer production rules." ) + + gsi::method ("clear_lef_pins_suffixes_per_mask", &db::LEFDEFReaderOptions::clear_lef_pins_suffixes_per_mask, + "@brief Clears the LEF pin layer name suffix per mask.\n" + "See \\produce_via_geometry for details about this property.\n" + "\n\n" + "Mask specific rules have been introduced in version 0.27." + ) + + gsi::method ("clear_lef_pins_datatypes_per_mask", &db::LEFDEFReaderOptions::clear_lef_pins_datatypes_per_mask, + "@brief Clears the LEF pin layer datatypes per mask.\n" + "See \\produce_via_geometry for details about this property.\n" + "\n\n" + "Mask specific rules have been introduced in version 0.27." + ) + + gsi::method ("lef_pins_suffix_per_mask", &db::LEFDEFReaderOptions::lef_pins_suffix_per_mask, gsi::arg ("mask"), + "@brief Gets the LEF pin geometry layer name suffix per mask.\n" + "See \\produce_via_geometry for details about the layer production rules." + "The mask number is a zero-based mask index (0: MASK 1, 1: MASK 2 ...)." + "\n\n" + "Mask specific rules have been introduced in version 0.27." + ) + + gsi::method ("set_lef_pins_suffix_per_mask", &db::LEFDEFReaderOptions::set_lef_pins_suffix_per_mask, gsi::arg ("mask"), gsi::arg ("suffix"), + "@brief Sets the LEF pin geometry layer name suffix per mask.\n" + "See \\produce_via_geometry for details about the layer production rules." + "The mask number is a zero-based mask index (0: MASK 1, 1: MASK 2 ...)." + "\n\n" + "Mask specific rules have been introduced in version 0.27." + ) + + gsi::method ("lef_pins_datatype", &db::LEFDEFReaderOptions::lef_pins_datatype_per_mask, + "@brief Gets the LEF pin geometry layer datatype value per mask.\n" + "See \\produce_via_geometry for details about the layer production rules." + "The mask number is a zero-based mask index (0: MASK 1, 1: MASK 2 ...)." + "\n\n" + "Mask specific rules have been introduced in version 0.27." + ) + + gsi::method ("set_lef_pins_datatype_per_mask", &db::LEFDEFReaderOptions::set_lef_pins_datatype_per_mask, gsi::arg ("mask"), gsi::arg ("datatype"), + "@brief Sets the LEF pin geometry layer datatype value.\n" + "See \\produce_via_geometry for details about the layer production rules." + "The mask number is a zero-based mask index (0: MASK 1, 1: MASK 2 ...)." + "\n\n" + "Mask specific rules have been introduced in version 0.27." + ) + gsi::method ("produce_obstructions", &db::LEFDEFReaderOptions::produce_obstructions, "@brief Gets a value indicating whether obstruction markers shall be produced.\n" "See \\produce_via_geometry for details about the layer production rules." @@ -416,6 +536,46 @@ gsi::Class decl_lefdef_config ("db", "LEFDEFReaderConfi "@brief Sets the routing layer datatype value.\n" "See \\produce_via_geometry for details about the layer production rules." ) + + gsi::method ("clear_routing_suffixes_per_mask", &db::LEFDEFReaderOptions::clear_routing_suffixes_per_mask, + "@brief Clears the routing layer name suffix per mask.\n" + "See \\produce_via_geometry for details about this property.\n" + "\n\n" + "Mask specific rules have been introduced in version 0.27." + ) + + gsi::method ("clear_routing_datatypes_per_mask", &db::LEFDEFReaderOptions::clear_routing_datatypes_per_mask, + "@brief Clears the routing layer datatypes per mask.\n" + "See \\produce_via_geometry for details about this property.\n" + "\n\n" + "Mask specific rules have been introduced in version 0.27." + ) + + gsi::method ("routing_suffix_per_mask", &db::LEFDEFReaderOptions::routing_suffix_per_mask, gsi::arg ("mask"), + "@brief Gets the routing geometry layer name suffix per mask.\n" + "See \\produce_via_geometry for details about the layer production rules." + "The mask number is a zero-based mask index (0: MASK 1, 1: MASK 2 ...)." + "\n\n" + "Mask specific rules have been introduced in version 0.27." + ) + + gsi::method ("set_routing_suffix_per_mask", &db::LEFDEFReaderOptions::set_routing_suffix_per_mask, gsi::arg ("mask"), gsi::arg ("suffix"), + "@brief Sets the routing geometry layer name suffix per mask.\n" + "See \\produce_via_geometry for details about the layer production rules." + "The mask number is a zero-based mask index (0: MASK 1, 1: MASK 2 ...)." + "\n\n" + "Mask specific rules have been introduced in version 0.27." + ) + + gsi::method ("routing_datatype", &db::LEFDEFReaderOptions::routing_datatype_per_mask, + "@brief Gets the routing geometry layer datatype value per mask.\n" + "See \\produce_via_geometry for details about the layer production rules." + "The mask number is a zero-based mask index (0: MASK 1, 1: MASK 2 ...)." + "\n\n" + "Mask specific rules have been introduced in version 0.27." + ) + + gsi::method ("set_routing_datatype_per_mask", &db::LEFDEFReaderOptions::set_routing_datatype_per_mask, gsi::arg ("mask"), gsi::arg ("datatype"), + "@brief Sets the routing geometry layer datatype value.\n" + "See \\produce_via_geometry for details about the layer production rules." + "The mask number is a zero-based mask index (0: MASK 1, 1: MASK 2 ...)." + "\n\n" + "Mask specific rules have been introduced in version 0.27." + ) + gsi::method ("produce_special_routing", &db::LEFDEFReaderOptions::produce_special_routing, "@brief Gets a value indicating whether special routing geometry shall be produced.\n" "See \\produce_via_geometry for details about the layer production rules.\n" @@ -452,6 +612,46 @@ gsi::Class decl_lefdef_config ("db", "LEFDEFReaderConfi "\n" "The differentiation between special and normal routing has been introduced in version 0.27." ) + + gsi::method ("clear_special_routing_suffixes_per_mask", &db::LEFDEFReaderOptions::clear_special_routing_suffixes_per_mask, + "@brief Clears the special routing layer name suffix per mask.\n" + "See \\produce_via_geometry for details about this property.\n" + "\n\n" + "Mask specific rules have been introduced in version 0.27." + ) + + gsi::method ("clear_special_routing_datatypes_per_mask", &db::LEFDEFReaderOptions::clear_special_routing_datatypes_per_mask, + "@brief Clears the special routing layer datatypes per mask.\n" + "See \\produce_via_geometry for details about this property.\n" + "\n\n" + "Mask specific rules have been introduced in version 0.27." + ) + + gsi::method ("special_routing_suffix_per_mask", &db::LEFDEFReaderOptions::special_routing_suffix_per_mask, gsi::arg ("mask"), + "@brief Gets the special routing geometry layer name suffix per mask.\n" + "See \\produce_via_geometry for details about the layer production rules." + "The mask number is a zero-based mask index (0: MASK 1, 1: MASK 2 ...)." + "\n\n" + "Mask specific rules have been introduced in version 0.27." + ) + + gsi::method ("set_special_routing_suffix_per_mask", &db::LEFDEFReaderOptions::set_special_routing_suffix_per_mask, gsi::arg ("mask"), gsi::arg ("suffix"), + "@brief Sets the special routing geometry layer name suffix per mask.\n" + "See \\produce_via_geometry for details about the layer production rules." + "The mask number is a zero-based mask index (0: MASK 1, 1: MASK 2 ...)." + "\n\n" + "Mask specific rules have been introduced in version 0.27." + ) + + gsi::method ("special_routing_datatype", &db::LEFDEFReaderOptions::special_routing_datatype_per_mask, + "@brief Gets the special routing geometry layer datatype value per mask.\n" + "See \\produce_via_geometry for details about the layer production rules." + "The mask number is a zero-based mask index (0: MASK 1, 1: MASK 2 ...)." + "\n\n" + "Mask specific rules have been introduced in version 0.27." + ) + + gsi::method ("set_special_routing_datatype_per_mask", &db::LEFDEFReaderOptions::set_special_routing_datatype_per_mask, gsi::arg ("mask"), gsi::arg ("datatype"), + "@brief Sets the special routing geometry layer datatype value.\n" + "See \\produce_via_geometry for details about the layer production rules." + "The mask number is a zero-based mask index (0: MASK 1, 1: MASK 2 ...)." + "\n\n" + "Mask specific rules have been introduced in version 0.27." + ) + gsi::method ("separate_groups", &db::LEFDEFReaderOptions::separate_groups, "@brief Gets a value indicating whether to create separate parent cells for individual groups.\n" "If this property is set to true, instances belonging to different groups are separated by putting them into " diff --git a/src/plugins/streamers/lefdef/lay_plugin/LEFDEFTechnologyComponentEditor.ui b/src/plugins/streamers/lefdef/lay_plugin/LEFDEFTechnologyComponentEditor.ui index 7ddb0871a..bd6cf1950 100644 --- a/src/plugins/streamers/lefdef/lay_plugin/LEFDEFTechnologyComponentEditor.ui +++ b/src/plugins/streamers/lefdef/lay_plugin/LEFDEFTechnologyComponentEditor.ui @@ -370,13 +370,26 @@ + + + 0 + 0 + + As properties with name ... - + + + + 0 + 0 + + + @@ -386,7 +399,14 @@ - + + + + 0 + 0 + + + @@ -399,10 +419,23 @@ - + + + + 0 + 0 + + + + + + 0 + 0 + + <html><body>(<a href="int:/about/variant_notation.xml">See here for the name notation</a>)</body></html> @@ -412,7 +445,14 @@ - + + + + 0 + 0 + + + @@ -425,7 +465,14 @@ - + + + + 0 + 0 + + + @@ -490,6 +537,12 @@ + + + 1 + 0 + + On layer with spec ... @@ -536,7 +589,14 @@ - + + + + 0 + 0 + + + @@ -589,6 +649,12 @@ + + + 0 + 0 + + <html><body>(<a href="int:/about/layer_specs.xml">See here for the layer specification</a>)</body></html> @@ -731,7 +797,7 @@ If used inside a technology, the file will be looked up relative to the technolo - Special routing + Special routing (*) @@ -846,7 +912,7 @@ If used inside a technology, the file will be looked up relative to the technolo - Routing + Routing (*) @@ -895,7 +961,7 @@ If used inside a technology, the file will be looked up relative to the technolo - Via geometry + Via geometry (*) @@ -909,7 +975,7 @@ If used inside a technology, the file will be looked up relative to the technolo - LEF Pins + LEF Pins (*) @@ -924,7 +990,7 @@ suffix ... - Pins + Pins (*) @@ -1068,6 +1134,17 @@ type ... + + + + (*) Separate suffixes or datatypes can be given for different masks, using the following notation: +"x,1:y,2:z ..." (which will use x by default, y for MASK 1, z for MASK 2 etc.) + + + true + + + @@ -1158,9 +1235,49 @@ type ... move_lef_files_up move_lef_files_down dbu + prefix_via_cellname + separate_groups + produce_lef_geo produce_net_names net_prop_name + produce_inst_names + inst_prop_name + produce_pin_names + pin_prop_name + produce_outlines + outline_layer + produce_placement_blockages + placement_blockage_layer + produce_regions + region_layer + layer_map_mode + produce_via_geometry + suffix_via_geometry + datatype_via_geometry + produce_pins + suffix_pins + datatype_pins + produce_lef_pins + suffix_lef_pins + datatype_lef_pins + produce_obstructions + suffix_obstructions + datatype_obstructions + produce_routing + suffix_routing + datatype_routing + produce_special_routing + suffix_special_routing + datatype_special_routing + produce_labels + suffix_labels + datatype_labels + produce_blockages + suffix_blockages + datatype_blockages read_all_cbx + mapfile_path + browse_mapfile diff --git a/src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImportDialogs.cc b/src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImportDialogs.cc index 868aca328..94697f9c4 100644 --- a/src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImportDialogs.cc +++ b/src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImportDialogs.cc @@ -369,7 +369,7 @@ LEFDEFReaderOptionsEditor::LEFDEFReaderOptionsEditor (QWidget *parent) lay::activate_help_links (help_label2); } -void +void LEFDEFReaderOptionsEditor::commit (db::FormatSpecificReaderOptions *options, const db::Technology * /*tech*/) { db::LEFDEFReaderOptions *data = dynamic_cast (options); @@ -427,15 +427,15 @@ LEFDEFReaderOptionsEditor::commit (db::FormatSpecificReaderOptions *options, con data->set_produce_placement_blockages (produce_placement_blockages->isChecked ()); data->set_placement_blockage_layer (tl::to_string (placement_blockage_layer->text ())); data->set_produce_via_geometry (produce_via_geometry->isChecked ()); - data->set_via_geometry_suffix (tl::to_string (suffix_via_geometry->text ())); - data->set_via_geometry_datatype (datatype_via_geometry->text ().toInt ()); + data->set_via_geometry_suffix_str (tl::to_string (suffix_via_geometry->text ())); + data->set_via_geometry_datatype_str (tl::to_string (datatype_via_geometry->text ())); data->set_via_cellname_prefix (tl::to_string (prefix_via_cellname->text ())); data->set_produce_pins (produce_pins->isChecked ()); - data->set_pins_suffix (tl::to_string (suffix_pins->text ())); - data->set_pins_datatype (datatype_pins->text ().toInt ()); + data->set_pins_suffix_str (tl::to_string (suffix_pins->text ())); + data->set_pins_datatype_str (tl::to_string (datatype_pins->text ())); data->set_produce_lef_pins (produce_lef_pins->isChecked ()); - data->set_lef_pins_suffix (tl::to_string (suffix_lef_pins->text ())); - data->set_lef_pins_datatype (datatype_lef_pins->text ().toInt ()); + data->set_lef_pins_suffix_str (tl::to_string (suffix_lef_pins->text ())); + data->set_lef_pins_datatype_str (tl::to_string (datatype_lef_pins->text ())); data->set_produce_obstructions (produce_obstructions->isChecked ()); data->set_obstructions_suffix (tl::to_string (suffix_obstructions->text ())); data->set_obstructions_datatype (datatype_obstructions->text ().toInt ()); @@ -443,11 +443,11 @@ LEFDEFReaderOptionsEditor::commit (db::FormatSpecificReaderOptions *options, con data->set_blockages_suffix (tl::to_string (suffix_blockages->text ())); data->set_blockages_datatype (datatype_blockages->text ().toInt ()); data->set_produce_routing (produce_routing->isChecked ()); - data->set_routing_suffix (tl::to_string (suffix_routing->text ())); - data->set_routing_datatype (datatype_routing->text ().toInt ()); + data->set_routing_suffix_str (tl::to_string (suffix_routing->text ())); + data->set_routing_datatype_str (tl::to_string (datatype_routing->text ())); data->set_produce_special_routing (produce_special_routing->isChecked ()); - data->set_special_routing_suffix (tl::to_string (suffix_special_routing->text ())); - data->set_special_routing_datatype (datatype_special_routing->text ().toInt ()); + data->set_special_routing_suffix_str (tl::to_string (suffix_special_routing->text ())); + data->set_special_routing_datatype_str (tl::to_string (datatype_special_routing->text ())); data->set_produce_labels (produce_labels->isChecked ()); data->set_labels_suffix (tl::to_string (suffix_labels->text ())); data->set_labels_datatype (datatype_labels->text ().toInt ()); @@ -489,15 +489,15 @@ LEFDEFReaderOptionsEditor::setup (const db::FormatSpecificReaderOptions *options produce_placement_blockages->setChecked (data->produce_placement_blockages ()); placement_blockage_layer->setText (tl::to_qstring (data->placement_blockage_layer ())); produce_via_geometry->setChecked (data->produce_via_geometry ()); - suffix_via_geometry->setText (tl::to_qstring (data->via_geometry_suffix ())); - datatype_via_geometry->setText (QString::number (data->via_geometry_datatype ())); + suffix_via_geometry->setText (tl::to_qstring (data->via_geometry_suffix_str ())); + datatype_via_geometry->setText (tl::to_qstring (data->via_geometry_datatype_str ())); prefix_via_cellname->setText (tl::to_qstring (data->via_cellname_prefix ())); produce_pins->setChecked (data->produce_pins ()); - suffix_pins->setText (tl::to_qstring (data->pins_suffix ())); - datatype_pins->setText (QString::number (data->pins_datatype ())); + suffix_pins->setText (tl::to_qstring (data->pins_suffix_str ())); + datatype_pins->setText (tl::to_qstring (data->pins_datatype_str ())); produce_lef_pins->setChecked (data->produce_lef_pins ()); - suffix_lef_pins->setText (tl::to_qstring (data->lef_pins_suffix ())); - datatype_lef_pins->setText (QString::number (data->lef_pins_datatype ())); + suffix_lef_pins->setText (tl::to_qstring (data->lef_pins_suffix_str ())); + datatype_lef_pins->setText (tl::to_qstring (data->lef_pins_datatype_str ())); produce_obstructions->setChecked (data->produce_obstructions ()); suffix_obstructions->setText (tl::to_qstring (data->obstructions_suffix ())); datatype_obstructions->setText (QString::number (data->obstructions_datatype ())); @@ -505,11 +505,11 @@ LEFDEFReaderOptionsEditor::setup (const db::FormatSpecificReaderOptions *options suffix_blockages->setText (tl::to_qstring (data->blockages_suffix ())); datatype_blockages->setText (QString::number (data->blockages_datatype ())); produce_routing->setChecked (data->produce_routing ()); - suffix_routing->setText (tl::to_qstring (data->routing_suffix ())); - datatype_routing->setText (QString::number (data->routing_datatype ())); + suffix_routing->setText (tl::to_qstring (data->routing_suffix_str ())); + datatype_routing->setText (tl::to_qstring (data->routing_datatype_str ())); produce_special_routing->setChecked (data->produce_special_routing ()); - suffix_special_routing->setText (tl::to_qstring (data->special_routing_suffix ())); - datatype_special_routing->setText (QString::number (data->special_routing_datatype ())); + suffix_special_routing->setText (tl::to_qstring (data->special_routing_suffix_str ())); + datatype_special_routing->setText (tl::to_qstring (data->special_routing_datatype_str ())); produce_labels->setChecked (data->produce_labels ()); suffix_labels->setText (tl::to_qstring (data->labels_suffix ())); datatype_labels->setText (QString::number (data->labels_datatype ())); diff --git a/src/tl/tl/tlXMLParser.h b/src/tl/tl/tlXMLParser.h index f4a252f4d..bb296251b 100644 --- a/src/tl/tl/tlXMLParser.h +++ b/src/tl/tl/tlXMLParser.h @@ -1822,12 +1822,12 @@ make_member (void (Parent::*setter) (const Value &), const std::string &name) * @brief Utility: create a XMLMember object */ template -XMLMember, XMLMemberDummyWriteAdaptor , XMLStdConverter > +XMLMember, XMLMemberAccWriteAdaptor , XMLStdConverter > make_member (void (Parent::*setter) (Value), const std::string &name) { - return XMLMember, XMLMemberDummyWriteAdaptor , XMLStdConverter > ( - XMLMemberAccReadAdaptor (setter), - XMLMemberDummyWriteAdaptor (), name); + return XMLMember, XMLMemberAccWriteAdaptor , XMLStdConverter > ( + XMLMemberDummyReadAdaptor (), + XMLMemberAccWriteAdaptor (setter), name); } /** From 0d52da77eeb4769cf7da170c186c4795224521e2 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sat, 18 Jul 2020 22:59:02 +0200 Subject: [PATCH 052/121] WIP: first version of reading with MASK --- .../lefdef/db_plugin/dbDEFImporter.cc | 41 ++++++------ .../lefdef/db_plugin/dbLEFDEFImporter.cc | 61 ++++++++++------- .../lefdef/db_plugin/dbLEFDEFImporter.h | 19 ++++-- .../lefdef/db_plugin/dbLEFImporter.cc | 67 ++++++++++++------- 4 files changed, 109 insertions(+), 79 deletions(-) diff --git a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc index cbbe2119b..51c4c3767 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc @@ -64,7 +64,6 @@ DEFImporter::read_lef (tl::InputStream &stream, db::Layout &layout, LEFDEFReader m_lef_importer.read (stream, layout, state); } - void DEFImporter::read_polygon (db::Polygon &poly, double scale) { @@ -152,7 +151,7 @@ DEFImporter::read_diearea (db::Layout &layout, db::Cell &design, double scale) if (points.size () >= 2) { // create outline shape - std::pair dl = open_layer (layout, std::string (), Outline); + std::pair dl = open_layer (layout, std::string (), Outline, 0); if (dl.first) { if (points.size () == 2) { design.shapes (dl.second).insert (db::Box (points [0], points [1])); @@ -300,7 +299,7 @@ DEFImporter::read_blockages (db::Layout &layout, db::Cell &design, double scale) db::Polygon p; read_polygon (p, scale); - std::pair dl = open_layer (layout, layer, layer.empty () ? PlacementBlockage : Blockage); + std::pair dl = open_layer (layout, layer, layer.empty () ? PlacementBlockage : Blockage, 0); if (dl.first) { design.shapes (dl.second).insert (p); } @@ -310,7 +309,7 @@ DEFImporter::read_blockages (db::Layout &layout, db::Cell &design, double scale) db::Polygon p; read_rect (p, scale); - std::pair dl = open_layer (layout, layer, layer.empty () ? PlacementBlockage : Blockage); + std::pair dl = open_layer (layout, layer, layer.empty () ? PlacementBlockage : Blockage, 0); if (dl.first) { design.shapes (dl.second).insert (p); } @@ -517,12 +516,12 @@ DEFImporter::read_single_net (std::string &nondefaultrule, Layout &layout, db::C std::vector pts; double x = 0.0, y = 0.0; + unsigned int mask = 0; while (true) { if (test ("MASK")) { - // ignore mask spec - get_long (); + mask = get_mask (get_long ()); } if (test ("RECT")) { @@ -543,7 +542,7 @@ DEFImporter::read_single_net (std::string &nondefaultrule, Layout &layout, db::C test (")"); - std::pair dl = open_layer (layout, ln, specialnets ? SpecialRouting : Routing); + std::pair dl = open_layer (layout, ln, specialnets ? SpecialRouting : Routing, mask); if (dl.first) { db::Point p (x, y); @@ -568,8 +567,7 @@ DEFImporter::read_single_net (std::string &nondefaultrule, Layout &layout, db::C while (peek ("(") || peek ("MASK")) { if (test ("MASK")) { - // ignore MASK spec - get_long (); + mask = get_mask (get_long ()); } if (! test ("(")) { @@ -597,7 +595,7 @@ DEFImporter::read_single_net (std::string &nondefaultrule, Layout &layout, db::C } if (pts.size () > 1) { - std::pair dl = open_layer (layout, ln, specialnets ? SpecialRouting : Routing); + std::pair dl = open_layer (layout, ln, specialnets ? SpecialRouting : Routing, mask); if (dl.first) { produce_routing_geometry (design, style, dl.second, prop_id, pts, ext, w); } @@ -695,6 +693,7 @@ DEFImporter::read_nets (db::Layout &layout, db::Cell &design, double scale, bool while (test ("+")) { bool was_shield = false; + unsigned int mask = 0; if (! specialnets && test ("SUBNET")) { @@ -748,7 +747,7 @@ DEFImporter::read_nets (db::Layout &layout, db::Cell &design, double scale, bool test ("+"); } if (test ("MASK")) { - get_long (); + mask = get_mask (get_long ()); test ("+"); } } @@ -760,7 +759,7 @@ DEFImporter::read_nets (db::Layout &layout, db::Cell &design, double scale, bool db::Polygon p; read_polygon (p, scale); - std::pair dl = open_layer (layout, ln, specialnets ? SpecialRouting : Routing); + std::pair dl = open_layer (layout, ln, specialnets ? SpecialRouting : Routing, mask); if (dl.first) { if (prop_id != 0) { design.shapes (dl.second).insert (db::object_with_properties (p, prop_id)); @@ -778,7 +777,7 @@ DEFImporter::read_nets (db::Layout &layout, db::Cell &design, double scale, bool db::Polygon p; read_rect (p, scale); - std::pair dl = open_layer (layout, ln, specialnets ? SpecialRouting : Routing); + std::pair dl = open_layer (layout, ln, specialnets ? SpecialRouting : Routing, mask); if (dl.first) { if (prop_id != 0) { design.shapes (dl.second).insert (db::object_with_properties (p, prop_id)); @@ -866,6 +865,7 @@ DEFImporter::read_vias (db::Layout &layout, db::Cell & /*design*/, double scale) db::Point offset; int rows = 1, columns = 1; std::string pattern; + unsigned int mask = 0; std::map > geometry; std::vector *top = 0, *cut = 0, *bottom = 0; @@ -927,7 +927,7 @@ DEFImporter::read_vias (db::Layout &layout, db::Cell & /*design*/, double scale) if (test ("+")) { expect ("MASK"); - get_long (); + mask = get_mask (get_long ()); } std::vector &polygons = geometry.insert (std::make_pair (ln, std::vector ())).first->second; @@ -940,7 +940,7 @@ DEFImporter::read_vias (db::Layout &layout, db::Cell & /*design*/, double scale) if (test ("+")) { expect ("MASK"); - get_long (); + mask = get_mask (get_long ()); } std::vector &polygons = geometry.insert (std::make_pair (ln, std::vector ())).first->second; @@ -978,7 +978,7 @@ DEFImporter::read_vias (db::Layout &layout, db::Cell & /*design*/, double scale) } for (std::map >::const_iterator g = geometry.begin (); g != geometry.end (); ++g) { - std::pair dl = open_layer (layout, g->first, ViaGeometry); + std::pair dl = open_layer (layout, g->first, ViaGeometry, mask); if (dl.first) { for (std::vector::const_iterator p = g->second.begin (); p != g->second.end (); ++p) { cell.shapes (dl.second).insert (*p); @@ -1000,6 +1000,7 @@ DEFImporter::read_pins (db::Layout &layout, db::Cell &design, double scale) std::string dir; std::map > geometry; db::Trans trans; + unsigned int mask = 0; while (test ("+")) { @@ -1090,7 +1091,7 @@ DEFImporter::read_pins (db::Layout &layout, db::Cell &design, double scale) // Produce geometry collected so far for (std::map >::const_iterator g = geometry.begin (); g != geometry.end (); ++g) { - std::pair dl = open_layer (layout, g->first, Pins); + std::pair dl = open_layer (layout, g->first, Pins, mask); if (dl.first) { db::properties_id_type prop_id = 0; @@ -1111,7 +1112,7 @@ DEFImporter::read_pins (db::Layout &layout, db::Cell &design, double scale) } - dl = open_layer (layout, g->first, Label); + dl = open_layer (layout, g->first, Label, 0); if (dl.first) { db::Box bbox; if (! g->second.empty ()) { @@ -1427,7 +1428,7 @@ DEFImporter::do_read (db::Layout &layout) } else { - std::pair dl = open_layer (layout, std::string (), Regions); + std::pair dl = open_layer (layout, std::string (), Regions, 0); if (dl.first) { for (std::vector::const_iterator p = r->second.begin (); p != r->second.end (); ++p) { group_cell->shapes (dl.second).insert (*p); @@ -1470,7 +1471,7 @@ DEFImporter::do_read (db::Layout &layout) if (! regions.empty ()) { - std::pair dl = open_layer (layout, std::string (), Regions); + std::pair dl = open_layer (layout, std::string (), Regions, 0); if (dl.first) { for (std::map >::const_iterator r = regions.begin (); r != regions.end (); ++r) { diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc index dcc8d4dea..a65b769e9 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc @@ -457,10 +457,10 @@ LEFDEFReaderState::register_layer (const std::string &ln) } void -LEFDEFReaderState::map_layer_explicit (const std::string &n, LayerPurpose purpose, const db::LayerProperties &lp, unsigned int layer) +LEFDEFReaderState::map_layer_explicit (const std::string &n, LayerPurpose purpose, const db::LayerProperties &lp, unsigned int layer, unsigned int mask) { tl_assert (m_has_explicit_layer_mapping); - m_layers [std::make_pair (n, purpose)] = std::make_pair (true, layer); + m_layers [std::make_pair (n, std::make_pair (purpose, mask))] = std::make_pair (true, layer); m_layer_map.map (lp, layer); } @@ -581,18 +581,18 @@ LEFDEFReaderState::read_map_file (const std::string &path, db::Layout &layout) } std::pair -LEFDEFReaderState::open_layer (db::Layout &layout, const std::string &n, LayerPurpose purpose) +LEFDEFReaderState::open_layer (db::Layout &layout, const std::string &n, LayerPurpose purpose, unsigned int mask) { - std::map , std::pair >::const_iterator nl = m_layers.find (std::make_pair (n, purpose)); + std::map >, std::pair >::const_iterator nl = m_layers.find (std::make_pair (n, std::make_pair (purpose, mask))); if (nl == m_layers.end ()) { std::pair ll (false, 0); if (n.empty () || ! m_has_explicit_layer_mapping) { - ll = open_layer_uncached (layout, n, purpose); + ll = open_layer_uncached (layout, n, purpose, mask); } - m_layers.insert (std::make_pair (std::make_pair (n, purpose), ll)); + m_layers.insert (std::make_pair (std::make_pair (n, std::make_pair (purpose, mask)), ll)); return ll; } else { @@ -601,7 +601,7 @@ LEFDEFReaderState::open_layer (db::Layout &layout, const std::string &n, LayerPu } std::pair -LEFDEFReaderState::open_layer_uncached (db::Layout &layout, const std::string &n, LayerPurpose purpose) +LEFDEFReaderState::open_layer_uncached (db::Layout &layout, const std::string &n, LayerPurpose purpose, unsigned int mask) { if (n.empty ()) { @@ -698,28 +698,28 @@ LEFDEFReaderState::open_layer_uncached (db::Layout &layout, const std::string &n switch (purpose) { case Routing: default: - name += mp_tech_comp->routing_suffix (); - dt += mp_tech_comp->routing_datatype (); + name += mp_tech_comp->routing_suffix_per_mask (mask); + dt += mp_tech_comp->routing_datatype_per_mask (mask); break; case SpecialRouting: - name += mp_tech_comp->special_routing_suffix (); - dt += mp_tech_comp->special_routing_datatype (); + name += mp_tech_comp->special_routing_suffix_per_mask (mask); + dt += mp_tech_comp->special_routing_datatype_per_mask (mask); break; case ViaGeometry: - name += mp_tech_comp->via_geometry_suffix (); - dt += mp_tech_comp->via_geometry_datatype (); + name += mp_tech_comp->via_geometry_suffix_per_mask (mask); + dt += mp_tech_comp->via_geometry_datatype_per_mask (mask); break; case Label: name += mp_tech_comp->labels_suffix (); dt += mp_tech_comp->labels_datatype (); break; case Pins: - name += mp_tech_comp->pins_suffix (); - dt += mp_tech_comp->pins_datatype (); + name += mp_tech_comp->pins_suffix_per_mask (mask); + dt += mp_tech_comp->pins_datatype_per_mask (mask); break; case LEFPins: - name += mp_tech_comp->lef_pins_suffix (); - dt += mp_tech_comp->lef_pins_datatype (); + name += mp_tech_comp->lef_pins_suffix_per_mask (mask); + dt += mp_tech_comp->lef_pins_datatype_per_mask (mask); break; case Obstructions: name += mp_tech_comp->obstructions_suffix (); @@ -755,12 +755,12 @@ LEFDEFReaderState::open_layer_uncached (db::Layout &layout, const std::string &n } else { - std::map , unsigned int>::const_iterator l = m_unassigned_layers.find (std::make_pair (n, purpose)); + std::map >, unsigned int>::const_iterator l = m_unassigned_layers.find (std::make_pair (n, std::make_pair (purpose, mask))); if (l != m_unassigned_layers.end ()) { return std::pair (true, l->second); } else { unsigned int li = layout.insert_layer (db::LayerProperties (name)); - m_unassigned_layers.insert (std::make_pair (std::make_pair (n, purpose), li)); + m_unassigned_layers.insert (std::make_pair (std::make_pair (n, std::make_pair (purpose, mask)), li)); m_layer_map.map (db::LayerProperties (name), li); return std::pair (true, li); } @@ -788,28 +788,28 @@ LEFDEFReaderState::finish (db::Layout &layout) used_numbers.insert (ln->second); } - for (std::map, unsigned int>::const_iterator l = m_unassigned_layers.begin (); l != m_unassigned_layers.end (); ++l) { + for (std::map >, unsigned int>::const_iterator l = m_unassigned_layers.begin (); l != m_unassigned_layers.end (); ++l) { int dt = 0; - switch (l->first.second) { + switch (l->first.second.first) { case Routing: default: - dt = mp_tech_comp->routing_datatype (); + dt = mp_tech_comp->routing_datatype_per_mask (l->first.second.second); break; case SpecialRouting: - dt = mp_tech_comp->special_routing_datatype (); + dt = mp_tech_comp->special_routing_datatype_per_mask (l->first.second.second); break; case ViaGeometry: - dt = mp_tech_comp->via_geometry_datatype (); + dt = mp_tech_comp->via_geometry_datatype_per_mask (l->first.second.second); break; case Label: dt = mp_tech_comp->labels_datatype (); break; case Pins: - dt = mp_tech_comp->pins_datatype (); + dt = mp_tech_comp->pins_datatype_per_mask (l->first.second.second); break; case LEFPins: - dt = mp_tech_comp->lef_pins_datatype (); + dt = mp_tech_comp->lef_pins_datatype_per_mask (l->first.second.second); break; case Obstructions: dt = mp_tech_comp->obstructions_datatype (); @@ -869,6 +869,15 @@ LEFDEFImporter::~LEFDEFImporter () // .. nothing yet .. } +unsigned int +LEFDEFImporter::get_mask (long m) +{ + if (m < 1 || m > 16) { + error (tl::to_string (tr ("Invalid mask number: ")) + tl::to_string (m)); + } + return (unsigned int) (m - 1); +} + void LEFDEFImporter::read (tl::InputStream &stream, db::Layout &layout, LEFDEFReaderState &state) { diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h index 633e4e7ef..03aa9e635 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h @@ -879,7 +879,7 @@ public: /** * @brief Create a new layer or return the index of the given layer */ - std::pair open_layer (db::Layout &layout, const std::string &name, LayerPurpose purpose); + std::pair open_layer (db::Layout &layout, const std::string &name, LayerPurpose purpose, unsigned int mask); /** * @brief Registers a layer (assign a new default layer number) @@ -910,8 +910,8 @@ public: } private: - std::map , std::pair > m_layers; - std::map , unsigned int> m_unassigned_layers; + std::map >, std::pair > m_layers; + std::map >, unsigned int> m_unassigned_layers; db::LayerMap m_layer_map; bool m_create_layers; bool m_has_explicit_layer_mapping; @@ -920,8 +920,8 @@ private: std::map m_via_cells; const LEFDEFReaderOptions *mp_tech_comp; - std::pair open_layer_uncached (db::Layout &layout, const std::string &name, LayerPurpose purpose); - void map_layer_explicit (const std::string &n, LayerPurpose purpose, const LayerProperties &lp, unsigned int layer); + std::pair open_layer_uncached (db::Layout &layout, const std::string &name, LayerPurpose purpose, unsigned int mask); + void map_layer_explicit (const std::string &n, LayerPurpose purpose, const LayerProperties &lp, unsigned int layer, unsigned int mask); }; /** @@ -1051,12 +1051,17 @@ protected: */ db::Vector get_vector (double scale); + /** + * @brief Turns a number into a mask number + */ + unsigned int get_mask (long m); + /** * @brief Create a new layer or return the index of the given layer */ - std::pair open_layer (db::Layout &layout, const std::string &name, LayerPurpose purpose) + std::pair open_layer (db::Layout &layout, const std::string &name, LayerPurpose purpose, unsigned int mask) { - return mp_reader_state->open_layer (layout, name, purpose); + return mp_reader_state->open_layer (layout, name, purpose, mask); } /** diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc index 02f482670..205359c8d 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc @@ -160,10 +160,10 @@ static db::Shape insert_shape (db::Cell &cell, unsigned int layer_id, const Shap void LEFImporter::read_geometries (db::Layout &layout, db::Cell &cell, LayerPurpose purpose, std::map *collect_bboxes, db::properties_id_type prop_id) { - int layer_id = -1; std::string layer_name; double dbu = layout.dbu (); double w = 0.0; + unsigned int mask = 0; while (true) { @@ -177,12 +177,6 @@ LEFImporter::read_geometries (db::Layout &layout, db::Cell &cell, LayerPurpose p } else if (test ("LAYER")) { layer_name = get (); - layer_id = -1; - - std::pair dl = open_layer (layout, layer_name, purpose); - if (dl.first) { - layer_id = int (dl.second); - } w = 0.0; std::map >::const_iterator dw = m_default_widths.find (layer_name); @@ -204,8 +198,13 @@ LEFImporter::read_geometries (db::Layout &layout, db::Cell &cell, LayerPurpose p std::vector points; if (test ("MASK")) { - // ignore mask number - get_long (); + mask = get_mask (get_long ()); + } + + int layer_id = -1; + std::pair dl = open_layer (layout, layer_name, purpose, mask); + if (dl.first) { + layer_id = int (dl.second); } bool iterate = test ("ITERATE"); @@ -245,8 +244,13 @@ LEFImporter::read_geometries (db::Layout &layout, db::Cell &cell, LayerPurpose p std::vector points; if (test ("MASK")) { - // ignore mask number - get_long (); + mask = get_mask (get_long ()); + } + + int layer_id = -1; + std::pair dl = open_layer (layout, layer_name, purpose, mask); + if (dl.first) { + layer_id = int (dl.second); } bool iterate = test ("ITERATE"); @@ -286,8 +290,13 @@ LEFImporter::read_geometries (db::Layout &layout, db::Cell &cell, LayerPurpose p std::vector points; if (test ("MASK")) { - // ignore mask number - get_long (); + mask = get_mask (get_long ()); + } + + int layer_id = -1; + std::pair dl = open_layer (layout, layer_name, purpose, mask); + if (dl.first) { + layer_id = int (dl.second); } bool iterate = test ("ITERATE"); @@ -329,8 +338,13 @@ LEFImporter::read_geometries (db::Layout &layout, db::Cell &cell, LayerPurpose p bool iterate = test ("ITERATE"); if (test ("MASK")) { - // ignore mask number - get_long (); + mask = get_mask (get_long ()); + } + + int layer_id = -1; + std::pair dl = open_layer (layout, layer_name, purpose, mask); + if (dl.first) { + layer_id = int (dl.second); } double x = 0.0, y = 0.0; @@ -432,10 +446,11 @@ LEFImporter::read_viadef_by_rule (Layout &layout, db::Cell &cell, ViaDesc &via_d int rows = 1, columns = 1; std::string pattern; - std::vector > > geometry; - geometry.push_back (std::pair > ()); - geometry.push_back (std::pair > ()); - geometry.push_back (std::pair > ()); + // @@@ there is something with masks here ... + std::vector, std::vector > > geometry; + geometry.push_back (std::pair, std::vector > ()); + geometry.push_back (std::pair, std::vector > ()); + geometry.push_back (std::pair, std::vector > ()); while (! test ("END")) { @@ -504,9 +519,9 @@ LEFImporter::read_viadef_by_rule (Layout &layout, db::Cell &cell, ViaDesc &via_d } else if (test ("LAYERS")) { - via_desc.m1 = geometry[0].first = get (); - geometry[1].first = get (); - via_desc.m2 = geometry[2].first = get (); + via_desc.m1 = geometry[0].first.first = get (); + geometry[1].first.first = get (); + via_desc.m2 = geometry[2].first.first = get (); test (";"); @@ -523,8 +538,8 @@ LEFImporter::read_viadef_by_rule (Layout &layout, db::Cell &cell, ViaDesc &via_d create_generated_via (geometry [0].second, geometry [1].second, geometry [2].second, cutsize, cutspacing, be, te, bo, to, offset, rows, columns, pattern); - for (std::vector > >::const_iterator g = geometry.begin (); g != geometry.end (); ++g) { - std::pair dl = open_layer (layout, g->first, ViaGeometry); + for (std::vector, std::vector > >::const_iterator g = geometry.begin (); g != geometry.end (); ++g) { + std::pair dl = open_layer (layout, g->first.first, ViaGeometry, g->first.second); if (dl.first) { for (std::vector::const_iterator p = g->second.begin (); p != g->second.end (); ++p) { cell.shapes (dl.second).insert (*p); @@ -807,7 +822,7 @@ LEFImporter::read_macro (Layout &layout) read_geometries (layout, cell, LEFPins, &bboxes, prop_id); for (std::map ::const_iterator b = bboxes.begin (); b != bboxes.end (); ++b) { - std::pair dl = open_layer (layout, b->first, Label); + std::pair dl = open_layer (layout, b->first, Label, 0); if (dl.first) { cell.shapes (dl.second).insert (db::Text (label.c_str (), db::Trans (b->second.center () - db::Point ()))); } @@ -881,7 +896,7 @@ LEFImporter::read_macro (Layout &layout) layout.rename_cell (cell.cell_index (), mn.c_str ()); - std::pair dl = open_layer (layout, std::string (), Outline); + std::pair dl = open_layer (layout, std::string (), Outline, 0); if (dl.first) { cell.shapes (dl.second).insert (db::Box (-origin, -origin + size)); } From dbe5e19017cf7926d3471f2f8f04f9da0042400c Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sat, 25 Jul 2020 22:15:09 +0200 Subject: [PATCH 053/121] First implementation of masks for vias. Needs debugging. --- .../lefdef/db_plugin/dbDEFImporter.cc | 192 +++++--- .../lefdef/db_plugin/dbLEFDEFImporter.cc | 433 +++++++++++------- .../lefdef/db_plugin/dbLEFDEFImporter.h | 155 ++++++- .../lefdef/db_plugin/dbLEFImporter.cc | 178 ++++--- .../lefdef/db_plugin/dbLEFImporter.h | 16 +- 5 files changed, 670 insertions(+), 304 deletions(-) diff --git a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc index 51c4c3767..149bb8b05 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc @@ -517,13 +517,19 @@ DEFImporter::read_single_net (std::string &nondefaultrule, Layout &layout, db::C double x = 0.0, y = 0.0; unsigned int mask = 0; + bool read_mask = true; while (true) { - if (test ("MASK")) { - mask = get_mask (get_long ()); + if (read_mask) { + mask = 0; + if (test ("MASK")) { + mask = get_mask (get_long ()); + } } + read_mask = true; + if (test ("RECT")) { if (! test ("(")) { @@ -567,12 +573,18 @@ DEFImporter::read_single_net (std::string &nondefaultrule, Layout &layout, db::C while (peek ("(") || peek ("MASK")) { if (test ("MASK")) { - mask = get_mask (get_long ()); + unsigned int m = get_mask (get_long ()); + if (m != mask) { + // stop here with the segments and use the mask value for the next iteration + mask = m; + read_mask = false; + break; + } } if (! test ("(")) { - // We could have a via here: in that case we have swallowed MASK already, but - // since we don't do anything with that, this does not hurt for now. + // We have a via here. MASK is already read, but the value did not change. + read_mask = false; break; } @@ -632,16 +644,27 @@ DEFImporter::read_single_net (std::string &nondefaultrule, Layout &layout, db::C std::map::const_iterator vd = m_via_desc.find (vn); if (vd != m_via_desc.end () && ! pts.empty ()) { - if (nx <= 1 && ny <= 1) { - design.insert (db::CellInstArray (db::CellInst (vd->second.cell->cell_index ()), db::Trans (ft.rot (), db::Vector (pts.back ())))); - } else { - design.insert (db::CellInstArray (db::CellInst (vd->second.cell->cell_index ()), db::Trans (ft.rot (), db::Vector (pts.back ())), db::Vector (dx, 0), db::Vector (0, dy), (unsigned long) nx, (unsigned long) ny)); + + // For the via, the masks are encoded in a three-digit number ( ) + unsigned int mask_top = (mask / 100) % 10; + unsigned int mask_cut = (mask / 10) % 10; + unsigned int mask_bottom = mask % 10; + + db::Cell *cell = reader_state ()->via_cell (vn, layout, mask_bottom, mask_cut, mask_top, &m_lef_importer); + if (cell) { + if (nx <= 1 && ny <= 1) { + design.insert (db::CellInstArray (db::CellInst (cell->cell_index ()), db::Trans (ft.rot (), db::Vector (pts.back ())))); + } else { + design.insert (db::CellInstArray (db::CellInst (cell->cell_index ()), db::Trans (ft.rot (), db::Vector (pts.back ())), db::Vector (dx, 0), db::Vector (0, dy), (unsigned long) nx, (unsigned long) ny)); + } } + if (ln == vd->second.m1) { ln = vd->second.m2; } else if (ln == vd->second.m2) { ln = vd->second.m1; } + } if (! specialnets) { @@ -799,7 +822,11 @@ DEFImporter::read_nets (db::Layout &layout, db::Cell &design, double scale, bool std::map::const_iterator vd = m_via_desc.find (vn); if (vd != m_via_desc.end ()) { - design.insert (db::CellInstArray (db::CellInst (vd->second.cell->cell_index ()), db::Trans (ft.rot (), pt))); + // TODO: no mask specification here? + db::Cell *cell = reader_state ()->via_cell (vn, layout, 0, 0, 0, &m_lef_importer); + if (cell) { + design.insert (db::CellInstArray (db::CellInst (cell->cell_index ()), db::Trans (ft.rot (), pt))); + } } else { error (tl::to_string (tr ("Invalid via name: ")) + vn); } @@ -844,7 +871,7 @@ DEFImporter::read_nets (db::Layout &layout, db::Cell &design, double scale, bool } void -DEFImporter::read_vias (db::Layout &layout, db::Cell & /*design*/, double scale) +DEFImporter::read_vias (db::Layout & /*layout*/, db::Cell & /*design*/, double scale) { while (test ("-")) { @@ -852,100 +879,144 @@ DEFImporter::read_vias (db::Layout &layout, db::Cell & /*design*/, double scale) ViaDesc &vd = m_via_desc.insert (std::make_pair (n, ViaDesc ())).first->second; // produce a cell for vias - std::string cellname = options ().via_cellname_prefix () + n; - db::Cell &cell = layout.cell (layout.add_cell (cellname.c_str ())); - reader_state ()->register_via_cell (n, &cell); - vd.cell = &cell; + std::auto_ptr rule_based_vg; + std::auto_ptr geo_based_vg; - bool has_via_rule = false; - - db::Vector cutsize, cutspacing; - db::Vector be, te; - db::Vector bo, to; - db::Point offset; - int rows = 1, columns = 1; - std::string pattern; unsigned int mask = 0; - std::map > geometry; - std::vector *top = 0, *cut = 0, *bottom = 0; + std::auto_ptr via_generator; + std::set seen_layers; + std::vector routing_layers; while (test ("+")) { if (test ("VIARULE")) { - has_via_rule = true; + if (! rule_based_vg.get ()) { + rule_based_vg.reset (new RuleBasedViaGenerator ()); + } + take (); } else if (test ("CUTSIZE")) { - cutsize = get_vector (scale); + if (! rule_based_vg.get ()) { + rule_based_vg.reset (new RuleBasedViaGenerator ()); + } + + rule_based_vg->set_cutsize (get_vector (scale)); } else if (test ("CUTSPACING")) { - cutspacing = get_vector (scale); + if (! rule_based_vg.get ()) { + rule_based_vg.reset (new RuleBasedViaGenerator ()); + } + + rule_based_vg->set_cutspacing (get_vector (scale)); } else if (test ("ORIGIN")) { - offset = get_point (scale); + if (! rule_based_vg.get ()) { + rule_based_vg.reset (new RuleBasedViaGenerator ()); + } + + rule_based_vg->set_offset (get_point (scale)); } else if (test ("ENCLOSURE")) { - be = get_vector (scale); - te = get_vector (scale); + if (! rule_based_vg.get ()) { + rule_based_vg.reset (new RuleBasedViaGenerator ()); + } + + rule_based_vg->set_be (get_vector (scale)); + rule_based_vg->set_te (get_vector (scale)); } else if (test ("OFFSET")) { - bo = get_vector (scale); - to = get_vector (scale); + if (! rule_based_vg.get ()) { + rule_based_vg.reset (new RuleBasedViaGenerator ()); + } + + rule_based_vg->set_bo (get_vector (scale)); + rule_based_vg->set_to (get_vector (scale)); } else if (test ("ROWCOL")) { - rows = get_long (); - columns = get_long (); + if (! rule_based_vg.get ()) { + rule_based_vg.reset (new RuleBasedViaGenerator ()); + } + + rule_based_vg->set_rows (get_long ()); + rule_based_vg->set_columns (get_long ()); } else if (test ("PATTERN")) { - pattern = get (); + if (! rule_based_vg.get ()) { + rule_based_vg.reset (new RuleBasedViaGenerator ()); + } + + rule_based_vg->set_pattern (get ()); } else if (test ("LAYERS")) { + if (! rule_based_vg.get ()) { + rule_based_vg.reset (new RuleBasedViaGenerator ()); + } + std::string bn = get (); std::string cn = get (); std::string tn = get (); - bottom = &geometry.insert (std::make_pair (bn, std::vector ())).first->second; - cut = &geometry.insert (std::make_pair (cn, std::vector ())).first->second; - top = &geometry.insert (std::make_pair (tn, std::vector ())).first->second; + rule_based_vg->set_bottom_layer (bn); + rule_based_vg->set_cut_layer (cn); + rule_based_vg->set_top_layer (tn); vd.m1 = bn; vd.m2 = tn; } else if (test ("POLYGON")) { + if (! geo_based_vg.get ()) { + geo_based_vg.reset (new GeometryBasedViaGenerator ()); + } + std::string ln = get (); + if (m_lef_importer.is_routing_layer (ln) && seen_layers.find (ln) != seen_layers.end ()) { + seen_layers.insert (ln); + routing_layers.push_back (ln); + } + if (test ("+")) { expect ("MASK"); mask = get_mask (get_long ()); } - std::vector &polygons = geometry.insert (std::make_pair (ln, std::vector ())).first->second; - polygons.push_back (db::Polygon ()); - read_polygon (polygons.back (), scale); + db::Polygon poly; + read_polygon (poly, scale); + geo_based_vg->add_polygon (ln, poly, mask); } else if (test ("RECT")) { + if (! geo_based_vg.get ()) { + geo_based_vg.reset (new GeometryBasedViaGenerator ()); + } + std::string ln = get (); + if (m_lef_importer.is_routing_layer (ln) && seen_layers.find (ln) != seen_layers.end ()) { + seen_layers.insert (ln); + routing_layers.push_back (ln); + } + if (test ("+")) { expect ("MASK"); mask = get_mask (get_long ()); } - std::vector &polygons = geometry.insert (std::make_pair (ln, std::vector ())).first->second; - polygons.push_back (db::Polygon ()); - read_rect (polygons.back (), scale); + db::Polygon poly; + read_polygon (poly, scale); + geo_based_vg->add_polygon (ln, poly, mask); } @@ -954,13 +1025,6 @@ DEFImporter::read_vias (db::Layout &layout, db::Cell & /*design*/, double scale) if (vd.m1.empty () && vd.m2.empty ()) { // analyze the layers to find the metals - std::vector routing_layers; - for (std::map >::const_iterator b = geometry.begin (); b != geometry.end (); ++b) { - if (m_lef_importer.is_routing_layer (b->first)) { - routing_layers.push_back (b->first); - } - } - if (routing_layers.size () == 2) { vd.m1 = routing_layers[0]; vd.m2 = routing_layers[1]; @@ -970,22 +1034,18 @@ DEFImporter::read_vias (db::Layout &layout, db::Cell & /*design*/, double scale) } + if (rule_based_vg.get () && geo_based_vg.get ()) { + error (tl::to_string (tr ("A via can only be defined through a VIARULE or geometry, not both ways"))); + } else if (rule_based_vg.get ()) { + reader_state ()->register_via_cell (n, rule_based_vg.release ()); + } else if (geo_based_vg.get ()) { + reader_state ()->register_via_cell (n, geo_based_vg.release ()); + } else { + error (tl::to_string (tr ("Too little information to generate a via"))); + } + test (";"); - if (has_via_rule && top && cut && bottom) { - create_generated_via (*bottom, *cut, *top, - cutsize, cutspacing, be, te, bo, to, offset, rows, columns, pattern); - } - - for (std::map >::const_iterator g = geometry.begin (); g != geometry.end (); ++g) { - std::pair dl = open_layer (layout, g->first, ViaGeometry, mask); - if (dl.first) { - for (std::vector::const_iterator p = g->second.begin (); p != g->second.end (); ++p) { - cell.shapes (dl.second).insert (*p); - } - } - } - } } diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc index a65b769e9..431a002ce 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc @@ -67,6 +67,206 @@ std::string correct_path (const std::string &fn, const db::Layout &layout, const } } +// ----------------------------------------------------------------------------------- +// Utilities + +static bool is_hex_digit (char c) +{ + char cup = toupper (c); + return (cup >= 'A' && cup <= 'F') || (c >= '0' && c <= '9'); +} + +static int hex_value (char c) +{ + char cup = toupper (c); + if (cup >= 'A' && cup <= 'F') { + return (cup - 'A') + 10; + } else if (c >= '0' && c <= '9') { + return c - '0'; + } else { + return 0; + } +} + +// ----------------------------------------------------------------------------------- +// RuleBasedViaGenerator implementation + +RuleBasedViaGenerator::RuleBasedViaGenerator () + : LEFDEFViaGenerator (), m_bottom_mask (0), m_cut_mask (0), m_top_mask (0), m_rows (1), m_columns (1) +{ } + +void +RuleBasedViaGenerator::create_cell (LEFDEFReaderState &reader, Layout &layout, db::Cell &cell, unsigned int mask_bottom, unsigned int mask_cut, unsigned int mask_top, const LEFDEFNumberOfMasks *nm) +{ + if (mask_bottom == 0) { + mask_bottom = m_bottom_mask; + } + if (mask_cut == 0) { + mask_cut = m_cut_mask; + } + if (mask_top == 0) { + mask_top = m_top_mask; + } + + unsigned int num_cut_masks = nm ? nm->number_of_masks (m_cut_layer) : 1; + + // NOTE: missing cuts due to pattern holes don't change mask assignment + + db::Vector vs ((m_cutsize.x () * m_columns + m_cutspacing.x () * (m_columns - 1)) / 2, (m_cutsize.y () * m_rows + m_cutspacing.y () * (m_rows - 1)) / 2); + db::Box via_box (m_offset - vs, m_offset + vs); + + std::pair dl (false, 0); + + dl = reader.open_layer (layout, m_bottom_layer, ViaGeometry, mask_bottom); + if (dl.first) { + cell.shapes (dl.second).insert (db::Polygon (via_box.enlarged (m_be).moved (m_bo))); + } + + dl = reader.open_layer (layout, m_top_layer, ViaGeometry, mask_top); + if (dl.first) { + cell.shapes (dl.second).insert (db::Polygon (via_box.enlarged (m_te).moved (m_bo))); + } + + const char *p = m_pattern.c_str (); + int rp = m_pattern.empty () ? -1 : 0; + const char *p0 = p, *p1 = p; + + for (int r = 0; r < m_rows; ++r) { + + if (rp == 0) { + + if (*p) { + + // read a new row specification + rp = 0; + while (*p && is_hex_digit (*p)) { + rp = (rp * 16) + hex_value (*p++); + } + if (*p == '_') { + ++p; + } + + p0 = p; + if (*p) { + while (*p && (is_hex_digit (*p) || toupper (*p) == 'R')) { + ++p; + } + } + p1 = p; + if (*p == '_') { + ++p; + } + + } + + } + + if (rp != 0) { + + if (rp > 0) { + --rp; + } + + const char *pp = p0; + unsigned int d = 0; + int cp = (p == p0 ? -1 : 0); + int bit = 0; + + for (int c = 0; c < m_columns; ++c) { + + if (cp == 0) { + + d = 0; + cp = 4; + bit = 0; + + if (*pp && pp < p1 && toupper (*pp) == 'R') { + + ++pp; + if (*pp && pp < p1) { + cp = 4 * hex_value (*pp++); + if (*pp && pp < p1) { + d = (unsigned int) hex_value (*pp++); + } + } + + } else if (*pp && pp < p1) { + + d = (unsigned int) hex_value (*pp++); + + } + + if (cp > 0) { + --cp; + } + + } else if (cp > 0) { + + --cp; + + } else { + + d = 0xf; + + } + + if ((d & (0x8 >> (bit++ % 4))) != 0) { + + db::Vector vbl ((m_cutsize + m_cutspacing).x () * c, (m_cutsize + m_cutspacing).y () * r); + db::Box vb (via_box.lower_left () + vbl, via_box.lower_left () + vbl + m_cutsize); + + unsigned int cm = 0; + if (mask_cut > 0) { + // This is the core algorithm for mask assignment in patterned vias + cm = (mask_cut + r + c - 1) % num_cut_masks + 1; + } + + dl = reader.open_layer (layout, m_cut_layer, ViaGeometry, cm); + if (dl.first) { + cell.shapes (dl.second).insert (db::Polygon (vb)); + } + + } + + } + + } + + } +} + +// ----------------------------------------------------------------------------------- +// GeometryBasedViaGenerator implementation + +GeometryBasedViaGenerator::GeometryBasedViaGenerator () + : LEFDEFViaGenerator () +{ } + +void +GeometryBasedViaGenerator::create_cell (LEFDEFReaderState &reader, Layout &layout, db::Cell &cell, unsigned int /*mask_bottom*/, unsigned int /*mask_cut*/, unsigned int /*mask_top*/, const LEFDEFNumberOfMasks * /*nm*/) +{ + for (std::map > >::const_iterator g = m_geometries.begin (); g != m_geometries.end (); ++g) { + + for (std::list >::const_iterator i = g->second.begin (); i != g->second.end (); ++i) { + + std::pair dl (false, 0); + + dl = reader.open_layer (layout, g->first, ViaGeometry, i->first); + if (dl.first) { + cell.shapes (dl.second).insert (i->second); + } + + } + + } +} + +void +GeometryBasedViaGenerator::add_polygon (const std::string &ln, const db::Polygon &poly, unsigned int mask) +{ + m_geometries [ln].push_back (std::make_pair (mask, poly)); +} + // ----------------------------------------------------------------------------------- // LEFDEFTechnologyComponent implementation @@ -449,6 +649,15 @@ LEFDEFReaderState::LEFDEFReaderState (const LEFDEFReaderOptions *tc, db::Layout } } +LEFDEFReaderState::~LEFDEFReaderState () +{ + for (std::map::const_iterator i = m_via_generators.begin (); i != m_via_generators.end (); ++i) { + delete i->second; + } + + m_via_generators.clear (); +} + void LEFDEFReaderState::register_layer (const std::string &ln) { @@ -484,7 +693,7 @@ LEFDEFReaderState::read_map_file (const std::string &path, db::Layout &layout) purpose_translation ["VIA"] = ViaGeometry; purpose_translation ["BLOCKAGE"] = Blockage; - std::map, db::LayerProperties> layer_map; + std::map >, db::LayerProperties> layer_map; while (! ts.at_end ()) { @@ -504,15 +713,15 @@ LEFDEFReaderState::read_map_file (const std::string &path, db::Layout &layout) if (w1 == "DIEAREA") { - layer_map [std::make_pair (std::string (), Outline)] = db::LayerProperties (layer, datatype, "OUTLINE"); + layer_map [std::make_pair (std::string (), std::make_pair (Outline, (unsigned int) 0))] = db::LayerProperties (layer, datatype, "OUTLINE"); } else if (w1 == "REGIONS") { - layer_map [std::make_pair (std::string (), Regions)] = db::LayerProperties (layer, datatype, "REGIONS"); + layer_map [std::make_pair (std::string (), std::make_pair (Regions, (unsigned int) 0))] = db::LayerProperties (layer, datatype, "REGIONS"); } else if (w1 == "BLOCKAGE") { - layer_map [std::make_pair (std::string (), PlacementBlockage)] = db::LayerProperties (layer, datatype, "PLACEMENT_BLK"); + layer_map [std::make_pair (std::string (), std::make_pair (PlacementBlockage, (unsigned int) 0))] = db::LayerProperties (layer, datatype, "PLACEMENT_BLK"); } else if (w1 == "NAME") { @@ -530,7 +739,7 @@ LEFDEFReaderState::read_map_file (const std::string &path, db::Layout &layout) std::string final_name = tl::join (layers, "/") + ".LABEL"; for (std::vector::const_iterator l = layers.begin (); l != layers.end (); ++l) { - layer_map [std::make_pair (*l, Label)] = db::LayerProperties (layer, datatype, final_name); + layer_map [std::make_pair (*l, std::make_pair (Label, (unsigned int) 0))] = db::LayerProperties (layer, datatype, final_name); } } else { @@ -542,15 +751,30 @@ LEFDEFReaderState::read_map_file (const std::string &path, db::Layout &layout) // "(M1,PINS): M1.NET/PINS" // (separating, translating and recombing the purposes) - std::set translated_purposes; + std::set > translated_purposes; std::string purpose_str; + std::vector purposes = tl::split (w2, ","); for (std::vector::const_iterator p = purposes.begin (); p != purposes.end (); ++p) { - std::map::const_iterator i = purpose_translation.find (tl::to_upper_case (*p)); + std::string p_uc = tl::to_upper_case (*p); + tl::Extractor ex (p_uc.c_str ()); + + std::string ps; + ex.read (ps); + + unsigned int mask = 0; + + if (ex.test (":")) { + if (ex.test ("MASK") && ex.test (":")) { + ex.read (mask); + } + } + + std::map::const_iterator i = purpose_translation.find (ps); if (i != purpose_translation.end ()) { - translated_purposes.insert (i->second); + translated_purposes.insert (std::make_pair (i->second, mask)); if (! purpose_str.empty ()) { purpose_str += "/"; @@ -558,11 +782,12 @@ LEFDEFReaderState::read_map_file (const std::string &path, db::Layout &layout) purpose_str += i->first; } + } std::string final_name = w1 + "." + purpose_str; - for (std::set::const_iterator p = translated_purposes.begin (); p != translated_purposes.end (); ++p) { + for (std::set >::const_iterator p = translated_purposes.begin (); p != translated_purposes.end (); ++p) { layer_map [std::make_pair (w1, *p)] = db::LayerProperties (layer, datatype, final_name); } @@ -575,8 +800,8 @@ LEFDEFReaderState::read_map_file (const std::string &path, db::Layout &layout) } db::DirectLayerMapping lm (&layout); - for (std::map, db::LayerProperties>::const_iterator i = layer_map.begin (); i != layer_map.end (); ++i) { - map_layer_explicit (i->first.first, i->first.second, i->second, lm.map_layer (i->second).second); + for (std::map >, db::LayerProperties>::const_iterator i = layer_map.begin (); i != layer_map.end (); ++i) { + map_layer_explicit (i->first.first, i->first.second.first, i->second, lm.map_layer (i->second).second, i->first.second.second); } } @@ -840,16 +1065,52 @@ LEFDEFReaderState::finish (db::Layout &layout) } void -LEFDEFReaderState::register_via_cell (const std::string &vn, db::Cell *cell) +LEFDEFReaderState::register_via_cell (const std::string &vn, LEFDEFViaGenerator *generator) { - m_via_cells [vn] = cell; + if (m_via_generators.find (vn) != m_via_generators.end ()) { + delete m_via_generators [vn]; + } + m_via_generators [vn] = generator; } db::Cell * -LEFDEFReaderState::via_cell (const std::string &vn) +LEFDEFReaderState::via_cell (const std::string &vn, db::Layout &layout, unsigned int mask_bottom, unsigned int mask_cut, unsigned int mask_top, const LEFDEFNumberOfMasks *nm) { - std::map::const_iterator i = m_via_cells.find (vn); - return i != m_via_cells.end () ? i->second : 0; + ViaKey vk (vn, mask_bottom, mask_cut, mask_top); + std::map::const_iterator i = m_via_cells.find (vk); + if (i == m_via_cells.end ()) { + + db::Cell *cell = 0; + + std::map::const_iterator g = m_via_generators.find (vn); + if (g != m_via_generators.end ()) { + + LEFDEFViaGenerator *vg = g->second; + + std::string mask_suffix; + if (mask_bottom > 0 || mask_cut > 0 || mask_top > 0) { + mask_suffix += "_"; + mask_suffix += tl::to_string (mask_bottom); + mask_suffix += "_"; + mask_suffix += tl::to_string (mask_cut); + mask_suffix += "_"; + mask_suffix += tl::to_string (mask_top); + } + + std::string cn = mp_tech_comp->via_cellname_prefix () + vn + mask_suffix; + cell = &layout.cell (layout.add_cell (cn.c_str ())); + + vg->create_cell (*this, layout, *cell, mask_bottom, mask_cut, mask_bottom, nm); + + } + + m_via_cells[vk] = cell; + return cell; + + } else { + tl_assert (! i->second || i->second->layout () == &layout); + return i->second; + } } // ----------------------------------------------------------------------------------- @@ -872,10 +1133,7 @@ LEFDEFImporter::~LEFDEFImporter () unsigned int LEFDEFImporter::get_mask (long m) { - if (m < 1 || m > 16) { - error (tl::to_string (tr ("Invalid mask number: ")) + tl::to_string (m)); - } - return (unsigned int) (m - 1); + return (unsigned int) m; } void @@ -1146,141 +1404,6 @@ LEFDEFImporter::next () return m_last_token; } -static bool is_hex_digit (char c) -{ - char cup = toupper (c); - return (cup >= 'A' && cup <= 'F') || (c >= '0' && c <= '9'); -} - -static int hex_value (char c) -{ - char cup = toupper (c); - if (cup >= 'A' && cup <= 'F') { - return (cup - 'A') + 10; - } else if (c >= '0' && c <= '9') { - return c - '0'; - } else { - return 0; - } -} - -void -LEFDEFImporter::create_generated_via (std::vector &bottom, - std::vector &cut, - std::vector &top, - const db::Vector &cutsize, - const db::Vector &cutspacing, - const db::Vector &be, const db::Vector &te, - const db::Vector &bo, const db::Vector &to, - const db::Point &o, - int rows, int columns, - const std::string &pattern) -{ - db::Vector vs ((cutsize.x () * columns + cutspacing.x () * (columns - 1)) / 2, (cutsize.y () * rows + cutspacing.y () * (rows - 1)) / 2); - db::Box via_box (o - vs, o + vs); - - bottom.push_back (db::Polygon (via_box.enlarged (be).moved (bo))); - top.push_back (db::Polygon (via_box.enlarged (te).moved (to))); - - const char *p = pattern.c_str (); - int rp = pattern.empty () ? -1 : 0; - const char *p0 = p, *p1 = p; - - for (int r = 0; r < rows; ++r) { - - if (rp == 0) { - - if (*p) { - - // read a new row specification - rp = 0; - while (*p && is_hex_digit (*p)) { - rp = (rp * 16) + hex_value (*p++); - } - if (*p == '_') { - ++p; - } - - p0 = p; - if (*p) { - while (*p && (is_hex_digit (*p) || toupper (*p) == 'R')) { - ++p; - } - } - p1 = p; - if (*p == '_') { - ++p; - } - - } - - } - - if (rp != 0) { - - if (rp > 0) { - --rp; - } - - const char *pp = p0; - unsigned int d = 0; - int cp = (p == p0 ? -1 : 0); - int bit = 0; - - for (int c = 0; c < columns; ++c) { - - if (cp == 0) { - - d = 0; - cp = 4; - bit = 0; - - if (*pp && pp < p1 && toupper (*pp) == 'R') { - - ++pp; - if (*pp && pp < p1) { - cp = 4 * hex_value (*pp++); - if (*pp && pp < p1) { - d = (unsigned int) hex_value (*pp++); - } - } - - } else if (*pp && pp < p1) { - - d = (unsigned int) hex_value (*pp++); - - } - - if (cp > 0) { - --cp; - } - - } else if (cp > 0) { - - --cp; - - } else { - - d = 0xf; - - } - - if ((d & (0x8 >> (bit++ % 4))) != 0) { - - db::Vector vbl ((cutsize + cutspacing).x () * c, (cutsize + cutspacing).y () * r); - db::Box vb (via_box.lower_left () + vbl, via_box.lower_left () + vbl + cutsize); - cut.push_back (db::Polygon (vb)); - - } - - } - - } - - } - -} - db::FTrans LEFDEFImporter::get_orient (bool optional) { diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h index 03aa9e635..d0c298328 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h @@ -43,6 +43,8 @@ namespace tl namespace db { +class LEFDEFReaderState; + /** * @brief Correct a path relative to the stream and technology */ @@ -848,6 +850,86 @@ enum LayerPurpose Regions, // from DEF only }; +/** + * @brief An interface for resolving the number of masks from a layer name + */ +class DB_PLUGIN_PUBLIC LEFDEFNumberOfMasks +{ +public: + LEFDEFNumberOfMasks () { } + virtual ~LEFDEFNumberOfMasks () { } + + virtual unsigned int number_of_masks (const std::string &layer_name) const = 0; +}; + +/** + * @brief Provides a via generator base class + */ +class DB_PLUGIN_PUBLIC LEFDEFViaGenerator +{ +public: + LEFDEFViaGenerator () { } + virtual ~LEFDEFViaGenerator () { } + + virtual void create_cell (LEFDEFReaderState &reader, db::Layout &layout, db::Cell &cell, unsigned int mask_bottom, unsigned int mask_cut, unsigned int mask_top, const LEFDEFNumberOfMasks *nm) = 0; +}; + +/** + * @brief Provides a via generator implementation for rule-based vias + */ +class DB_PLUGIN_PUBLIC RuleBasedViaGenerator + : public LEFDEFViaGenerator +{ +public: + RuleBasedViaGenerator (); + + virtual void create_cell (LEFDEFReaderState &reader, Layout &layout, db::Cell &cell, unsigned int mask_bottom, unsigned int mask_cut, unsigned int mask_top, const LEFDEFNumberOfMasks *nm); + + void set_cutsize (const db::Vector &cutsize) { m_cutsize = cutsize; } + void set_cutspacing (const db::Vector &cutspacing) { m_cutspacing = cutspacing; } + void set_offset (const db::Point &offset) { m_offset = offset; } + void set_be (const db::Vector &be) { m_be = be; } + void set_te (const db::Vector &te) { m_te = te; } + void set_bo (const db::Vector &bo) { m_bo = bo; } + void set_to (const db::Vector &to) { m_to = to; } + void set_rows (int rows) { m_rows = rows; } + void set_columns (int columns) { m_columns = columns; } + void set_pattern (const std::string &pattern) { m_pattern = pattern; } + void set_bottom_layer (const std::string &ln) { m_bottom_layer = ln; } + void set_cut_layer (const std::string &ln) { m_cut_layer = ln; } + void set_top_layer (const std::string &ln) { m_top_layer = ln; } + void set_bottom_mask (unsigned int m) { m_bottom_mask = m; } + void set_cut_mask (unsigned int m) { m_cut_mask = m; } + void set_top_mask (unsigned int m) { m_top_mask = m; } + +private: + std::string m_bottom_layer, m_cut_layer, m_top_layer; + unsigned int m_bottom_mask, m_cut_mask, m_top_mask; + db::Vector m_cutsize, m_cutspacing; + db::Vector m_be, m_te; + db::Vector m_bo, m_to; + db::Point m_offset; + int m_rows, m_columns; + std::string m_pattern; +}; + +/** + * @brief Provides a geometry-based via generator implementation + */ +class DB_PLUGIN_PUBLIC GeometryBasedViaGenerator + : public LEFDEFViaGenerator +{ +public: + GeometryBasedViaGenerator (); + + virtual void create_cell (LEFDEFReaderState &reader, Layout &layout, db::Cell &cell, unsigned int mask_bottom, unsigned int mask_cut, unsigned int mask_top, const LEFDEFNumberOfMasks *num_cut_masks); + + void add_polygon (const std::string &ln, const db::Polygon &poly, unsigned int mask); + +private: + std::map > > m_geometries; +}; + /** * @brief Layer handler delegate * @@ -861,6 +943,11 @@ public: */ LEFDEFReaderState (const LEFDEFReaderOptions *tc, db::Layout &layout, const std::string &base_path = std::string ()); + /** + * @brief Destructor + */ + ~LEFDEFReaderState (); + /** * @brief Reads the given map file * @@ -892,14 +979,16 @@ public: void finish (db::Layout &layout); /** - * @brief Registers a via cell for the via with the given name + * @brief Registers a via generator for the via with the given name + * + * The generator is capable of creating a via for a specific mask configuration */ - void register_via_cell (const std::string &vn, db::Cell *cell); + void register_via_cell (const std::string &vn, LEFDEFViaGenerator *generator); /** * @brief Gets the via cell for the given via name or 0 if no such via is registered */ - db::Cell *via_cell (const std::string &vn); + db::Cell *via_cell (const std::string &vn, Layout &layout, unsigned int mask_bottom, unsigned int mask_cut, unsigned int mask_top, const LEFDEFNumberOfMasks *nm); /** * @brief Get the technology component pointer @@ -910,6 +999,45 @@ public: } private: + /** + * @brief A key for the via cache + */ + struct ViaKey + { + ViaKey (const std::string &n, unsigned int mb, unsigned int mc, unsigned int mt) + : name (n), mask_bottom (mb), mask_cut (mc), mask_top (mt) + { } + + bool operator== (const ViaKey &other) const + { + return name == other.name && mask_bottom == other.mask_bottom && mask_cut == other.mask_cut && mask_top == other.mask_top; + } + + bool operator< (const ViaKey &other) const + { + if (name != other.name) { + return name < other.name; + } + if (mask_bottom != other.mask_bottom) { + return mask_bottom < other.mask_bottom; + } + if (mask_cut != other.mask_cut) { + return mask_cut < other.mask_cut; + } + if (mask_top != other.mask_top) { + return mask_top < other.mask_top; + } + return false; + } + + std::string name; + unsigned int mask_bottom, mask_cut, mask_top; + }; + + // no copying + LEFDEFReaderState (const LEFDEFReaderState &); + LEFDEFReaderState &operator= (const LEFDEFReaderState &); + std::map >, std::pair > m_layers; std::map >, unsigned int> m_unassigned_layers; db::LayerMap m_layer_map; @@ -917,8 +1045,9 @@ private: bool m_has_explicit_layer_mapping; int m_laynum; std::map m_default_number; - std::map m_via_cells; + std::map m_via_cells; const LEFDEFReaderOptions *mp_tech_comp; + std::map m_via_generators; std::pair open_layer_uncached (db::Layout &layout, const std::string &name, LayerPurpose purpose, unsigned int mask); void map_layer_explicit (const std::string &n, LayerPurpose purpose, const LayerProperties &lp, unsigned int layer, unsigned int mask); @@ -929,12 +1058,7 @@ private: */ struct DB_PLUGIN_PUBLIC ViaDesc { - ViaDesc () : cell (0) { } - - /** - * @brief The cell representing the via - */ - db::Cell *cell; + ViaDesc () { } /** * @brief The names of bottom and top metal respectively @@ -1152,17 +1276,6 @@ protected: return mp_reader_state; } - void create_generated_via (std::vector &bottom, - std::vector &cut, - std::vector &top, - const db::Vector &cutsize, - const db::Vector &cutspacing, - const db::Vector &be, const db::Vector &te, - const db::Vector &bo, const db::Vector &to, - const db::Point &o, - int rows, int columns, - const std::string &pattern); - private: tl::AbsoluteProgress *mp_progress; tl::TextInputStream *mp_stream; diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc index 205359c8d..003826ccb 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc @@ -163,7 +163,6 @@ LEFImporter::read_geometries (db::Layout &layout, db::Cell &cell, LayerPurpose p std::string layer_name; double dbu = layout.dbu (); double w = 0.0; - unsigned int mask = 0; while (true) { @@ -197,6 +196,7 @@ LEFImporter::read_geometries (db::Layout &layout, db::Cell &cell, LayerPurpose p std::vector points; + unsigned int mask = 0; if (test ("MASK")) { mask = get_mask (get_long ()); } @@ -243,6 +243,7 @@ LEFImporter::read_geometries (db::Layout &layout, db::Cell &cell, LayerPurpose p std::vector points; + unsigned int mask = 0; if (test ("MASK")) { mask = get_mask (get_long ()); } @@ -289,6 +290,7 @@ LEFImporter::read_geometries (db::Layout &layout, db::Cell &cell, LayerPurpose p std::vector points; + unsigned int mask = 0; if (test ("MASK")) { mask = get_mask (get_long ()); } @@ -337,10 +339,15 @@ LEFImporter::read_geometries (db::Layout &layout, db::Cell &cell, LayerPurpose p // note: the 5.8 spec says ITERATE comes before MASK for VIA bool iterate = test ("ITERATE"); + unsigned int mask = 0; if (test ("MASK")) { mask = get_mask (get_long ()); } + unsigned int mask_bottom = mask % 10; + unsigned int mask_cut = (mask / 10) % 10; + unsigned int mask_top = (mask / 100) % 10; + int layer_id = -1; std::pair dl = open_layer (layout, layer_name, purpose, mask); if (dl.first) { @@ -359,7 +366,7 @@ LEFImporter::read_geometries (db::Layout &layout, db::Cell &cell, LayerPurpose p points.push_back (db::Vector (db::DVector (x / dbu, y / dbu))); std::string vn = get (); - db::Cell *vc = reader_state ()->via_cell (vn); + db::Cell *vc = reader_state ()->via_cell (vn, layout, mask_bottom, mask_cut, mask_top, this); if (! vc) { warn (tl::to_string (tr ("Unknown via: ")) + vn); } @@ -437,21 +444,8 @@ LEFImporter::read_nondefaultrule (db::Layout & /*layout*/) } void -LEFImporter::read_viadef_by_rule (Layout &layout, db::Cell &cell, ViaDesc &via_desc, const std::string & /*n*/) +LEFImporter::read_viadef_by_rule (RuleBasedViaGenerator *vg, ViaDesc &via_desc, const std::string & /*n*/, double dbu) { - db::Vector cutsize, cutspacing; - db::Vector be, te; - db::Vector bo, to; - db::Point offset; - int rows = 1, columns = 1; - std::string pattern; - - // @@@ there is something with masks here ... - std::vector, std::vector > > geometry; - geometry.push_back (std::pair, std::vector > ()); - geometry.push_back (std::pair, std::vector > ()); - geometry.push_back (std::pair, std::vector > ()); - while (! test ("END")) { double x, y; @@ -460,7 +454,7 @@ LEFImporter::read_viadef_by_rule (Layout &layout, db::Cell &cell, ViaDesc &via_d x = get_double (); y = get_double (); - cutsize = db::Vector (db::DVector (x / layout.dbu (), y / layout.dbu ())); + vg->set_cutsize (db::Vector (db::DVector (x / dbu, y / dbu))); test (";"); @@ -468,7 +462,7 @@ LEFImporter::read_viadef_by_rule (Layout &layout, db::Cell &cell, ViaDesc &via_d x = get_double (); y = get_double (); - cutspacing = db::Vector (db::DVector (x / layout.dbu (), y / layout.dbu ())); + vg->set_cutspacing (db::Vector (db::DVector (x / dbu, y / dbu))); test (";"); @@ -476,7 +470,7 @@ LEFImporter::read_viadef_by_rule (Layout &layout, db::Cell &cell, ViaDesc &via_d x = get_double (); y = get_double (); - offset = db::Point (db::DPoint (x / layout.dbu (), y / layout.dbu ())); + vg->set_offset (db::Point (db::DPoint (x / dbu, y / dbu))); test (";"); @@ -484,11 +478,11 @@ LEFImporter::read_viadef_by_rule (Layout &layout, db::Cell &cell, ViaDesc &via_d x = get_double (); y = get_double (); - be = db::Vector (db::DVector (x / layout.dbu (), y / layout.dbu ())); + vg->set_be (db::Vector (db::DVector (x / dbu, y / dbu))); x = get_double (); y = get_double (); - te = db::Vector (db::DVector (x / layout.dbu (), y / layout.dbu ())); + vg->set_te (db::Vector (db::DVector (x / dbu, y / dbu))); test (";"); @@ -496,32 +490,39 @@ LEFImporter::read_viadef_by_rule (Layout &layout, db::Cell &cell, ViaDesc &via_d x = get_double (); y = get_double (); - bo = db::Vector (db::DVector (x / layout.dbu (), y / layout.dbu ())); + vg->set_bo (db::Vector (db::DVector (x / dbu, y / dbu))); x = get_double (); y = get_double (); - to = db::Vector (db::DVector (x / layout.dbu (), y / layout.dbu ())); + vg->set_to (db::Vector (db::DVector (x / dbu, y / dbu))); test (";"); } else if (test ("ROWCOL")) { - rows = get_long (); - columns = get_long (); + vg->set_rows (get_long ()); + vg->set_columns (get_long ()); test (";"); } else if (test ("PATTERN")) { - pattern = get (); + vg->set_pattern (get ()); test (";"); } else if (test ("LAYERS")) { - via_desc.m1 = geometry[0].first.first = get (); - geometry[1].first.first = get (); - via_desc.m2 = geometry[2].first.first = get (); + std::string lb, lc, lt; + lb = get (); + lc = get (); + lt = get (); + via_desc.m1 = lb; + via_desc.m2 = lt; + + vg->set_bottom_layer (lb); + vg->set_cut_layer (lc); + vg->set_top_layer (lt); test (";"); @@ -534,22 +535,10 @@ LEFImporter::read_viadef_by_rule (Layout &layout, db::Cell &cell, ViaDesc &via_d } } - - create_generated_via (geometry [0].second, geometry [1].second, geometry [2].second, - cutsize, cutspacing, be, te, bo, to, offset, rows, columns, pattern); - - for (std::vector, std::vector > >::const_iterator g = geometry.begin (); g != geometry.end (); ++g) { - std::pair dl = open_layer (layout, g->first.first, ViaGeometry, g->first.second); - if (dl.first) { - for (std::vector::const_iterator p = g->second.begin (); p != g->second.end (); ++p) { - cell.shapes (dl.second).insert (*p); - } - } - } } void -LEFImporter::read_viadef_by_geometry (Layout &layout, db::Cell &cell, ViaDesc &via_desc, const std::string &n) +LEFImporter::read_viadef_by_geometry (GeometryBasedViaGenerator *vg, ViaDesc &via_desc, const std::string &n, double dbu) { // ignore resistance spec if (test ("RESISTANCE")) { @@ -557,18 +546,80 @@ LEFImporter::read_viadef_by_geometry (Layout &layout, db::Cell &cell, ViaDesc &v test (";"); } - std::map bboxes; - read_geometries (layout, cell, ViaGeometry, &bboxes); + std::string layer_name; + std::set seen_layers; + std::vector routing_layers; + + while (true) { + + if (test ("LAYER")) { + + layer_name = get (); + + if (m_routing_layers.find (layer_name) != m_routing_layers.end () && seen_layers.find (layer_name) == seen_layers.end ()) { + seen_layers.insert (layer_name); + routing_layers.push_back (layer_name); + } + + while (! test (";")) { + take (); + } + + } else if (test ("POLYGON")) { + + std::vector points; + + unsigned int mask = 0; + if (test ("MASK")) { + mask = get_mask (get_long ()); + } + + while (! peek (";")) { + test ("("); + double x = get_double (); + double y = get_double (); + points.push_back (db::Point (db::DPoint (x / dbu, y / dbu))); + test (")"); + } + + db::Polygon p; + p.assign_hull (points.begin (), points.end ()); + + vg->add_polygon (layer_name, p, mask); + + expect (";"); + + } else if (test ("RECT")) { + + std::vector points; + + unsigned int mask = 0; + if (test ("MASK")) { + mask = get_mask (get_long ()); + } + + for (int i = 0; i < 2; ++i) { + test ("("); + double x = get_double (); + double y = get_double (); + points.push_back (db::Point (db::DPoint (x / dbu, y / dbu))); + test (")"); + } + + db::Box b (points [0], points [1]); + vg->add_polygon (layer_name, db::Polygon (b), mask); + + expect (";"); + + } else { + // stop at unknown token + break; + } + + } // determine m1 and m2 layers - std::vector routing_layers; - for (std::map::const_iterator b = bboxes.begin (); b != bboxes.end (); ++b) { - if (m_routing_layers.find (b->first) != m_routing_layers.end ()) { - routing_layers.push_back (b->first); - } - } - if (routing_layers.size () == 2) { via_desc.m1 = routing_layers[0]; via_desc.m2 = routing_layers[1]; @@ -586,22 +637,20 @@ LEFImporter::read_viadef (Layout &layout) { std::string n = get (); - // produce a cell for vias - std::string cellname = options ().via_cellname_prefix () + n; - db::Cell &cell = layout.cell (layout.add_cell (cellname.c_str ())); - reader_state ()->register_via_cell (n, &cell); - ViaDesc &via_desc = m_vias[n]; - via_desc.cell = &cell; while (test ("DEFAULT") || test ("TOPOFSTACKONLY")) ; test (";"); if (test ("VIARULE")) { - read_viadef_by_rule (layout, cell, via_desc, n); + std::auto_ptr vg (new RuleBasedViaGenerator ()); + read_viadef_by_rule (vg.get (), via_desc, n, layout.dbu ()); + reader_state ()->register_via_cell (n, vg.release ()); } else { - read_viadef_by_geometry (layout, cell, via_desc, n); + std::auto_ptr vg (new GeometryBasedViaGenerator ()); + read_viadef_by_geometry (vg.get (), via_desc, n, layout.dbu ()); + reader_state ()->register_via_cell (n, vg.release ()); } test ("VIA"); @@ -637,6 +686,12 @@ LEFImporter::read_layer (Layout & /*layout*/) } expect (";"); + } else if (test ("MASK")) { + + unsigned int num = (unsigned int) std::max (1l, get_long ()); + test (";"); + m_num_masks [ln] = num; + } else if (test ("WIDTH")) { w = get_double (); @@ -880,6 +935,11 @@ LEFImporter::read_macro (Layout &layout) read_geometries (layout, cell, Obstructions); expect ("END"); + } else if (test ("FIXEDMASK")) { + + // we do actually expect FIXEDMASK to be the case always. + expect (";"); + } else { while (! test (";")) { take (); diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.h b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.h index 859ceef54..b1f75eb60 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.h +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.h @@ -44,7 +44,7 @@ namespace db * @brief The LEF importer object */ class DB_PLUGIN_PUBLIC LEFImporter - : public LEFDEFImporter + : public LEFDEFImporter, public LEFDEFNumberOfMasks { public: /** @@ -107,6 +107,15 @@ public: return m_cut_layers.find (layer) != m_cut_layers.end (); } + /** + * @brief Returns the number of masks for the given layer + */ + virtual unsigned int number_of_masks (const std::string &layer) const + { + std::map::const_iterator nm = m_num_masks.find (layer); + return nm != m_num_masks.end () ? nm->second : 1; + } + /** * @brief Gets a map of the vias defined in this LEF file * @@ -129,13 +138,14 @@ private: std::map m_macro_bboxes_by_name; std::map m_vias; std::set m_routing_layers, m_cut_layers; + std::map m_num_masks; std::vector get_iteration (db::Layout &layout); void read_geometries (db::Layout &layout, db::Cell &cell, LayerPurpose purpose, std::map *collect_bboxes = 0, properties_id_type prop_id = 0); void read_nondefaultrule (Layout &layout); void read_viadef (Layout &layout); - void read_viadef_by_rule (Layout &layout, db::Cell &cell, ViaDesc &desc, const std::string &n); - void read_viadef_by_geometry (Layout &layout, db::Cell &cell, ViaDesc &desc, const std::string &n); + void read_viadef_by_rule (RuleBasedViaGenerator *vg, ViaDesc &desc, const std::string &n, double dbu); + void read_viadef_by_geometry (GeometryBasedViaGenerator *vg, ViaDesc &desc, const std::string &n, double dbu); void read_layer (Layout &layout); void read_macro (Layout &layout); }; From a9719ad78e1859510035438064c76100e8ba4103 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sat, 25 Jul 2020 22:54:25 +0200 Subject: [PATCH 054/121] WIP: bug fixing. --- .../lefdef/db_plugin/dbDEFImporter.cc | 6 ++--- .../lefdef/db_plugin/dbLEFDEFImporter.cc | 25 +++++++++++++++++-- .../lefdef/db_plugin/dbLEFDEFImporter.h | 4 ++- .../lefdef/db_plugin/dbLEFImporter.cc | 2 +- 4 files changed, 30 insertions(+), 7 deletions(-) diff --git a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc index 149bb8b05..0a9863f07 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc @@ -982,7 +982,7 @@ DEFImporter::read_vias (db::Layout & /*layout*/, db::Cell & /*design*/, double s std::string ln = get (); - if (m_lef_importer.is_routing_layer (ln) && seen_layers.find (ln) != seen_layers.end ()) { + if (m_lef_importer.is_routing_layer (ln) && seen_layers.find (ln) == seen_layers.end ()) { seen_layers.insert (ln); routing_layers.push_back (ln); } @@ -1004,7 +1004,7 @@ DEFImporter::read_vias (db::Layout & /*layout*/, db::Cell & /*design*/, double s std::string ln = get (); - if (m_lef_importer.is_routing_layer (ln) && seen_layers.find (ln) != seen_layers.end ()) { + if (m_lef_importer.is_routing_layer (ln) && seen_layers.find (ln) == seen_layers.end ()) { seen_layers.insert (ln); routing_layers.push_back (ln); } @@ -1015,7 +1015,7 @@ DEFImporter::read_vias (db::Layout & /*layout*/, db::Cell & /*design*/, double s } db::Polygon poly; - read_polygon (poly, scale); + read_rect (poly, scale); geo_based_vg->add_polygon (ln, poly, mask); } diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc index 431a002ce..5076365e2 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc @@ -245,7 +245,7 @@ GeometryBasedViaGenerator::GeometryBasedViaGenerator () void GeometryBasedViaGenerator::create_cell (LEFDEFReaderState &reader, Layout &layout, db::Cell &cell, unsigned int /*mask_bottom*/, unsigned int /*mask_cut*/, unsigned int /*mask_top*/, const LEFDEFNumberOfMasks * /*nm*/) { - for (std::map > >::const_iterator g = m_geometries.begin (); g != m_geometries.end (); ++g) { + for (std::map > >::const_iterator g = m_polygons.begin (); g != m_polygons.end (); ++g) { for (std::list >::const_iterator i = g->second.begin (); i != g->second.end (); ++i) { @@ -259,12 +259,33 @@ GeometryBasedViaGenerator::create_cell (LEFDEFReaderState &reader, Layout &layou } } + + for (std::map > >::const_iterator g = m_boxes.begin (); g != m_boxes.end (); ++g) { + + for (std::list >::const_iterator i = g->second.begin (); i != g->second.end (); ++i) { + + std::pair dl (false, 0); + + dl = reader.open_layer (layout, g->first, ViaGeometry, i->first); + if (dl.first) { + cell.shapes (dl.second).insert (i->second); + } + + } + + } } void GeometryBasedViaGenerator::add_polygon (const std::string &ln, const db::Polygon &poly, unsigned int mask) { - m_geometries [ln].push_back (std::make_pair (mask, poly)); + m_polygons [ln].push_back (std::make_pair (mask, poly)); +} + +void +GeometryBasedViaGenerator::add_box (const std::string &ln, const db::Box &box, unsigned int mask) +{ + m_boxes [ln].push_back (std::make_pair (mask, box)); } // ----------------------------------------------------------------------------------- diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h index d0c298328..c98b72f1c 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h @@ -925,9 +925,11 @@ public: virtual void create_cell (LEFDEFReaderState &reader, Layout &layout, db::Cell &cell, unsigned int mask_bottom, unsigned int mask_cut, unsigned int mask_top, const LEFDEFNumberOfMasks *num_cut_masks); void add_polygon (const std::string &ln, const db::Polygon &poly, unsigned int mask); + void add_box (const std::string &ln, const db::Box &box, unsigned int mask); private: - std::map > > m_geometries; + std::map > > m_polygons; + std::map > > m_boxes; }; /** diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc index 003826ccb..c5297c4ca 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc @@ -607,7 +607,7 @@ LEFImporter::read_viadef_by_geometry (GeometryBasedViaGenerator *vg, ViaDesc &vi } db::Box b (points [0], points [1]); - vg->add_polygon (layer_name, db::Polygon (b), mask); + vg->add_box (layer_name, b, mask); expect (";"); From 97468ffa0e1303fb7cb6c6d45d23fc208de6d8a5 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sat, 25 Jul 2020 23:06:14 +0200 Subject: [PATCH 055/121] unused vias are not generated anymore - golden layouts updated. --- testdata/lefdef/foreigncell/au.oas.gz | Bin 800 -> 1470 bytes .../foreigncell/au_always_foreign.oas.gz | Bin 800 -> 1470 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/testdata/lefdef/foreigncell/au.oas.gz b/testdata/lefdef/foreigncell/au.oas.gz index 4aedac249c507b214180efbde321268f6487f6fb..6ebdd5e9c69135870cbebc42463a4d6b019449ae 100644 GIT binary patch literal 1470 zcmd^9OKTHR7@hClnPeu(+%#8k6}Md`vtD5XpBPLjT`{sFz4d+xd4`R07*!dyy( zhQe23J&ABav;g*XdzoD`b8@+)^9gOJC#faEgV9jG7LKZ+!BAYg7w%VY^Q=pBHLr)G zXBD_4OF~m)iq;p3L~OR~bWzVu7Seh?Uow+~HrSuglz2=D#nn->{Z6E3G&ZbieKGot zq$-%EQt9HfueJMIdq5B(;oe|xs+3C$?TTF1pOrm9_dqNjq7MCT;hZ98rwe7Rkebrz zMX8+8jI&#i6gi)It`|MQ`;Gn9HUCxrgkV$Tsnnz=*xBjr_6co@oGU!hizTYfrt&3S zuqyJyT&mP45bTPaE6VHJIUQux^sPY{v(vm<}(iu!;=DEAGJxO0J@X zhF}(Goo$<6fcIFL#|yB-S79E%!)nd6!AV}=XCWiq^~jQkp_R^Ueui6ym)shn7Ai1S zhc&bWBg=3AhLi883Ol$?n}X#?=uvi&K{zcLt5cS&y5$$9y`*DzH7brDo7;nZ+G`H) z(20JsBGXEyohH-q*JLnjtH26+!Kq82R$!eDxMp5K|5g;(QHM`xAB)IQr~jGPSmYda z{1HC0BJ0>gKhRgJ$UC;o8+MnQ;lWPJ*nv&#x%0IX$_{$nyj^cE^E4}fi%^me%)FTPd(Hk9y~}1rHI!40YOWVQuNZ37cb(Wc<>O4 zcoZk;HdfR>pmTYjdFFi{-Vc~Pxny5zf2J#!%BexXu>&UeIlyf_5q)RQ>FXMFa;e__ zWVe&*x0AietaCQiZJ!iLM2&1bpXvWoLPQVd96Mtpg)Adqz2@eN z<>3}l`h{QyUZLRRZ*4f5M_SBPpElD5GNReZ)gECo0EV1&tVW1NZRSbpm{ z_UG0*FAblwMX!3Uip`DK}sO!`bKgL%v;EhH0W zWn!VhZ6X=<#c+Tzev|`j$LUmm67OT=){6>}ZxEuG63SD72B=6S8l*B+s7fgf(QQ=I zJNF`@PvfUBg$LK+{2O#}U>0id6h7hwc!cNSA-*^VJtwU4x(VVW4C$w%h92cuX84mh&M&|{ zei^Y6YH+>|%V-`37T_B+DtU`$VGY-rDFj=>sP!2&h;VR74ja1c1;1nFrT?sMj)}8B zi(7}U%xem-u>!vkmGdXFolU0guam(c}WAfFI eO2Qv_PEpnHgb8k6}Md`vtD5XpBPLjT`{sFz4d+xd4`R07*!dyy( zhQe23J&ABav;g*XdzoD`b8@+)^9gOJC#faEgV9jG7LKZ+!BAYg7w%VY^Q=pBHLr)G zXBD_4OF~m)iq;p3L~OR~bWzVu7Seh?Uow+~HrSuglz2=D#nn->{Z6E3G&ZbieKGot zq$-%EQt9HfueJMIdq5B(;oe|xs+3C$?TTF1pOrm9_dqNjq7MCT;hZ98rwe7Rkebrz zMX8+8jI&#i6gi)It`|MQ`;Gn9HUCxrgkV$Tsnnz=*xBjr_6co@oGU!hizTYfrt&3S zuqyJyT&mP45bTPaE6VHJIUQux^sPY{v(vm<}(iu!;=DEAGJxO0J@X zhF}(Goo$<6fcIFL#|yB-S79E%!)nd6!AV}=XCWiq^~jQkp_R^Ueui6ym)shn7Ai1S zhc&bWBg=3AhLi883Ol$?n}X#?=uvi&K{zcLt5cS&y5$$9y`*DzH7brDo7;nZ+G`H) z(20JsBGXEyohH-q*JLnjtH26+!Kq82R$!eDxMp5K|5g;(QHM`xAB)IQr~jGPSmYda z{1HC0BJ0>gKhRgJ$UC;o8+MnQ;lWPJ*nv&#x%0IX$_{$nyj^cE^E4}fi%^me%)FTPd(Hk9y~}1rHI!40YOWVQuNZ37cb(Wc<>O4 zcoZk;HdfR>pmTYjdFFi{-Vc~Pxny5zf2J#!%BexXu>&UeIlyf_5q)RQ>FXMFa;e__ zWVe&*x0AietaCQiZJ!iLM2&1bpXvWoLPQVd96Mtpg)Adqz2@eN z<>3}l`h{QyUZLRRZ*4f5M_SBPpElD5GNReZ)gECo0EV1&tVW1NZRSbpm{ z_UG0*FAblwMX!3Uip`DK}sO!`bKgL%v;EhH0W zWn!VhZ6X=<#c+Tzev|`j$LUmm67OT=){6>}ZxEuG63SD72B=6S8l*B+s7fgf(QQ=I zJNF`@PvfUBg$LK+{2O#}U>0id6h7hwc!cNSA-*^VJtwU4x(VVW4C$w%h92cuX84mh&M&|{ zei^Y6YH+>|%V-`37T_B+DtU`$VGY-rDFj=>sP!2&h;VR74ja1c1;1nFrT?sMj)}8B zi(7}U%xem-u>!vkmGdXFolU0guam(c}WAfFI eO2Qv_PEpnHgb Date: Sat, 25 Jul 2020 23:23:57 +0200 Subject: [PATCH 056/121] unused vias are not generated anymore - golden layouts updated. --- .../lefdef/db_plugin/dbLEFImporter.cc | 29 +++++++++++------- .../lefdef/unit_tests/dbLEFDEFImportTests.cc | 2 +- testdata/lefdef/via_properties/au.oas.gz | Bin 476 -> 525 bytes 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc index c5297c4ca..fde75516e 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc @@ -169,7 +169,7 @@ LEFImporter::read_geometries (db::Layout &layout, db::Cell &cell, LayerPurpose p if (test ("CLASS")) { // accept CLASS token for PORT definitions - while (! test (";")) { + while (! at_end () && ! test (";")) { take (); } @@ -183,7 +183,7 @@ LEFImporter::read_geometries (db::Layout &layout, db::Cell &cell, LayerPurpose p w = dw->second.first; } - while (! test (";")) { + while (! at_end () && ! test (";")) { take (); } @@ -418,7 +418,7 @@ LEFImporter::read_nondefaultrule (db::Layout & /*layout*/) test (";"); m_nondefault_widths[n][l] = std::make_pair (w, w); } else { - while (! test (";")) { + while (! at_end () && ! test (";")) { take (); } } @@ -528,7 +528,7 @@ LEFImporter::read_viadef_by_rule (RuleBasedViaGenerator *vg, ViaDesc &via_desc, } else { - while (! test (";")) { + while (! at_end () && ! test (";")) { take (); } @@ -561,7 +561,7 @@ LEFImporter::read_viadef_by_geometry (GeometryBasedViaGenerator *vg, ViaDesc &vi routing_layers.push_back (layer_name); } - while (! test (";")) { + while (! at_end () && ! test (";")) { take (); } @@ -611,6 +611,13 @@ LEFImporter::read_viadef_by_geometry (GeometryBasedViaGenerator *vg, ViaDesc &vi expect (";"); + } else if (test ("PROPERTY")) { + + // skip properties + while (! at_end () && ! test (";")) { + take (); + } + } else { // stop at unknown token break; @@ -726,7 +733,7 @@ LEFImporter::read_layer (Layout & /*layout*/) take (); } } - while (! test (";")) { + while (! at_end () && ! test (";")) { take (); } @@ -767,7 +774,7 @@ LEFImporter::read_layer (Layout & /*layout*/) } else { - while (! test (";")) { + while (! at_end () && ! test (";")) { take (); } @@ -886,7 +893,7 @@ LEFImporter::read_macro (Layout &layout) expect ("END"); } else { - while (! test (";")) { + while (! at_end () && ! test (";")) { take (); } } @@ -941,7 +948,7 @@ LEFImporter::read_macro (Layout &layout) expect (";"); } else { - while (! test (";")) { + while (! at_end () && ! test (";")) { take (); } } @@ -1047,7 +1054,7 @@ LEFImporter::do_read (db::Layout &layout) /* dbu_mic = */ get_double (); expect (";"); } else { - while (! test (";")) { + while (! at_end () && ! test (";")) { take (); } } @@ -1109,7 +1116,7 @@ LEFImporter::do_read (db::Layout &layout) read_macro (layout); } else { - while (! test (";")) { + while (! at_end () && ! test (";")) { take (); } } diff --git a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc index efd68ffa1..50fcb5341 100644 --- a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc +++ b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc @@ -392,6 +392,6 @@ TEST(111_mapfile) TEST(112_via_properties) { - run_test (_this, "via_properties", "lef:in.lef", "au.oas.gz", default_options (), false); + run_test (_this, "via_properties", "lef:in.lef+def:in.def", "au.oas.gz", default_options (), false); } diff --git a/testdata/lefdef/via_properties/au.oas.gz b/testdata/lefdef/via_properties/au.oas.gz index d6551998c1ddf76dfab4e905cb9b4c094ef7a7de..e86ce559a53e3d3f8d1c0668ef9c587d271bfa4f 100644 GIT binary patch delta 130 zcmcb^+{-c{&zvJUBeNjBB)@{Of-x);b!*_4e{~xb7f{>X5c|^CQdgp z=Vk$^VP*nKz*)SEBGrrxZas|dy^JD^%p#pk?z{|w2N*?evoM@sJPCwM6CeJZ_<@Cq GfdK&FP9Zb^ delta 82 zcmeBWxx+jmPm?Rm(=om*Gtn^Kgc*s=%>oi*W@2XGfwCqpH4@=v5V_67;O6cwqRH69 V*vlxw$jmfZkntC5Lqh`t0|11s6es`y From 5c7862d8cd70eecfb8b19a5e1430efa283a3d065 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sat, 25 Jul 2020 23:28:38 +0200 Subject: [PATCH 057/121] Bugfix, update of golden data. --- src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc index 5076365e2..6048dde9d 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc @@ -651,10 +651,9 @@ LEFDEFReaderOptions::special_routing_datatype_str () const // LEFDEFLayerDelegate implementation LEFDEFReaderState::LEFDEFReaderState (const LEFDEFReaderOptions *tc, db::Layout &layout, const std::string &base_path) - : m_create_layers (true), m_laynum (1), mp_tech_comp (tc) + : m_create_layers (true), m_has_explicit_layer_mapping (false), m_laynum (1), mp_tech_comp (tc) { - m_has_explicit_layer_mapping = ! tc->map_file ().empty (); - if (m_has_explicit_layer_mapping) { + if (! tc->map_file ().empty ()) { read_map_file (correct_path (tc->map_file (), layout, base_path), layout); @@ -697,7 +696,7 @@ LEFDEFReaderState::map_layer_explicit (const std::string &n, LayerPurpose purpos void LEFDEFReaderState::read_map_file (const std::string &path, db::Layout &layout) { - tl_assert (m_has_explicit_layer_mapping); + m_has_explicit_layer_mapping = true; tl::log << tl::to_string (tr ("Reading LEF/DEF map file")) << " " << path; From d069dde98e4dd544329c36d325b843ce286b9c15 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Mon, 27 Jul 2020 23:13:15 +0200 Subject: [PATCH 058/121] WIP: first test case for mask support - needs testing. --- .../lefdef/db_plugin/dbDEFImporter.cc | 136 +++++--- .../lefdef/db_plugin/dbLEFDEFImporter.cc | 84 +++-- .../lefdef/db_plugin/dbLEFDEFImporter.h | 6 + .../lefdef/db_plugin/dbLEFImporter.cc | 18 +- .../lefdef/unit_tests/dbLEFDEFImportTests.cc | 19 ++ .../unit_tests/dbLEFDEFReaderOptionsTests.cc | 323 ++++++++++++++++++ .../lefdef/unit_tests/unit_tests.pro | 3 +- testdata/lefdef/masks-1/au.oas.gz | Bin 0 -> 1162 bytes testdata/lefdef/masks-1/in.def | 32 ++ testdata/lefdef/masks-1/in_tech.lef | 32 ++ 10 files changed, 564 insertions(+), 89 deletions(-) create mode 100644 src/plugins/streamers/lefdef/unit_tests/dbLEFDEFReaderOptionsTests.cc create mode 100644 testdata/lefdef/masks-1/au.oas.gz create mode 100644 testdata/lefdef/masks-1/in.def create mode 100644 testdata/lefdef/masks-1/in_tech.lef diff --git a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc index 0a9863f07..580615738 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc @@ -142,7 +142,7 @@ DEFImporter::read_diearea (db::Layout &layout, db::Cell &design, double scale) { std::vector points; - while (! test (";")) { + while (! at_end () && ! test (";")) { test ("("); points.push_back (get_point (scale)); test (")"); @@ -276,7 +276,7 @@ DEFImporter::read_blockages (db::Layout &layout, db::Cell &design, double scale) std::string layer; - while (! test (";")) { + while (! at_end () && ! test (";")) { if (test ("PLACEMENT")) { @@ -570,23 +570,25 @@ DEFImporter::read_single_net (std::string &nondefaultrule, Layout &layout, db::C } else if (peek ("(")) { + unsigned int new_mask = mask; + while (peek ("(") || peek ("MASK")) { + new_mask = 0; if (test ("MASK")) { - unsigned int m = get_mask (get_long ()); - if (m != mask) { - // stop here with the segments and use the mask value for the next iteration - mask = m; - read_mask = false; + + new_mask = get_mask (get_long ()); + read_mask = false; + + if (! peek ("(")) { + break; + } else if (new_mask != mask) { break; } + } - if (! test ("(")) { - // We have a via here. MASK is already read, but the value did not change. - read_mask = false; - break; - } + test ("("); if (! test ("*")) { x = get_double (); @@ -613,6 +615,13 @@ DEFImporter::read_single_net (std::string &nondefaultrule, Layout &layout, db::C } } + // continue a segment with the current point and the new mask + if (pts.size () > 1) { + pts.erase (pts.begin (), pts.end () - 1); + } + + mask = new_mask; + } else if (! peek ("NEW") && ! peek ("+") && ! peek ("-") && ! peek (";")) { // indicates a via @@ -661,10 +670,16 @@ DEFImporter::read_single_net (std::string &nondefaultrule, Layout &layout, db::C if (ln == vd->second.m1) { ln = vd->second.m2; + mask = mask_top; } else if (ln == vd->second.m2) { ln = vd->second.m1; + mask = mask_bottom; + } else { + mask = 0; } + read_mask = false; + } if (! specialnets) { @@ -890,6 +905,8 @@ DEFImporter::read_vias (db::Layout & /*layout*/, db::Cell & /*design*/, double s while (test ("+")) { + bool is_polygon = false; + if (test ("VIARULE")) { if (! rule_based_vg.get ()) { @@ -974,7 +991,7 @@ DEFImporter::read_vias (db::Layout & /*layout*/, db::Cell & /*design*/, double s vd.m1 = bn; vd.m2 = tn; - } else if (test ("POLYGON")) { + } else if ((is_polygon = test ("POLYGON")) || test ("RECT")) { if (! geo_based_vg.get ()) { geo_based_vg.reset (new GeometryBasedViaGenerator ()); @@ -982,9 +999,23 @@ DEFImporter::read_vias (db::Layout & /*layout*/, db::Cell & /*design*/, double s std::string ln = get (); - if (m_lef_importer.is_routing_layer (ln) && seen_layers.find (ln) == seen_layers.end ()) { - seen_layers.insert (ln); - routing_layers.push_back (ln); + if (m_lef_importer.is_routing_layer (ln)) { + + if (routing_layers.size () == 0) { + geo_based_vg->set_bottom_layer (ln); + } else if (routing_layers.size () == 1) { + geo_based_vg->set_top_layer (ln); + } + + if (seen_layers.find (ln) == seen_layers.end ()) { + seen_layers.insert (ln); + routing_layers.push_back (ln); + } + + } else if (m_lef_importer.is_cut_layer (ln)) { + + geo_based_vg->set_cut_layer (ln); + } if (test ("+")) { @@ -992,32 +1023,20 @@ DEFImporter::read_vias (db::Layout & /*layout*/, db::Cell & /*design*/, double s mask = get_mask (get_long ()); } - db::Polygon poly; - read_polygon (poly, scale); - geo_based_vg->add_polygon (ln, poly, mask); + if (is_polygon) { - } else if (test ("RECT")) { + db::Polygon poly; + read_polygon (poly, scale); + geo_based_vg->add_polygon (ln, poly, mask); + + } else { + + db::Polygon poly; + read_rect (poly, scale); + geo_based_vg->add_polygon (ln, poly, mask); - if (! geo_based_vg.get ()) { - geo_based_vg.reset (new GeometryBasedViaGenerator ()); } - std::string ln = get (); - - if (m_lef_importer.is_routing_layer (ln) && seen_layers.find (ln) == seen_layers.end ()) { - seen_layers.insert (ln); - routing_layers.push_back (ln); - } - - if (test ("+")) { - expect ("MASK"); - mask = get_mask (get_long ()); - } - - db::Polygon poly; - read_rect (poly, scale); - geo_based_vg->add_polygon (ln, poly, mask); - } } @@ -1058,9 +1077,8 @@ DEFImporter::read_pins (db::Layout &layout, db::Cell &design, double scale) std::string net; std::string dir; - std::map > geometry; + std::map , std::vector > geometry; db::Trans trans; - unsigned int mask = 0; while (test ("+")) { @@ -1074,6 +1092,11 @@ DEFImporter::read_pins (db::Layout &layout, db::Cell &design, double scale) std::string ln = get (); + unsigned int mask = 0; + if (test ("MASK")) { + mask = get_mask (get_long ()); + } + while (test ("DESIGNRULEWIDTH") || test ("SPACING")) { take (); } @@ -1086,12 +1109,17 @@ DEFImporter::read_pins (db::Layout &layout, db::Cell &design, double scale) db::Point pt2 = get_point (scale); test (")"); - geometry.insert (std::make_pair (ln, std::vector ())).first->second.push_back (db::Polygon (db::Box (pt1, pt2))); + geometry.insert (std::make_pair (std::make_pair (ln, mask), std::vector ())).first->second.push_back (db::Polygon (db::Box (pt1, pt2))); } else if (test ("POLYGON")) { std::string ln = get (); + unsigned int mask = 0; + if (test ("MASK")) { + mask = get_mask (get_long ()); + } + while (test ("DESIGNRULEWIDTH") || test ("SPACING")) { take (); } @@ -1100,7 +1128,7 @@ DEFImporter::read_pins (db::Layout &layout, db::Cell &design, double scale) double x = 0.0, y = 0.0; - while (! test ("+") && ! test (";")) { + while (! at_end () && ! test ("+") && ! test (";")) { test ("("); if (! test ("*")) { @@ -1114,7 +1142,7 @@ DEFImporter::read_pins (db::Layout &layout, db::Cell &design, double scale) } - std::vector &polygons = geometry.insert (std::make_pair (ln, std::vector ())).first->second; + std::vector &polygons = geometry.insert (std::make_pair (std::make_pair (ln, mask), std::vector ())).first->second; polygons.push_back (db::Polygon ()); polygons.back ().assign_hull (points.begin (), points.end ()); @@ -1131,6 +1159,11 @@ DEFImporter::read_pins (db::Layout &layout, db::Cell &design, double scale) flush = true; + } else if (test ("VIA")) { + + // TODO: implement + error (tl::to_string (tr ("VIA not supported on pins currently"))); + } else { while (! peek ("+") && ! peek ("-") && ! peek (";")) { take (); @@ -1149,9 +1182,9 @@ DEFImporter::read_pins (db::Layout &layout, db::Cell &design, double scale) */ // Produce geometry collected so far - for (std::map >::const_iterator g = geometry.begin (); g != geometry.end (); ++g) { + for (std::map, std::vector >::const_iterator g = geometry.begin (); g != geometry.end (); ++g) { - std::pair dl = open_layer (layout, g->first, Pins, mask); + std::pair dl = open_layer (layout, g->first.first, Pins, g->first.second); if (dl.first) { db::properties_id_type prop_id = 0; @@ -1172,7 +1205,7 @@ DEFImporter::read_pins (db::Layout &layout, db::Cell &design, double scale) } - dl = open_layer (layout, g->first, Label, 0); + dl = open_layer (layout, g->first.first, Label, 0); if (dl.first) { db::Box bbox; if (! g->second.empty ()) { @@ -1208,7 +1241,7 @@ DEFImporter::read_styles (double scale) double x = 0.0, y = 0.0; - while (! test (";")) { + while (! at_end () && ! test (";")) { test ("("); if (! test ("*")) { @@ -1433,6 +1466,13 @@ DEFImporter::do_read (db::Layout &layout) expect ("END"); expect ("STYLES"); + } else if (test ("COMPONENTMASKSHIFT")) { + + warn (tl::to_string (tr ("Component mask shift not supported currently"))); + while (! at_end () && ! test (";")) { + take (); + } + } else if (test ("COMPONENTS")) { get_long (); @@ -1454,7 +1494,7 @@ DEFImporter::do_read (db::Layout &layout) expect ("PINS"); } else { - while (! test (";")) { + while (! at_end () && ! test (";")) { take (); } } diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc index 6048dde9d..4b33bd657 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc @@ -242,37 +242,41 @@ GeometryBasedViaGenerator::GeometryBasedViaGenerator () : LEFDEFViaGenerator () { } +unsigned int +GeometryBasedViaGenerator::mask_for (const std::string &ln, unsigned int m, unsigned int mask_bottom, unsigned int mask_cut, unsigned int mask_top) const +{ + if (m == 0) { + if (ln == m_bottom_layer) { + return (mask_bottom); + } else if (ln == m_cut_layer) { + return (mask_cut); + } else if (ln == m_top_layer) { + return (mask_top); + } + } + + return m; +} + void -GeometryBasedViaGenerator::create_cell (LEFDEFReaderState &reader, Layout &layout, db::Cell &cell, unsigned int /*mask_bottom*/, unsigned int /*mask_cut*/, unsigned int /*mask_top*/, const LEFDEFNumberOfMasks * /*nm*/) +GeometryBasedViaGenerator::create_cell (LEFDEFReaderState &reader, Layout &layout, db::Cell &cell, unsigned int mask_bottom, unsigned int mask_cut, unsigned int mask_top, const LEFDEFNumberOfMasks * /*nm*/) { for (std::map > >::const_iterator g = m_polygons.begin (); g != m_polygons.end (); ++g) { - for (std::list >::const_iterator i = g->second.begin (); i != g->second.end (); ++i) { - - std::pair dl (false, 0); - - dl = reader.open_layer (layout, g->first, ViaGeometry, i->first); + std::pair dl = reader.open_layer (layout, g->first, ViaGeometry, mask_for (g->first, i->first, mask_bottom, mask_cut, mask_top)); if (dl.first) { cell.shapes (dl.second).insert (i->second); } - } - } for (std::map > >::const_iterator g = m_boxes.begin (); g != m_boxes.end (); ++g) { - for (std::list >::const_iterator i = g->second.begin (); i != g->second.end (); ++i) { - - std::pair dl (false, 0); - - dl = reader.open_layer (layout, g->first, ViaGeometry, i->first); + std::pair dl = reader.open_layer (layout, g->first, ViaGeometry, mask_for (g->first, i->first, mask_bottom, mask_cut, mask_top)); if (dl.first) { cell.shapes (dl.second).insert (i->second); } - } - } } @@ -433,7 +437,7 @@ static void set_datatypes (db::LEFDEFReaderOptions *data, void (db::LEFDEFReader if (ex.try_read (mask) && ex.test (":")) { int dt = 0; ex.read (dt); - (data->*set_datatype_per_mask) (std::max ((unsigned int) 1, mask) - 1, dt); + (data->*set_datatype_per_mask) (std::max ((unsigned int) 1, mask), dt); } else { ex = ex_saved; int dt = 0; @@ -464,7 +468,7 @@ static void set_suffixes (db::LEFDEFReaderOptions *data, void (db::LEFDEFReaderO if (ex.try_read (mask) && ex.test (":")) { std::string sfx; ex.read_word_or_quoted (sfx); - (data->*set_suffix_per_mask) (std::max ((unsigned int) 1, mask) - 1, sfx); + (data->*set_suffix_per_mask) (std::max ((unsigned int) 1, mask), sfx); } else { ex = ex_saved; std::string sfx; @@ -495,7 +499,7 @@ static std::string get_datatypes (const db::LEFDEFReaderOptions *data, int (db:: if (! res.empty ()) { res += ","; } - res += tl::to_string (i + 1); + res += tl::to_string (i); res += ":"; res += tl::to_string (dt); } @@ -518,7 +522,7 @@ static std::string get_suffixes (const db::LEFDEFReaderOptions *data, const std: if (! res.empty ()) { res += ","; } - res += tl::to_string (i + 1); + res += tl::to_string (i); res += ":"; res += tl::to_word_or_quoted_string (sfx); } @@ -936,47 +940,53 @@ LEFDEFReaderState::open_layer_uncached (db::Layout &layout, const std::string &n // Note: "name" is the decorated name as provided by the tech component's // x_suffix specifications. - std::string name (n); + std::string name_suffix; int dt = 0; if (mp_tech_comp) { switch (purpose) { case Routing: default: - name += mp_tech_comp->routing_suffix_per_mask (mask); - dt += mp_tech_comp->routing_datatype_per_mask (mask); + name_suffix = mp_tech_comp->routing_suffix_per_mask (mask); + dt = mp_tech_comp->routing_datatype_per_mask (mask); break; case SpecialRouting: - name += mp_tech_comp->special_routing_suffix_per_mask (mask); - dt += mp_tech_comp->special_routing_datatype_per_mask (mask); + name_suffix = mp_tech_comp->special_routing_suffix_per_mask (mask); + dt = mp_tech_comp->special_routing_datatype_per_mask (mask); break; case ViaGeometry: - name += mp_tech_comp->via_geometry_suffix_per_mask (mask); - dt += mp_tech_comp->via_geometry_datatype_per_mask (mask); + name_suffix = mp_tech_comp->via_geometry_suffix_per_mask (mask); + dt = mp_tech_comp->via_geometry_datatype_per_mask (mask); break; case Label: - name += mp_tech_comp->labels_suffix (); - dt += mp_tech_comp->labels_datatype (); + name_suffix = mp_tech_comp->labels_suffix (); + dt = mp_tech_comp->labels_datatype (); break; case Pins: - name += mp_tech_comp->pins_suffix_per_mask (mask); - dt += mp_tech_comp->pins_datatype_per_mask (mask); + name_suffix = mp_tech_comp->pins_suffix_per_mask (mask); + dt = mp_tech_comp->pins_datatype_per_mask (mask); break; case LEFPins: - name += mp_tech_comp->lef_pins_suffix_per_mask (mask); - dt += mp_tech_comp->lef_pins_datatype_per_mask (mask); + name_suffix = mp_tech_comp->lef_pins_suffix_per_mask (mask); + dt = mp_tech_comp->lef_pins_datatype_per_mask (mask); break; case Obstructions: - name += mp_tech_comp->obstructions_suffix (); - dt += mp_tech_comp->obstructions_datatype (); + name_suffix = mp_tech_comp->obstructions_suffix (); + dt = mp_tech_comp->obstructions_datatype (); break; case Blockage: - name += mp_tech_comp->blockages_suffix (); - dt += mp_tech_comp->blockages_datatype (); + name_suffix = mp_tech_comp->blockages_suffix (); + dt = mp_tech_comp->blockages_datatype (); break; } } + if (dt > 0 && name_suffix.empty ()) { + name_suffix = "#" + tl::to_string (dt); + } + + std::string name = n + name_suffix; + std::pair ll = m_layer_map.logical (name, layout); if (ll.first) { @@ -1120,7 +1130,7 @@ LEFDEFReaderState::via_cell (const std::string &vn, db::Layout &layout, unsigned std::string cn = mp_tech_comp->via_cellname_prefix () + vn + mask_suffix; cell = &layout.cell (layout.add_cell (cn.c_str ())); - vg->create_cell (*this, layout, *cell, mask_bottom, mask_cut, mask_bottom, nm); + vg->create_cell (*this, layout, *cell, mask_bottom, mask_cut, mask_top, nm); } diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h index c98b72f1c..65d2c0e6c 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h @@ -926,10 +926,16 @@ public: void add_polygon (const std::string &ln, const db::Polygon &poly, unsigned int mask); void add_box (const std::string &ln, const db::Box &box, unsigned int mask); + void set_bottom_layer (const std::string &ln) { m_bottom_layer = ln; } + void set_cut_layer (const std::string &ln) { m_cut_layer = ln; } + void set_top_layer (const std::string &ln) { m_top_layer = ln; } private: std::map > > m_polygons; std::map > > m_boxes; + std::string m_bottom_layer, m_cut_layer, m_top_layer; + + unsigned int mask_for (const std::string &ln, unsigned int m, unsigned int mask_bottom, unsigned int mask_cut, unsigned int mask_top) const; }; /** diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc index fde75516e..a3da23ab1 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc @@ -556,9 +556,21 @@ LEFImporter::read_viadef_by_geometry (GeometryBasedViaGenerator *vg, ViaDesc &vi layer_name = get (); - if (m_routing_layers.find (layer_name) != m_routing_layers.end () && seen_layers.find (layer_name) == seen_layers.end ()) { - seen_layers.insert (layer_name); - routing_layers.push_back (layer_name); + if (m_routing_layers.find (layer_name) != m_routing_layers.end ()) { + + if (routing_layers.size () == 0) { + vg->set_bottom_layer (layer_name); + } else if (routing_layers.size () == 1) { + vg->set_top_layer (layer_name); + } + + if (seen_layers.find (layer_name) == seen_layers.end ()) { + seen_layers.insert (layer_name); + routing_layers.push_back (layer_name); + } + + } else { + vg->set_cut_layer (layer_name); } while (! at_end () && ! test (";")) { diff --git a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc index 50fcb5341..ba4d649ac 100644 --- a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc +++ b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc @@ -395,3 +395,22 @@ TEST(112_via_properties) run_test (_this, "via_properties", "lef:in.lef+def:in.def", "au.oas.gz", default_options (), false); } +TEST(113_masks_1) +{ + db::LEFDEFReaderOptions options = default_options (); + options.set_routing_suffix (""); + options.set_routing_datatype_per_mask (1, 100); + options.set_routing_datatype_per_mask (2, 200); + options.set_special_routing_suffix (""); + options.set_special_routing_datatype_per_mask (1, 101); + options.set_special_routing_datatype_per_mask (2, 201); + options.set_via_geometry_suffix (""); + options.set_via_geometry_datatype_per_mask (1, 102); + options.set_via_geometry_datatype_per_mask (2, 202); + options.set_pins_suffix (""); + options.set_pins_datatype_per_mask (1, 110); + options.set_pins_datatype_per_mask (2, 210); + + run_test (_this, "masks-1", "lef:in_tech.lef+def:in.def", "au.oas.gz", options, false); +} + diff --git a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFReaderOptionsTests.cc b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFReaderOptionsTests.cc new file mode 100644 index 000000000..7862352bc --- /dev/null +++ b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFReaderOptionsTests.cc @@ -0,0 +1,323 @@ + +/* + + KLayout Layout Viewer + Copyright (C) 2006-2020 Matthias Koefferlein + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +*/ + +#include "dbLEFDEFImporter.h" + +#include "tlUnitTest.h" + +#include + +TEST(1) +{ + db::LEFDEFReaderOptions options; + EXPECT_EQ (options.max_mask_number (), (unsigned int) 0); + + options.set_dbu (1.5); + EXPECT_EQ (options.dbu (), 1.5); + + options.set_produce_net_names (true); + EXPECT_EQ (options.produce_net_names (), true); + options.set_produce_net_names (false); + EXPECT_EQ (options.produce_net_names (), false); + + options.set_net_property_name (tl::Variant (12)); + EXPECT_EQ (options.net_property_name ().to_string (), "12"); + + options.set_produce_inst_names (true); + EXPECT_EQ (options.produce_inst_names (), true); + options.set_produce_inst_names (false); + EXPECT_EQ (options.produce_inst_names (), false); + + options.set_inst_property_name (tl::Variant (12)); + EXPECT_EQ (options.inst_property_name ().to_string (), "12"); + + options.set_produce_pin_names (true); + EXPECT_EQ (options.produce_pin_names (), true); + options.set_produce_pin_names (false); + EXPECT_EQ (options.produce_pin_names (), false); + + options.set_pin_property_name (tl::Variant (12)); + EXPECT_EQ (options.pin_property_name ().to_string (), "12"); + + options.set_produce_cell_outlines (true); + EXPECT_EQ (options.produce_cell_outlines (), true); + options.set_produce_cell_outlines (false); + EXPECT_EQ (options.produce_cell_outlines (), false); + + options.set_cell_outline_layer ("OL"); + EXPECT_EQ (options.cell_outline_layer (), "OL"); + + options.set_produce_placement_blockages (true); + EXPECT_EQ (options.produce_placement_blockages (), true); + options.set_produce_placement_blockages (false); + EXPECT_EQ (options.produce_placement_blockages (), false); + + options.set_placement_blockage_layer ("B"); + EXPECT_EQ (options.placement_blockage_layer (), "B"); + + options.set_produce_regions (true); + EXPECT_EQ (options.produce_regions (), true); + options.set_produce_regions (false); + EXPECT_EQ (options.produce_regions (), false); + + options.set_region_layer ("R"); + EXPECT_EQ (options.region_layer (), "R"); + + + options.set_via_cellname_prefix ("VIACELL"); + EXPECT_EQ (options.via_cellname_prefix (), "VIACELL"); + + options.set_produce_via_geometry (true); + EXPECT_EQ (options.produce_via_geometry (), true); + options.set_produce_via_geometry (false); + EXPECT_EQ (options.produce_via_geometry (), false); + + options.set_via_geometry_suffix ("VIAG"); + EXPECT_EQ (options.via_geometry_suffix (), "VIAG"); + + options.set_via_geometry_datatype (17); + EXPECT_EQ (options.via_geometry_datatype (), 17); + + options.set_via_geometry_suffix_str ("VIAG, 2: VIAGM2, 1: VIAGM1"); + EXPECT_EQ (options.via_geometry_suffix_str (), "VIAG,1:VIAGM1,2:VIAGM2"); + EXPECT_EQ (options.via_geometry_suffix_per_mask (0), "VIAG"); + EXPECT_EQ (options.via_geometry_suffix_per_mask (1), "VIAGM1"); + EXPECT_EQ (options.via_geometry_suffix_per_mask (2), "VIAGM2"); + EXPECT_EQ (options.via_geometry_suffix_per_mask (3), "VIAG"); + options.set_via_geometry_suffix_per_mask (2, "AB"); + EXPECT_EQ (options.via_geometry_suffix_per_mask (2), "AB"); + EXPECT_EQ (options.max_mask_number (), (unsigned int) 2); + + options.set_via_geometry_datatype_str ("17, 2:217, 1: 117"); + EXPECT_EQ (options.via_geometry_datatype_str (), "17,1:117,2:217"); + EXPECT_EQ (options.via_geometry_datatype_per_mask (0), 17); + EXPECT_EQ (options.via_geometry_datatype_per_mask (1), 117); + EXPECT_EQ (options.via_geometry_datatype_per_mask (2), 217); + EXPECT_EQ (options.via_geometry_datatype_per_mask (3), 17); + options.set_via_geometry_datatype_per_mask (2, 42); + EXPECT_EQ (options.via_geometry_datatype_per_mask (2), 42); + + options.clear_via_geometry_suffixes_per_mask (); + EXPECT_EQ (options.via_geometry_suffix_str (), "VIAG"); + + options.clear_via_geometry_datatypes_per_mask (); + EXPECT_EQ (options.via_geometry_datatype_str (), "17"); + + + options.set_produce_pins (true); + EXPECT_EQ (options.produce_pins (), true); + options.set_produce_pins (false); + EXPECT_EQ (options.produce_pins (), false); + + options.set_pins_suffix ("PIN"); + EXPECT_EQ (options.pins_suffix (), "PIN"); + + options.set_pins_datatype (42); + EXPECT_EQ (options.pins_datatype (), 42); + + options.set_pins_suffix_str ("PIN, 2: PINM2, 1: PINM1"); + EXPECT_EQ (options.pins_suffix_str (), "PIN,1:PINM1,2:PINM2"); + EXPECT_EQ (options.pins_suffix_per_mask (0), "PIN"); + EXPECT_EQ (options.pins_suffix_per_mask (1), "PINM1"); + EXPECT_EQ (options.pins_suffix_per_mask (2), "PINM2"); + EXPECT_EQ (options.pins_suffix_per_mask (3), "PIN"); + options.set_pins_suffix_per_mask (2, "AB"); + EXPECT_EQ (options.pins_suffix_per_mask (2), "AB"); + + options.set_pins_datatype_str ("42, 2:242, 1: 142"); + EXPECT_EQ (options.pins_datatype_str (), "42,1:142,2:242"); + EXPECT_EQ (options.pins_datatype_per_mask (0), 42); + EXPECT_EQ (options.pins_datatype_per_mask (1), 142); + EXPECT_EQ (options.pins_datatype_per_mask (2), 242); + EXPECT_EQ (options.pins_datatype_per_mask (3), 42); + options.set_pins_datatype_per_mask (2, 42); + EXPECT_EQ (options.pins_datatype_per_mask (2), 42); + + options.clear_pins_suffixes_per_mask (); + EXPECT_EQ (options.pins_suffix_str (), "PIN"); + + options.clear_pins_datatypes_per_mask (); + EXPECT_EQ (options.pins_datatype_str (), "42"); + + + options.set_produce_lef_pins (true); + EXPECT_EQ (options.produce_lef_pins (), true); + options.set_produce_lef_pins (false); + EXPECT_EQ (options.produce_lef_pins (), false); + + options.set_lef_pins_suffix ("LEFPIN"); + EXPECT_EQ (options.lef_pins_suffix (), "LEFPIN"); + + options.set_lef_pins_datatype (41); + EXPECT_EQ (options.lef_pins_datatype (), 41); + + options.set_lef_pins_suffix_str ("LEFPIN, 2: LEFPINM2, 1: LEFPINM1"); + EXPECT_EQ (options.lef_pins_suffix_str (), "LEFPIN,1:LEFPINM1,2:LEFPINM2"); + EXPECT_EQ (options.lef_pins_suffix_per_mask (0), "LEFPIN"); + EXPECT_EQ (options.lef_pins_suffix_per_mask (1), "LEFPINM1"); + EXPECT_EQ (options.lef_pins_suffix_per_mask (2), "LEFPINM2"); + EXPECT_EQ (options.lef_pins_suffix_per_mask (3), "LEFPIN"); + options.set_lef_pins_suffix_per_mask (2, "AB"); + EXPECT_EQ (options.lef_pins_suffix_per_mask (2), "AB"); + + options.set_lef_pins_datatype_str ("41, 2:241, 1: 141"); + EXPECT_EQ (options.lef_pins_datatype_str (), "41,1:141,2:241"); + EXPECT_EQ (options.lef_pins_datatype_per_mask (0), 41); + EXPECT_EQ (options.lef_pins_datatype_per_mask (1), 141); + EXPECT_EQ (options.lef_pins_datatype_per_mask (2), 241); + EXPECT_EQ (options.lef_pins_datatype_per_mask (3), 41); + options.set_lef_pins_datatype_per_mask (2, 41); + EXPECT_EQ (options.lef_pins_datatype_per_mask (2), 41); + + options.clear_lef_pins_suffixes_per_mask (); + EXPECT_EQ (options.lef_pins_suffix_str (), "LEFPIN"); + + options.clear_lef_pins_datatypes_per_mask (); + EXPECT_EQ (options.lef_pins_datatype_str (), "41"); + + options.set_produce_obstructions (true); + EXPECT_EQ (options.produce_obstructions (), true); + options.set_produce_obstructions (false); + EXPECT_EQ (options.produce_obstructions (), false); + + options.set_obstructions_suffix ("OBS"); + EXPECT_EQ (options.obstructions_suffix (), "OBS"); + + options.set_obstructions_datatype (31); + EXPECT_EQ (options.obstructions_datatype (), 31); + + options.set_produce_blockages (true); + EXPECT_EQ (options.produce_blockages (), true); + options.set_produce_blockages (false); + EXPECT_EQ (options.produce_blockages (), false); + + options.set_blockages_suffix ("BLK"); + EXPECT_EQ (options.blockages_suffix (), "BLK"); + + options.set_blockages_datatype (41); + EXPECT_EQ (options.blockages_datatype (), 41); + + options.set_produce_labels (true); + EXPECT_EQ (options.produce_labels (), true); + options.set_produce_labels (false); + EXPECT_EQ (options.produce_labels (), false); + + options.set_labels_suffix ("LBL"); + EXPECT_EQ (options.labels_suffix (), "LBL"); + + options.set_labels_datatype (51); + EXPECT_EQ (options.labels_datatype (), 51); + + + options.set_produce_routing (true); + EXPECT_EQ (options.produce_routing (), true); + options.set_produce_routing (false); + EXPECT_EQ (options.produce_routing (), false); + + options.set_routing_suffix ("ROUTING"); + EXPECT_EQ (options.routing_suffix (), "ROUTING"); + + options.set_routing_datatype (40); + EXPECT_EQ (options.routing_datatype (), 40); + + options.set_routing_suffix_str ("ROUTING, 2: ROUTINGM2, 1: ROUTINGM1"); + EXPECT_EQ (options.routing_suffix_str (), "ROUTING,1:ROUTINGM1,2:ROUTINGM2"); + EXPECT_EQ (options.routing_suffix_per_mask (0), "ROUTING"); + EXPECT_EQ (options.routing_suffix_per_mask (1), "ROUTINGM1"); + EXPECT_EQ (options.routing_suffix_per_mask (2), "ROUTINGM2"); + EXPECT_EQ (options.routing_suffix_per_mask (3), "ROUTING"); + options.set_routing_suffix_per_mask (2, "AB"); + EXPECT_EQ (options.routing_suffix_per_mask (2), "AB"); + + options.set_routing_datatype_str ("40, 2:240, 1: 140"); + EXPECT_EQ (options.routing_datatype_str (), "40,1:140,2:240"); + EXPECT_EQ (options.routing_datatype_per_mask (0), 40); + EXPECT_EQ (options.routing_datatype_per_mask (1), 140); + EXPECT_EQ (options.routing_datatype_per_mask (2), 240); + EXPECT_EQ (options.routing_datatype_per_mask (3), 40); + options.set_routing_datatype_per_mask (2, 40); + EXPECT_EQ (options.routing_datatype_per_mask (2), 40); + + options.clear_routing_suffixes_per_mask (); + EXPECT_EQ (options.routing_suffix_str (), "ROUTING"); + + options.clear_routing_datatypes_per_mask (); + EXPECT_EQ (options.routing_datatype_str (), "40"); + + + options.set_produce_special_routing (true); + EXPECT_EQ (options.produce_special_routing (), true); + options.set_produce_special_routing (false); + EXPECT_EQ (options.produce_special_routing (), false); + + options.set_special_routing_suffix ("SPECIALROUTING"); + EXPECT_EQ (options.special_routing_suffix (), "SPECIALROUTING"); + + options.set_special_routing_datatype (44); + EXPECT_EQ (options.special_routing_datatype (), 44); + + options.set_special_routing_suffix_str ("SPECIALROUTING, 2: SPECIALROUTINGM2, 1: SPECIALROUTINGM1"); + EXPECT_EQ (options.special_routing_suffix_str (), "SPECIALROUTING,1:SPECIALROUTINGM1,2:SPECIALROUTINGM2"); + EXPECT_EQ (options.special_routing_suffix_per_mask (0), "SPECIALROUTING"); + EXPECT_EQ (options.special_routing_suffix_per_mask (1), "SPECIALROUTINGM1"); + EXPECT_EQ (options.special_routing_suffix_per_mask (2), "SPECIALROUTINGM2"); + EXPECT_EQ (options.special_routing_suffix_per_mask (3), "SPECIALROUTING"); + options.set_special_routing_suffix_per_mask (2, "AB"); + EXPECT_EQ (options.special_routing_suffix_per_mask (2), "AB"); + + options.set_special_routing_datatype_str ("44, 2:244, 1: 144"); + EXPECT_EQ (options.special_routing_datatype_str (), "44,1:144,2:244"); + EXPECT_EQ (options.special_routing_datatype_per_mask (0), 44); + EXPECT_EQ (options.special_routing_datatype_per_mask (1), 144); + EXPECT_EQ (options.special_routing_datatype_per_mask (2), 244); + EXPECT_EQ (options.special_routing_datatype_per_mask (3), 44); + options.set_special_routing_datatype_per_mask (2, 44); + EXPECT_EQ (options.special_routing_datatype_per_mask (2), 44); + + options.clear_special_routing_suffixes_per_mask (); + EXPECT_EQ (options.special_routing_suffix_str (), "SPECIALROUTING"); + + options.clear_special_routing_datatypes_per_mask (); + EXPECT_EQ (options.special_routing_datatype_str (), "44"); + + EXPECT_EQ (options.begin_lef_files () == options.end_lef_files (), true); + options.push_lef_file ("ABC.lef"); + EXPECT_EQ (options.begin_lef_files () == options.end_lef_files (), false); + EXPECT_EQ (options.lef_files ().size (), size_t (1)); + EXPECT_EQ (*options.begin_lef_files (), "ABC.lef"); + std::vector lf = options.lef_files (); + options.clear_lef_files (); + EXPECT_EQ (options.begin_lef_files () == options.end_lef_files (), true); + EXPECT_EQ (options.lef_files ().size (), size_t (0)); + options.set_lef_files (lf); + EXPECT_EQ (options.lef_files ().size (), size_t (1)); + EXPECT_EQ (*options.begin_lef_files (), "ABC.lef"); + + + options.set_map_file ("ABC.map"); + EXPECT_EQ (options.map_file (), "ABC.map"); + + + options.set_macro_resolution_mode (2); + EXPECT_EQ (options.macro_resolution_mode (), (unsigned int) 2); +} + diff --git a/src/plugins/streamers/lefdef/unit_tests/unit_tests.pro b/src/plugins/streamers/lefdef/unit_tests/unit_tests.pro index 3958da4b2..401a35ad0 100644 --- a/src/plugins/streamers/lefdef/unit_tests/unit_tests.pro +++ b/src/plugins/streamers/lefdef/unit_tests/unit_tests.pro @@ -6,7 +6,8 @@ TARGET = lefdef_tests include($$PWD/../../../../lib_ut.pri) SOURCES = \ - dbLEFDEFImportTests.cc + dbLEFDEFImportTests.cc \ + dbLEFDEFReaderOptionsTests.cc INCLUDEPATH += $$LAY_INC $$TL_INC $$DB_INC $$GSI_INC $$PWD/../db_plugin $$PWD/../../../common DEPENDPATH += $$LAY_INC $$TL_INC $$DB_INC $$GSI_INC $$PWD/../db_plugin $$PWD/../../../common diff --git a/testdata/lefdef/masks-1/au.oas.gz b/testdata/lefdef/masks-1/au.oas.gz new file mode 100644 index 0000000000000000000000000000000000000000..03632bea656446f22d8a712738dd04d8a4651154 GIT binary patch literal 1162 zcmd^7O>fgc5Z&1gb!t1frEyS$eLxjLsG_p>h`0o7f+Z)8Vz2`WB>L{AiP zMf?Wt`~iMK+Edgke<0i{ajAM@)?P;m;veACyqS5=Z=QW84SUi3q?1NzLkH&Xcx0xL z#mBMRspxf{i!|!?!$3s+EbN9u@hl3mr}diCaLVy+|6dD^t*0VO2I6rT$ENn`;Pv?M zyHM+Nk3h9%^t#ak7NwiqaptC=E(e5~8AXFW*K{ab6p`taswhqcFx9n1A6))%S3E zK37$+^ofA6qta(tBgo?@O P4#=5WE Date: Wed, 29 Jul 2020 22:42:48 +0200 Subject: [PATCH 059/121] Added test data file --- testdata/lefdef/via_properties/in.def | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 testdata/lefdef/via_properties/in.def diff --git a/testdata/lefdef/via_properties/in.def b/testdata/lefdef/via_properties/in.def new file mode 100644 index 000000000..226032a92 --- /dev/null +++ b/testdata/lefdef/via_properties/in.def @@ -0,0 +1,13 @@ + +VERSION 5.8 ; +DIVIDERCHAR "/" ; +BUSBITCHARS "[]" ; +DESIGN chip_top ; +UNITS DISTANCE MICRONS 1000 ; +DIEAREA ( -100 -100 ) ( 100 100 ) ; +SPECIALNETS 1 ; +- dummy + + ROUTED + VIA via1_4 ( 0 0 ) +; +END SPECIALNETS +END DESIGN From f4e75aaa74464ee354152da3f162fe46aca1549f Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Thu, 30 Jul 2020 23:53:34 +0200 Subject: [PATCH 060/121] WIP: reworked layer mapping scheme, needs fixing --- src/db/db/dbStreamLayers.cc | 11 +++ src/db/db/dbStreamLayers.h | 7 ++ .../lefdef/db_plugin/dbLEFDEFImporter.cc | 74 ++++++++----------- 3 files changed, 47 insertions(+), 45 deletions(-) diff --git a/src/db/db/dbStreamLayers.cc b/src/db/db/dbStreamLayers.cc index aa916b30e..fb33f3ac7 100644 --- a/src/db/db/dbStreamLayers.cc +++ b/src/db/db/dbStreamLayers.cc @@ -137,6 +137,17 @@ LayerMap::is_placeholder (unsigned int l) const return (m_placeholders.size () > std::numeric_limits::max () - l); } +const db::LayerProperties * +LayerMap::target (unsigned int l) const +{ + std::map::const_iterator i = m_target_layers.find (l); + if (i != m_target_layers.end ()) { + return & i->second; + } else { + return 0; + } +} + std::pair LayerMap::logical (const db::LayerProperties &p, db::Layout &layout) const { diff --git a/src/db/db/dbStreamLayers.h b/src/db/db/dbStreamLayers.h index efc80b45b..b142d7d95 100644 --- a/src/db/db/dbStreamLayers.h +++ b/src/db/db/dbStreamLayers.h @@ -236,6 +236,13 @@ public: */ std::pair logical (const db::LDPair &p, db::Layout &layout) const; + /** + * @brief Gets the target layer for a given logical layer + * + * Returns 0 if no target layer mapping is supplied. + */ + const db::LayerProperties *target (unsigned int l) const; + /** * @brief String description for the mapping of a logical layer * diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc index 4b33bd657..e8e5f6d7e 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc @@ -668,8 +668,6 @@ LEFDEFReaderState::LEFDEFReaderState (const LEFDEFReaderOptions *tc, db::Layout m_create_layers = tc->read_all_layers (); } - m_layer_map.prepare (layout); - } } @@ -884,24 +882,14 @@ LEFDEFReaderState::open_layer_uncached (db::Layout &layout, const std::string &n lp.datatype = 0; } - std::pair ll = m_layer_map.logical (lp, layout); - - if (ll.first) { - - return ll; - - } else if (! m_create_layers) { - - return std::pair (false, 0); - - } else { - - unsigned int ll = layout.insert_layer (lp); - m_layer_map.map (lp, ll); - return std::pair (true, ll); - + for (db::Layout::layer_iterator l = layout.begin_layers (); l != layout.end_layers (); ++l) { + if ((*l).second->log_equal (lp)) { + return std::make_pair (true, (*l).first); + } } + return std::make_pair (true, layout.insert_layer (lp)); + } else { if (mp_tech_comp) { @@ -981,49 +969,45 @@ LEFDEFReaderState::open_layer_uncached (db::Layout &layout, const std::string &n } } - if (dt > 0 && name_suffix.empty ()) { - name_suffix = "#" + tl::to_string (dt); - } - std::string name = n + name_suffix; - std::pair ll = m_layer_map.logical (name, layout); + db::LayerProperties lp (name); + std::pair ll = m_layer_map.logical (name, layout); if (ll.first) { - return ll; + const db::LayerProperties *lpp = m_layer_map.target (ll.second); + if (lpp) { + lp = *lpp; + } } else { ll = m_layer_map.logical (n, layout); - int ln = -1; + if (ll.first) { - if (ll.first && (ln = layout.get_properties (ll.second).layer) >= 0) { - - m_layer_map.map (db::LayerProperties (name), layout.layers (), db::LayerProperties (ln, dt, name)); - m_layer_map.prepare (layout); - return m_layer_map.logical (name, layout); - - } else if (! m_create_layers) { - - return std::pair (false, 0); - - } else { - - std::map >, unsigned int>::const_iterator l = m_unassigned_layers.find (std::make_pair (n, std::make_pair (purpose, mask))); - if (l != m_unassigned_layers.end ()) { - return std::pair (true, l->second); - } else { - unsigned int li = layout.insert_layer (db::LayerProperties (name)); - m_unassigned_layers.insert (std::make_pair (std::make_pair (n, std::make_pair (purpose, mask)), li)); - m_layer_map.map (db::LayerProperties (name), li); - return std::pair (true, li); + const db::LayerProperties *lpp = m_layer_map.target (ll.second); + if (lpp) { + lp = *lpp; + if (lp.datatype >= 0) { + lp.datatype += dt; + } } + } else if (! m_create_layers) { + return std::make_pair (false, 0); } } + for (db::Layout::layer_iterator l = layout.begin_layers (); l != layout.end_layers (); ++l) { + if ((*l).second->log_equal (lp)) { + return std::make_pair (true, (*l).first); + } + } + + return std::make_pair (true, layout.insert_layer (lp)); + } } From f7d5385fcc8b040c17ce51f90d54aacaf86327b4 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Fri, 31 Jul 2020 00:14:00 +0200 Subject: [PATCH 061/121] Added map file to one test for later use --- testdata/lefdef/masks-1/test.map | 46 ++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 testdata/lefdef/masks-1/test.map diff --git a/testdata/lefdef/masks-1/test.map b/testdata/lefdef/masks-1/test.map new file mode 100644 index 000000000..7899cd68e --- /dev/null +++ b/testdata/lefdef/masks-1/test.map @@ -0,0 +1,46 @@ +DIEAREA ALL 100 0 +M0PO LEFPIN 10 0 +M0PO LEFPIN:MASK:1 10 1 +M0PO LEFPIN:MASK:2 10 2 +M0PO PIN 10 10 +M0PO PIN:MASK:1 10 11 +M0PO PIN:MASK:2 10 12 +M0PO NET 10 20 +M0PO NET:MASK:1 10 21 +M0PO NET:MASK:2 10 22 +M0PO SPNET 10 30 +M0PO SPNET:MASK:1 10 31 +M0PO SPNET:MASK:2 10 32 +M0PO VIA 10 30 +M0PO VIA:MASK:1 10 31 +M0PO VIA:MASK:2 10 32 +VIA LEFPIN 11 0 +VIA LEFPIN:MASK:1 11 1 +VIA LEFPIN:MASK:2 11 2 +VIA PIN 11 10 +VIA PIN:MASK:1 11 11 +VIA PIN:MASK:2 11 12 +VIA NET 11 20 +VIA NET:MASK:1 11 21 +VIA NET:MASK:2 11 22 +VIA SPNET 11 30 +VIA SPNET:MASK:1 11 31 +VIA SPNET:MASK:2 11 32 +VIA VIA 11 30 +VIA VIA:MASK:1 11 31 +VIA VIA:MASK:2 11 32 +M1 LEFPIN 12 0 +M1 LEFPIN:MASK:1 12 1 +M1 LEFPIN:MASK:2 12 2 +M1 PIN 12 10 +M1 PIN:MASK:1 12 11 +M1 PIN:MASK:2 12 12 +M1 NET 12 20 +M1 NET:MASK:1 12 21 +M1 NET:MASK:2 12 22 +M1 SPNET 12 30 +M1 SPNET:MASK:1 12 31 +M1 SPNET:MASK:2 12 32 +M1 VIA 12 30 +M1 VIA:MASK:1 12 31 +M1 VIA:MASK:2 12 32 From 440b2b122b9f83fe54fbdbc0d1f479c8b2e88f2a Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sun, 2 Aug 2020 00:09:20 +0200 Subject: [PATCH 062/121] Fixed test cases - main reason is the different assignment of layer numbers, mainly for the auxiliary layers such as OUTLINE --- .../lefdef/db_plugin/dbLEFDEFImporter.cc | 137 ++++++++++++------ .../lefdef/db_plugin/dbLEFDEFImporter.h | 1 - .../lefdef/unit_tests/dbLEFDEFImportTests.cc | 93 ++++++++++-- testdata/lefdef/masks-1/au.oas.gz | Bin 1162 -> 1038 bytes 4 files changed, 170 insertions(+), 61 deletions(-) diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc index e8e5f6d7e..d2520e9bf 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc @@ -972,37 +972,39 @@ LEFDEFReaderState::open_layer_uncached (db::Layout &layout, const std::string &n std::string name = n + name_suffix; db::LayerProperties lp (name); + lp.datatype = dt; + std::map::const_iterator ldef = m_default_number.find (n); + if (ldef != m_default_number.end ()) { + lp.layer = ldef->second; + } std::pair ll = m_layer_map.logical (name, layout); + if (! ll.first) { + ll = m_layer_map.logical (n, layout); + } + if (ll.first) { const db::LayerProperties *lpp = m_layer_map.target (ll.second); if (lpp) { lp = *lpp; - } - - } else { - - ll = m_layer_map.logical (n, layout); - if (ll.first) { - - const db::LayerProperties *lpp = m_layer_map.target (ll.second); - if (lpp) { - lp = *lpp; - if (lp.datatype >= 0) { - lp.datatype += dt; - } + if (lp.datatype >= 0) { + lp.datatype += dt; + } + if (lp.name.empty ()) { + lp.name = name; } - - } else if (! m_create_layers) { - return std::make_pair (false, 0); } + } else if (! m_create_layers) { + return std::make_pair (false, 0); } - for (db::Layout::layer_iterator l = layout.begin_layers (); l != layout.end_layers (); ++l) { - if ((*l).second->log_equal (lp)) { - return std::make_pair (true, (*l).first); + if (lp.layer >= 0 && lp.datatype >= 0) { + for (db::Layout::layer_iterator l = layout.begin_layers (); l != layout.end_layers (); ++l) { + if ((*l).second->log_equal (lp)) { + return std::make_pair (true, (*l).first); + } } } @@ -1023,59 +1025,106 @@ LEFDEFReaderState::finish (db::Layout &layout) } } - for (std::map::const_iterator ln = m_default_number.begin (); ln != m_default_number.end (); ++ln) { + std::map number_for_name = m_default_number; + + for (std::map::const_iterator ln = number_for_name.begin (); ln != number_for_name.end (); ++ln) { used_numbers.insert (ln->second); } - for (std::map >, unsigned int>::const_iterator l = m_unassigned_layers.begin (); l != m_unassigned_layers.end (); ++l) { + // Assign default numbers and generate a canonical mapping + + db::LayerMap lm; + + for (std::map >, std::pair >::const_iterator l = m_layers.begin (); l != m_layers.end (); ++l) { + + if (! l->second.first) { + continue; + } + + std::string ps; - int dt = 0; switch (l->first.second.first) { + case Outline: + ps = "OUTLINE"; + break; + case Regions: + ps = "REGION"; + break; + case PlacementBlockage: + ps = "PLACEMENT_BLK"; + break; case Routing: default: - dt = mp_tech_comp->routing_datatype_per_mask (l->first.second.second); + ps = "NET"; break; case SpecialRouting: - dt = mp_tech_comp->special_routing_datatype_per_mask (l->first.second.second); + ps = "SPNET"; break; case ViaGeometry: - dt = mp_tech_comp->via_geometry_datatype_per_mask (l->first.second.second); + ps = "VIA"; break; case Label: - dt = mp_tech_comp->labels_datatype (); + ps = "LABEL"; break; case Pins: - dt = mp_tech_comp->pins_datatype_per_mask (l->first.second.second); + ps = "PIN"; break; case LEFPins: - dt = mp_tech_comp->lef_pins_datatype_per_mask (l->first.second.second); + ps = "LEFPIN"; break; case Obstructions: - dt = mp_tech_comp->obstructions_datatype (); + ps = "OBS"; break; case Blockage: - dt = mp_tech_comp->blockages_datatype (); + ps = "BLK"; break; } - int dl = 0; - std::map::const_iterator ln = m_default_number.find (l->first.first); - if (ln != m_default_number.end ()) { - dl = ln->second; - } else { - do { - ++lnum; - } while (used_numbers.find (lnum) != used_numbers.end ()); - m_default_number.insert (std::make_pair (l->first.first, lnum)); - dl = lnum; + unsigned int layer_index = l->second.second; + db::LayerProperties lp = layout.get_properties (layer_index); + + if (lp.layer < 0) { + + std::map::const_iterator n4n = number_for_name.end (); + if (! l->first.first.empty ()) { + n4n = number_for_name.find (l->first.first); + } + + if (n4n == number_for_name.end ()) { + do { + ++lnum; + } while (used_numbers.find (lnum) != used_numbers.end ()); + number_for_name.insert (std::make_pair (l->first.first, lnum)); + lp.layer = lnum; + } else { + lp.layer = n4n->second; + } + } - db::LayerProperties lp = layout.get_properties (l->second); - lp.layer = dl; - lp.datatype = dt; - layout.set_properties (l->second, lp); + if (lp.datatype < 0) { + lp.datatype = 0; + } + + layout.set_properties (layer_index, lp); + + std::string n = l->first.first; + if (! n.empty ()) { + n += "."; + } + n += ps; + + if (l->first.second.second > 0) { + n += ":"; + n += tl::to_string (l->first.second.second); + } + + lm.map (db::LayerProperties (n), l->second.second, lp); } + + // On return we deliver the "canonical" map + m_layer_map = lm; } void diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h index 65d2c0e6c..b85ed0ef8 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h @@ -1047,7 +1047,6 @@ private: LEFDEFReaderState &operator= (const LEFDEFReaderState &); std::map >, std::pair > m_layers; - std::map >, unsigned int> m_unassigned_layers; db::LayerMap m_layer_map; bool m_create_layers; bool m_has_explicit_layer_mapping; diff --git a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc index ba4d649ac..6d31847b8 100644 --- a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc +++ b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc @@ -49,7 +49,7 @@ static db::LEFDEFReaderOptions default_options () return tc; } -static void run_test (tl::TestBase *_this, const char *lef_dir, const char *filename, const char *au, const db::LEFDEFReaderOptions &options, bool priv = true) +static db::LayerMap run_test (tl::TestBase *_this, const char *lef_dir, const char *filename, const char *au, const db::LEFDEFReaderOptions &options, bool priv = true) { std::string fn_path (priv ? tl::testsrc_private () : tl::testsrc ()); fn_path += "/testdata/lefdef/"; @@ -186,6 +186,8 @@ static void run_test (tl::TestBase *_this, const char *lef_dir, const char *file } } + + return ld.layer_map (); } TEST(1) @@ -200,7 +202,9 @@ TEST(2) TEST(3) { - run_test (_this, "lef3", "lef:in.lef", "au.oas.gz", default_options ()); + db::LEFDEFReaderOptions options = default_options (); + options.set_cell_outline_layer ("OUTLINE (2/0)"); + run_test (_this, "lef3", "lef:in.lef", "au.oas.gz", options); } TEST(4) @@ -220,7 +224,9 @@ TEST(6) TEST(7) { - run_test (_this, "lef7", "lef:in_tech.lef+lef:in.lef", "au.oas.gz", default_options ()); + db::LEFDEFReaderOptions options = default_options (); + options.set_cell_outline_layer ("OUTLINE (8/0)"); + run_test (_this, "lef7", "lef:in_tech.lef+lef:in.lef", "au.oas.gz", options); } TEST(10) @@ -230,12 +236,16 @@ TEST(10) TEST(11) { - run_test (_this, "def2", "lef:0.lef+lef:1.lef+def:in.def.gz", "au.oas.gz", default_options ()); + db::LEFDEFReaderOptions options = default_options (); + options.set_cell_outline_layer ("OUTLINE (10/0)"); + run_test (_this, "def2", "lef:0.lef+lef:1.lef+def:in.def.gz", "au.oas.gz", options); } TEST(12) { - run_test (_this, "def3", "lef:in.lef+def:in.def", "au.oas.gz", default_options ()); + db::LEFDEFReaderOptions options = default_options (); + options.set_cell_outline_layer ("OUTLINE (13/0)"); + run_test (_this, "def3", "lef:in.lef+def:in.def", "au.oas.gz", options); } TEST(13) @@ -255,8 +265,12 @@ TEST(15) TEST(16) { - run_test (_this, "def7", "lef:cells.lef+lef:tech.lef+def:in.def.gz", "au.oas.gz", default_options ()); - run_test (_this, "def7", "map:in.map+lef:cells.lef+lef:tech.lef+def:in.def.gz", "au_with_map_file.oas.gz", default_options ()); + db::LEFDEFReaderOptions options = default_options (); + options.set_placement_blockage_layer ("PLACEMENT_BLK (11/0)"); + run_test (_this, "def7", "lef:cells.lef+lef:tech.lef+def:in.def.gz", "au.oas.gz", options); + + options.set_placement_blockage_layer ("PLACEMENT_BLK (60/0)"); + run_test (_this, "def7", "map:in.map+lef:cells.lef+lef:tech.lef+def:in.def.gz", "au_with_map_file.oas.gz", options); } TEST(17) @@ -275,17 +289,23 @@ TEST(18) TEST(19) { - run_test (_this, "def10", "def:in.def", "au.oas.gz", default_options ()); + db::LEFDEFReaderOptions opt = default_options (); + opt.set_cell_outline_layer ("OUTLINE (2/0)"); + run_test (_this, "def10", "def:in.def", "au.oas.gz", opt); } TEST(20) { - run_test (_this, "def11", "lef:test.lef+def:test.def", "au.oas.gz", default_options ()); + db::LEFDEFReaderOptions opt = default_options (); + opt.set_cell_outline_layer ("OUTLINE (12/0)"); + run_test (_this, "def11", "lef:test.lef+def:test.def", "au.oas.gz", opt); } TEST(21) { - run_test (_this, "def12", "lef:test.lef+def:test.def", "au.oas.gz", default_options ()); + db::LEFDEFReaderOptions opt = default_options (); + opt.set_cell_outline_layer ("OUTLINE (20/0)"); + run_test (_this, "def12", "lef:test.lef+def:test.def", "au.oas.gz", opt); } TEST(100) @@ -298,6 +318,7 @@ TEST(101) db::LEFDEFReaderOptions opt = default_options (); opt.set_produce_pin_names (true); opt.set_pin_property_name (2); + opt.set_cell_outline_layer ("OUTLINE (13/0)"); run_test (_this, "issue-489", "lef:in.lef+def:in.def", "au.oas", opt, false); } @@ -306,17 +327,22 @@ TEST(102) db::LEFDEFReaderOptions opt = default_options (); opt.set_produce_pin_names (true); opt.set_pin_property_name (3); + opt.set_cell_outline_layer ("OUTLINE (8/0)"); run_test (_this, "issue-489b", "lef:in_tech.lef+lef:in.lef", "au.oas.gz", opt, false); } TEST(103) { - run_test (_this, "issue-517", "def:in.def", "au.oas.gz", default_options (), false); + db::LEFDEFReaderOptions options = default_options (); + options.set_cell_outline_layer ("OUTLINE (4/0)"); + run_test (_this, "issue-517", "def:in.def", "au.oas.gz", options, false); } TEST(104_doxy_vias) { - run_test (_this, "doxy_vias", "def:test.def", "au.oas.gz", default_options (), false); + db::LEFDEFReaderOptions options = default_options (); + options.set_cell_outline_layer ("OUTLINE (4/0)"); + run_test (_this, "doxy_vias", "def:test.def", "au.oas.gz", options, false); } TEST(105_specialnets_geo) @@ -354,9 +380,10 @@ TEST(108_scanchain) TEST(109_foreigncell) { - run_test (_this, "foreigncell", "gds:foreign.gds+lef:in_tech.lef+lef:in.lef+def:in.def", "au.oas.gz", default_options (), false); - db::LEFDEFReaderOptions options = default_options (); + options.set_cell_outline_layer ("OUTLINE (43/0)"); + + run_test (_this, "foreigncell", "gds:foreign.gds+lef:in_tech.lef+lef:in.lef+def:in.def", "au.oas.gz", options, false); run_test (_this, "foreigncell", "gds:foreign.gds+lef:in_tech.lef+lef:in2.lef+def:in.def", "au_default.oas.gz", options, false); @@ -373,6 +400,7 @@ TEST(110_lefpins) { db::LEFDEFReaderOptions options = default_options (); options.set_produce_lef_pins (false); + options.set_cell_outline_layer ("OUTLINE (8/0)"); run_test (_this, "lefpins", "lef:in_tech.lef+lef:in.lef+def:in.def", "au_no_lefpins.oas.gz", options, false); options.set_produce_lef_pins (true); @@ -392,7 +420,14 @@ TEST(111_mapfile) TEST(112_via_properties) { - run_test (_this, "via_properties", "lef:in.lef+def:in.def", "au.oas.gz", default_options (), false); + db::LEFDEFReaderOptions options = default_options (); + db::LayerMap lm = db::LayerMap::from_string_file_format ("metal1: 1\nvia1: 2\nmetal2: 3"); + options.set_layer_map (lm); + + db::LayerMap lm_read = run_test (_this, "via_properties", "lef:in.lef+def:in.def", "au.oas.gz", options, false); + EXPECT_EQ (lm_read.to_string (), + "layer_map('OUTLINE : OUTLINE (4/0)';'metal1.VIA : metal1 (1/0)';'metal2.VIA : metal2 (3/0)';'via1.VIA : via1 (2/0)')" + ) } TEST(113_masks_1) @@ -410,7 +445,33 @@ TEST(113_masks_1) options.set_pins_suffix (""); options.set_pins_datatype_per_mask (1, 110); options.set_pins_datatype_per_mask (2, 210); + options.set_cell_outline_layer ("OUTLINE (4/0)"); - run_test (_this, "masks-1", "lef:in_tech.lef+def:in.def", "au.oas.gz", options, false); + db::LayerMap lm = db::LayerMap::from_string_file_format ("M1: 3\nM0PO: 1\nVIA0: 2"); + options.set_layer_map (lm); + + db::LayerMap lm_read = run_test (_this, "masks-1", "lef:in_tech.lef+def:in.def", "au.oas.gz", options, false); + + EXPECT_EQ (lm_read.to_string_file_format (), + "OUTLINE : OUTLINE (4/0)\n" + "'M0PO.SPNET:1' : M0PO (1/101)\n" + "'M1.SPNET:2' : M1 (3/201)\n" + "'M1.SPNET:1' : M1 (3/101)\n" + "'M0PO.VIA:2' : M0PO (1/202)\n" + "'M1.VIA:1' : M1 (3/102)\n" + "'VIA0.VIA:1' : VIA0 (2/102)\n" + "'M0PO.SPNET:2' : M0PO (1/201)\n" + "M0PO.PIN : M0PO (1/2)\n" + "M0PO.LABEL : M0PO.LABEL (1/1)\n" + "'M0PO.PIN:2' : M0PO (1/210)\n" + "'M1.PIN:1' : M1 (3/110)\n" + "M1.LABEL : M1.LABEL (3/1)\n" + "'M1.NET:1' : M1 (3/100)\n" + "'M1.NET:2' : M1 (3/200)\n" + "'M0PO.VIA:1' : M0PO (1/102)\n" + "'M1.VIA:2' : M1 (3/202)\n" + "'VIA0.VIA:2' : VIA0 (2/202)\n" + "'M0PO.NET:1' : M0PO (1/100)\n" + ) } diff --git a/testdata/lefdef/masks-1/au.oas.gz b/testdata/lefdef/masks-1/au.oas.gz index 03632bea656446f22d8a712738dd04d8a4651154..579a0bc453fbb049ac78be435ba6f347a924779e 100644 GIT binary patch delta 332 zcmeC;?Bkelx1Pnm(U>K`!g z>=gapdcZWN|Cw|i#v%+nohAoO?qw!&m7XhASbYY5ul5pBP3e55nQ=DN@NG7w`zj3Z E1yV*$00000 From 404799bdfd14d8ebf08c21436ec5edea78221ca9 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sun, 2 Aug 2020 00:56:55 +0200 Subject: [PATCH 063/121] Bugfixed map file reader for mask case, added test --- .../lefdef/db_plugin/dbLEFDEFImporter.cc | 7 ++- .../lefdef/unit_tests/dbLEFDEFImportTests.cc | 37 ++++++++++++++ src/unit_tests/utTestConsole.cc | 2 +- testdata/lefdef/masks-1/au_map.oas.gz | Bin 0 -> 1648 bytes testdata/lefdef/masks-1/test.map | 46 ------------------ 5 files changed, 44 insertions(+), 48 deletions(-) create mode 100644 testdata/lefdef/masks-1/au_map.oas.gz delete mode 100644 testdata/lefdef/masks-1/test.map diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc index d2520e9bf..669ed3baa 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc @@ -783,7 +783,7 @@ LEFDEFReaderState::read_map_file (const std::string &path, db::Layout &layout) tl::Extractor ex (p_uc.c_str ()); std::string ps; - ex.read (ps); + ex.read_word_or_quoted (ps); unsigned int mask = 0; @@ -805,6 +805,11 @@ LEFDEFReaderState::read_map_file (const std::string &path, db::Layout &layout) } + if (mask > 0) { + purpose_str += ":"; + purpose_str += tl::to_string (mask); + } + } std::string final_name = w1 + "." + purpose_str; diff --git a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc index 6d31847b8..593aa04d6 100644 --- a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc +++ b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc @@ -473,5 +473,42 @@ TEST(113_masks_1) "'VIA0.VIA:2' : VIA0 (2/202)\n" "'M0PO.NET:1' : M0PO (1/100)\n" ) + + options = default_options (); + lm_read = run_test (_this, "masks-1", "map:in.map+lef:in_tech.lef+def:in.def", "au_map.oas.gz", options, false); + + EXPECT_EQ (lm_read.to_string_file_format (), + "OUTLINE : OUTLINE (4/0)\n" + "'M0PO.NET:1' : 'M0PO.NET:1' (1/100)\n" + "'M0PO.NET:2' : 'M0PO.NET:2' (1/200)\n" + "'M0PO.SPNET:1' : 'M0PO.SPNET:1' (1/101)\n" + "'M0PO.SPNET:2' : 'M0PO.SPNET:2' (1/201)\n" + "'M0PO.VIA:1' : 'M0PO.VIA:1' (1/102)\n" + "'M0PO.VIA:2' : 'M0PO.VIA:2' (1/202)\n" + "M0PO.LABEL : M0PO.LABEL (1/1)\n" + "M0PO.PIN : M0PO.PIN (1/2)\n" + "'M0PO.PIN:1' : 'M0PO.PIN:1' (1/110)\n" + "'M0PO.PIN:2' : 'M0PO.PIN:2' (1/210)\n" + "'M1.NET:1' : 'M1.NET:1' (3/100)\n" + "'M1.NET:2' : 'M1.NET:2' (3/200)\n" + "'M1.SPNET:1' : 'M1.SPNET:1' (3/101)\n" + "'M1.SPNET:2' : 'M1.SPNET:2' (3/201)\n" + "'M1.VIA:1' : 'M1.VIA:1' (3/102)\n" + "'M1.VIA:2' : 'M1.VIA:2' (3/202)\n" + "M1.LABEL : M1.LABEL (3/1)\n" + "M1.PIN : M1.PIN (3/2)\n" + "'M1.PIN:1' : 'M1.PIN:1' (3/110)\n" + "'M1.PIN:2' : 'M1.PIN:2' (3/210)\n" + "'VIA0.NET:1' : 'VIA0.NET:1' (2/100)\n" + "'VIA0.NET:2' : 'VIA0.NET:2' (2/200)\n" + "'VIA0.SPNET:1' : 'VIA0.SPNET:1' (2/101)\n" + "'VIA0.SPNET:2' : 'VIA0.SPNET:2' (2/201)\n" + "'VIA0.VIA:1' : 'VIA0.VIA:1' (2/102)\n" + "'VIA0.VIA:2' : 'VIA0.VIA:2' (2/202)\n" + "VIA0.LABEL : VIA0.LABEL (2/1)\n" + "VIA0.PIN : VIA0.PIN (2/2)\n" + "'VIA0.PIN:1' : 'VIA0.PIN:1' (2/110)\n" + "'VIA0.PIN:2' : 'VIA0.PIN:2' (2/210)\n" + ) } diff --git a/src/unit_tests/utTestConsole.cc b/src/unit_tests/utTestConsole.cc index 7726bc948..0ff24c14f 100644 --- a/src/unit_tests/utTestConsole.cc +++ b/src/unit_tests/utTestConsole.cc @@ -193,7 +193,7 @@ const char *ANSI_GREEN = "\033[32m"; const char *ANSI_RESET = "\033[0m"; TestConsole::TestConsole (FILE *file) - : m_file (file), m_col (0), m_max_col (250), m_columns (50), m_rows (0), m_file_is_tty (false) + : m_file (file), m_col (0), m_max_col (400), m_columns (50), m_rows (0), m_file_is_tty (false) { ms_instance = this; diff --git a/testdata/lefdef/masks-1/au_map.oas.gz b/testdata/lefdef/masks-1/au_map.oas.gz new file mode 100644 index 0000000000000000000000000000000000000000..45638cae1ea3ad06a4b1e9a2162a0a3a8d214671 GIT binary patch literal 1648 zcmd^9%Wl&^6rDSh)~W4~mc~J?(gh2IK%$DhjMxNXilxMf>a@Vhs)!>YLB&HzbVU(c z#5eF6d_vMy)h#~|VACan4foF2!~CL`lsC;cvIu!eZvr z@-~xn(0!OD(M}xp(kLE>JK=8nAnJ|pS1YYrOUZljzYHzUPSWvkl->>deb;(+@O=8@ zX=YtY(w$zCj&_HmaCiJ@MWAIx?Du-2u!z9;LCN)4)k_7BVOzcl5h=!ah0*gT_u(o^=$(sB*W2@>$em`eB}~v7uAgS+Sf9 zioorD-lV`LOGs;h5Y%EJDu}!N?V>>;GR!VvL#F|3?~g$da=&Uyh^bt!k=DqHtx>k> zjG$CiLjoHkQ6py=5w#_-E#tSGQOyW(C}%X%8l_=Nv`}?K(6KSOowvm4zLl||2ZGD{ zrVWa4TuBsdact`XQ}WOl-8W-QQF#{f_{BN4rp}_Vq0<1}H@SlhipU+RFHZMO8Z>sQ z5>tbm?wg77S=AfI7S*iAhE8F0-->aWeg-w(_yW^6M@NnKc(}$pUIQdfKrvGy*xETi zt^css&S7CKtj6OC{&ju6() zw$|S=fZ!u{*ksk~aNr+c!e-!IKEp-L@Axt6o0|+iE#pd>XU$*+Oa^Z?zhxWNZ9u@( bZm% Date: Sun, 2 Aug 2020 11:31:37 +0200 Subject: [PATCH 064/121] Skip END LIBRARY, so LEF files can be cat together --- .../lefdef/db_plugin/dbLEFImporter.cc | 4 +- .../lefdef/unit_tests/dbLEFDEFImportTests.cc | 9 +++ testdata/lefdef/lef-skips-end-library/au.oas | Bin 0 -> 596 bytes testdata/lefdef/lef-skips-end-library/in.def | 34 +++++++++ testdata/lefdef/lef-skips-end-library/in.lef | 67 ++++++++++++++++++ 5 files changed, 112 insertions(+), 2 deletions(-) create mode 100644 testdata/lefdef/lef-skips-end-library/au.oas create mode 100644 testdata/lefdef/lef-skips-end-library/in.def create mode 100644 testdata/lefdef/lef-skips-end-library/in.lef diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc index a3da23ab1..c4060aec4 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc @@ -1046,9 +1046,9 @@ LEFImporter::do_read (db::Layout &layout) if (test ("END")) { - // END LIBRARY terminates the file expect ("LIBRARY"); - break; + // END LIBRARY should terminate the file, but we allow to continue, so we can cat LEF files: + // break; } else if (test ("VERSION")) { diff --git a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc index 593aa04d6..bc9526c93 100644 --- a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc +++ b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc @@ -512,3 +512,12 @@ TEST(113_masks_1) ) } +TEST(114_lef_skips_end_library) +{ + db::LEFDEFReaderOptions opt = default_options (); + opt.set_produce_pin_names (true); + opt.set_pin_property_name (2); + opt.set_cell_outline_layer ("OUTLINE (13/0)"); + run_test (_this, "lef-skips-end-library", "lef:in.lef+def:in.def", "au.oas", opt, false); +} + diff --git a/testdata/lefdef/lef-skips-end-library/au.oas b/testdata/lefdef/lef-skips-end-library/au.oas new file mode 100644 index 0000000000000000000000000000000000000000..436fa32c63d123c4e7396be278b2389fb0dec065 GIT binary patch literal 596 zcmd^1J5Iwu5S`tPv59wyL~shUvP6NX2#^~%cx6`dPacO)wFN?=ClW13h&VwS4njxi zV<1k!5Gahq4VdE1`^_ApDeQ5TphY!g;%s^f?>_WLNBiiC{T*~!imq;|+BEIWwzy1F0z|RNy)R9G82Z(s z&24Ff5+M5`+$v_%+Ll5JE_*x-$j_6x$thv-mkN0?BNyb)R Date: Sun, 2 Aug 2020 12:01:28 +0200 Subject: [PATCH 065/121] Abbreviated LEF/DEF layer names for map files. --- .../lefdef/db_plugin/dbLEFDEFImporter.cc | 32 +++++++++++++----- .../oasis/db_plugin/dbOASISWriter.cc | 2 +- testdata/lefdef/mapfile/au.oas.gz | Bin 508 -> 1091 bytes 3 files changed, 25 insertions(+), 9 deletions(-) diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc index 669ed3baa..56b5fcf3a 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc @@ -730,6 +730,8 @@ LEFDEFReaderState::read_map_file (const std::string &path, db::Layout &layout) std::string w1, w2; int layer = 0, datatype = 0; + size_t max_purpose_str = 10; + bool purpose_abbreviated = false; if (ex.try_read_word (w1) && ex.try_read_word (w2, "._$,/:") && ex.try_read (layer) && ex.try_read (datatype)) { @@ -798,18 +800,32 @@ LEFDEFReaderState::read_map_file (const std::string &path, db::Layout &layout) translated_purposes.insert (std::make_pair (i->second, mask)); - if (! purpose_str.empty ()) { - purpose_str += "/"; + if (! purpose_abbreviated) { + + if (! purpose_str.empty ()) { + purpose_str += "/"; + } + + if (purpose_str.size () > max_purpose_str) { + + purpose_abbreviated = true; + purpose_str += "..."; + + } else { + + purpose_str += i->first; + + if (mask > 0) { + purpose_str += ":"; + purpose_str += tl::to_string (mask); + } + + } + } - purpose_str += i->first; } - if (mask > 0) { - purpose_str += ":"; - purpose_str += tl::to_string (mask); - } - } std::string final_name = w1 + "." + purpose_str; diff --git a/src/plugins/streamers/oasis/db_plugin/dbOASISWriter.cc b/src/plugins/streamers/oasis/db_plugin/dbOASISWriter.cc index 7791b9e98..a3e5b8c21 100644 --- a/src/plugins/streamers/oasis/db_plugin/dbOASISWriter.cc +++ b/src/plugins/streamers/oasis/db_plugin/dbOASISWriter.cc @@ -2754,7 +2754,7 @@ OASISWriter::write (const db::Path &path, db::properties_id_type prop_id, const if (hw * 2 != w) { std::string msg = tl::to_string (tr ("Paths with odd width cannot be written to OASIS files (cell ")) + mp_layout->cell_name (mp_cell->cell_index ()) + tl::to_string (tr (", position ")) + tl::to_string (start.x ()) + ", " + tl::to_string (start.y ()) + " DBU)"; if (m_options.permissive) { - tl::warn << msg << " - " << tl::to_string (tr ("path diameter is rounded")); + tl::warn << msg << " - " << tl::sprintf (tl::to_string (tr ("path width is rounded from %d to %d DBU")), w, hw * 2); } else { throw tl::Exception (msg); } diff --git a/testdata/lefdef/mapfile/au.oas.gz b/testdata/lefdef/mapfile/au.oas.gz index 629c7144bc827d1420891ebf3db05ad7bec45729..d0ee614aea2d2210123b3fc51fdfea624971a6e1 100644 GIT binary patch literal 1091 zcmd^-KX21O6u|F%ah%+p8%4cXYUG6h0RwK5iG{(bFTuk9lyl3U#fs`8AyENE43Gt> zD@!L04`fLna;{oc>_-r3ic4E@`&t9)frO!`g_%?-4= z>`qr@q5CjX{y36e=0~X<%SraY_tJZfnr+%8-jCK5*d3~}G)}TT83f!op1yeU^x2WI zrLwW7vSbn`a*{r3){m!$C(rv$a^QJQ0`;WI5PIOd*{heYrzb~bsq6T$zNlnIyq^Ys zBuP#XUk#WQ_LA5MNoxE`R5;Kj zIC|k!`@#v_p$ve~!ub;w4zvbDE1YW2ns83pH6X;VhD!>=0L4pMg^Yna4C1}}?pOl< zfcak;Cc?p*TiJr6HWFsRK)p2i&KV7)V{>x zj4(uvM9gwD`a;HE$@UC!+WDl3H~eOP_l$@;=lB*9Z*hrDt$l&##@uLMECl-oYTyaT?9SNY0W+&HBN7@9_DkNq23#Ns*^) z*R|4DFJI3O_vuBKUdC1OSj|bUg*%Do29jnJMA`67e;9>*PfjB@7~n0O#DiQ0G8x2C ze#QBeVQgiR*Zol+Jr$ISlI9K61&OXEDz3=nc|lcC(nZFzCelO4M8y>u+yJ#AN}4xw zs@M}Ph^oEp;`(Tbs9Mg^PP}mYzU4?Pd?4bl3cv1;uY3<{_}~>ezKLS^2Z^OBO?mze zRwav>qbo`MV&+Pu4#qbILf4HWp&CaVbkaTthos?^;fn*RVypzXTPn yUJuB}`UyE_MOEqktZmc@$uU@R>kA^-c-k2&M0rm#P~QE|2jDl8kqyDK1ONa$2?68) From 0caf468ad93a7519a24deeb202b152c1b8df4a33 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sun, 2 Aug 2020 12:10:04 +0200 Subject: [PATCH 066/121] via cell name prefix wasn't persisted --- src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc index 8aa4d7ae8..468bc40e4 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc @@ -321,6 +321,7 @@ class LEFDEFFormatDeclaration // new: tl::make_member (&LEFDEFReaderOptions::special_routing_suffix_str, &LEFDEFReaderOptions::set_special_routing_suffix_str, "special-routing-suffix-string") + tl::make_member (&LEFDEFReaderOptions::special_routing_datatype_str, &LEFDEFReaderOptions::set_special_routing_datatype_str, "special-routing-datatype-string") + + tl::make_member (&LEFDEFReaderOptions::via_cellname_prefix, &LEFDEFReaderOptions::set_via_cellname_prefix, "via-cellname-prefix") + tl::make_member (&LEFDEFReaderOptions::begin_lef_files, &LEFDEFReaderOptions::end_lef_files, &LEFDEFReaderOptions::push_lef_file, "lef-files") + tl::make_member (&LEFDEFReaderOptions::macro_resolution_mode, &LEFDEFReaderOptions::set_macro_resolution_mode, "macro-resolution-mode", MacroResolutionModeConverter ()) + tl::make_member (&LEFDEFReaderOptions::separate_groups, &LEFDEFReaderOptions::set_separate_groups, "separate-groups") + From 4e5166463924628c6d658b6c6de449faab68b057 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sun, 2 Aug 2020 13:10:47 +0200 Subject: [PATCH 067/121] Added map file for LEF/DEF test. --- testdata/lefdef/masks-1/in.map | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 testdata/lefdef/masks-1/in.map diff --git a/testdata/lefdef/masks-1/in.map b/testdata/lefdef/masks-1/in.map new file mode 100644 index 000000000..18e392164 --- /dev/null +++ b/testdata/lefdef/masks-1/in.map @@ -0,0 +1,31 @@ +DIEAREA ALL 4 0 +NAME M0PO 1 1 +M0PO PIN 1 2 +M0PO NET:MASK:1 1 100 +M0PO NET:MASK:2 1 200 +M0PO SPNET:MASK:1 1 101 +M0PO SPNET:MASK:2 1 201 +M0PO VIA:MASK:1 1 102 +M0PO VIA:MASK:2 1 202 +M0PO PIN:MASK:1 1 110 +M0PO PIN:MASK:2 1 210 +NAME VIA0 2 1 +VIA0 PIN 2 2 +VIA0 NET:MASK:1 2 100 +VIA0 NET:MASK:2 2 200 +VIA0 SPNET:MASK:1 2 101 +VIA0 SPNET:MASK:2 2 201 +VIA0 VIA:MASK:1 2 102 +VIA0 VIA:MASK:2 2 202 +VIA0 PIN:MASK:1 2 110 +VIA0 PIN:MASK:2 2 210 +NAME M1 3 1 +M1 PIN 3 2 +M1 NET:MASK:1 3 100 +M1 NET:MASK:2 3 200 +M1 SPNET:MASK:1 3 101 +M1 SPNET:MASK:2 3 201 +M1 VIA:MASK:1 3 102 +M1 VIA:MASK:2 3 202 +M1 PIN:MASK:1 3 110 +M1 PIN:MASK:2 3 210 From 3da56815a0e4c1e60df41ed1db3b60d9c35693d8 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Tue, 18 Aug 2020 23:02:01 +0200 Subject: [PATCH 068/121] Improved generation of MASKs for geometry-defined VIAs --- .../lefdef/db_plugin/dbDEFImporter.cc | 3 +- .../lefdef/db_plugin/dbLEFDEFImporter.cc | 28 +++++++++++++------ .../lefdef/db_plugin/dbLEFDEFImporter.h | 2 +- .../lefdef/unit_tests/dbLEFDEFImportTests.cc | 6 ++++ 4 files changed, 28 insertions(+), 11 deletions(-) diff --git a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc index 580615738..80b1f836b 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc @@ -897,8 +897,6 @@ DEFImporter::read_vias (db::Layout & /*layout*/, db::Cell & /*design*/, double s std::auto_ptr rule_based_vg; std::auto_ptr geo_based_vg; - unsigned int mask = 0; - std::auto_ptr via_generator; std::set seen_layers; std::vector routing_layers; @@ -1018,6 +1016,7 @@ DEFImporter::read_vias (db::Layout & /*layout*/, db::Cell & /*design*/, double s } + unsigned int mask = 0; if (test ("+")) { expect ("MASK"); mask = get_mask (get_long ()); diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc index 56b5fcf3a..06a1c4df5 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc @@ -243,27 +243,39 @@ GeometryBasedViaGenerator::GeometryBasedViaGenerator () { } unsigned int -GeometryBasedViaGenerator::mask_for (const std::string &ln, unsigned int m, unsigned int mask_bottom, unsigned int mask_cut, unsigned int mask_top) const +GeometryBasedViaGenerator::mask_for (const std::string &ln, unsigned int m, unsigned int mask_bottom, unsigned int mask_cut, unsigned int mask_top, const LEFDEFNumberOfMasks *nm) const { - if (m == 0) { + if (m == 0 || ! nm) { + if (ln == m_bottom_layer) { - return (mask_bottom); + return mask_bottom; } else if (ln == m_cut_layer) { - return (mask_cut); + return mask_cut; } else if (ln == m_top_layer) { - return (mask_top); + return mask_top; } + + } else { + + if (ln == m_bottom_layer) { + return mask_bottom > 0 ? ((m + mask_bottom - 2) % nm->number_of_masks (m_bottom_layer) + 1) : m; + } else if (ln == m_cut_layer) { + return mask_cut > 0 ? ((m + mask_cut - 2) % nm->number_of_masks (m_cut_layer) + 1) : m; + } else if (ln == m_top_layer) { + return mask_top > 0 ? ((m + mask_top - 2) % nm->number_of_masks (m_top_layer) + 1) : m; + } + } return m; } void -GeometryBasedViaGenerator::create_cell (LEFDEFReaderState &reader, Layout &layout, db::Cell &cell, unsigned int mask_bottom, unsigned int mask_cut, unsigned int mask_top, const LEFDEFNumberOfMasks * /*nm*/) +GeometryBasedViaGenerator::create_cell (LEFDEFReaderState &reader, Layout &layout, db::Cell &cell, unsigned int mask_bottom, unsigned int mask_cut, unsigned int mask_top, const LEFDEFNumberOfMasks *nm) { for (std::map > >::const_iterator g = m_polygons.begin (); g != m_polygons.end (); ++g) { for (std::list >::const_iterator i = g->second.begin (); i != g->second.end (); ++i) { - std::pair dl = reader.open_layer (layout, g->first, ViaGeometry, mask_for (g->first, i->first, mask_bottom, mask_cut, mask_top)); + std::pair dl = reader.open_layer (layout, g->first, ViaGeometry, mask_for (g->first, i->first, mask_bottom, mask_cut, mask_top, nm)); if (dl.first) { cell.shapes (dl.second).insert (i->second); } @@ -272,7 +284,7 @@ GeometryBasedViaGenerator::create_cell (LEFDEFReaderState &reader, Layout &layou for (std::map > >::const_iterator g = m_boxes.begin (); g != m_boxes.end (); ++g) { for (std::list >::const_iterator i = g->second.begin (); i != g->second.end (); ++i) { - std::pair dl = reader.open_layer (layout, g->first, ViaGeometry, mask_for (g->first, i->first, mask_bottom, mask_cut, mask_top)); + std::pair dl = reader.open_layer (layout, g->first, ViaGeometry, mask_for (g->first, i->first, mask_bottom, mask_cut, mask_top, nm)); if (dl.first) { cell.shapes (dl.second).insert (i->second); } diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h index b85ed0ef8..efa621b15 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h @@ -935,7 +935,7 @@ private: std::map > > m_boxes; std::string m_bottom_layer, m_cut_layer, m_top_layer; - unsigned int mask_for (const std::string &ln, unsigned int m, unsigned int mask_bottom, unsigned int mask_cut, unsigned int mask_top) const; + unsigned int mask_for (const std::string &ln, unsigned int m, unsigned int mask_bottom, unsigned int mask_cut, unsigned int mask_top, const LEFDEFNumberOfMasks *nm) const; }; /** diff --git a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc index bc9526c93..dd60edf1c 100644 --- a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc +++ b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc @@ -308,6 +308,12 @@ TEST(21) run_test (_this, "def12", "lef:test.lef+def:test.def", "au.oas.gz", opt); } +TEST(22) +{ + db::LEFDEFReaderOptions opt = default_options (); + run_test (_this, "def13", "map:test.map+lef:test.lef_5.8+def:top.def.gz", "au.oas.gz", opt); +} + TEST(100) { run_test (_this, "issue-172", "lef:in.lef+def:in.def", "au.oas.gz", default_options (), false); From d7fab925a0b3b3dd6bee50fcf7d2a265fb43abd2 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Wed, 19 Aug 2020 23:06:46 +0200 Subject: [PATCH 069/121] Added an option for not reading all LEF files along with DEF files, but only selected ones. --- .../lefdef/db_plugin/dbLEFDEFImporter.cc | 4 +- .../lefdef/db_plugin/dbLEFDEFImporter.h | 11 +++++ .../lefdef/db_plugin/dbLEFDEFPlugin.cc | 25 ++++++---- .../lefdef/db_plugin/gsiDeclDbLEFDEF.cc | 14 ++++++ .../LEFDEFTechnologyComponentEditor.ui | 9 +++- .../lay_plugin/layLEFDEFImportDialogs.cc | 2 + .../lefdef/unit_tests/dbLEFDEFImportTests.cc | 46 ++++++++++++++++++ .../unit_tests/dbLEFDEFReaderOptionsTests.cc | 4 ++ testdata/lefdef/masks-1/au.oas.gz | Bin 1038 -> 1036 bytes testdata/lefdef/masks-1/au_map.oas.gz | Bin 1648 -> 1646 bytes .../lefdef/masks-1/au_plugin_alt_lef.oas.gz | Bin 0 -> 1652 bytes testdata/lefdef/masks-1/au_plugin_def.oas.gz | Bin 0 -> 1646 bytes testdata/lefdef/masks-1/hidden/in_tech.lef | 32 ++++++++++++ testdata/lefdef/masks-1/in_tech.lef | 2 +- testdata/ruby/dbReaders.rb | 4 ++ 15 files changed, 140 insertions(+), 13 deletions(-) create mode 100644 testdata/lefdef/masks-1/au_plugin_alt_lef.oas.gz create mode 100644 testdata/lefdef/masks-1/au_plugin_def.oas.gz create mode 100644 testdata/lefdef/masks-1/hidden/in_tech.lef diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc index 06a1c4df5..63d4b2685 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc @@ -349,7 +349,8 @@ LEFDEFReaderOptions::LEFDEFReaderOptions () m_special_routing_datatype (0), m_separate_groups (false), m_map_file (), - m_macro_resolution_mode (0) + m_macro_resolution_mode (false), + m_read_lef_with_def (true) { // .. nothing yet .. } @@ -418,6 +419,7 @@ LEFDEFReaderOptions &LEFDEFReaderOptions::operator= (const LEFDEFReaderOptions & m_map_file = d.m_map_file; m_macro_resolution_mode = d.m_macro_resolution_mode; m_lef_files = d.m_lef_files; + m_read_lef_with_def = d.m_read_lef_with_def; } return *this; } diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h index efa621b15..4009a7ad6 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h @@ -738,6 +738,16 @@ public: m_lef_files = lf; } + bool read_lef_with_def () const + { + return m_read_lef_with_def; + } + + void set_read_lef_with_def (bool f) + { + m_read_lef_with_def = f; + } + bool separate_groups () const { return m_separate_groups; @@ -829,6 +839,7 @@ private: bool m_separate_groups; std::string m_map_file; unsigned int m_macro_resolution_mode; + bool m_read_lef_with_def; std::vector m_lef_files; }; diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc index 468bc40e4..6ac19b03f 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc @@ -158,22 +158,26 @@ private: // Additionally read all LEF files next to the DEF file - std::string input_dir = tl::absolute_path (m_stream.absolute_path ()); + if (lefdef_options->read_lef_with_def ()) { - if (tl::file_exists (input_dir)) { + std::string input_dir = tl::absolute_path (m_stream.absolute_path ()); - std::vector entries = tl::dir_entries (input_dir); - for (std::vector::const_iterator e = entries.begin (); e != entries.end (); ++e) { + if (tl::file_exists (input_dir)) { - if (is_lef_format (*e)) { + std::vector entries = tl::dir_entries (input_dir); + for (std::vector::const_iterator e = entries.begin (); e != entries.end (); ++e) { - std::string lp = tl::combine_path (input_dir, *e); + if (is_lef_format (*e)) { - tl::SelfTimer timer (tl::verbosity () >= 21, tl::to_string (tr ("Reading LEF file: ")) + lp); + std::string lp = tl::combine_path (input_dir, *e); - tl::InputStream lef_stream (lp); - tl::log << tl::to_string (tr ("Reading")) << " " << lp; - importer.read_lef (lef_stream, layout, state); + tl::SelfTimer timer (tl::verbosity () >= 21, tl::to_string (tr ("Reading LEF file: ")) + lp); + + tl::InputStream lef_stream (lp); + tl::log << tl::to_string (tr ("Reading")) << " " << lp; + importer.read_lef (lef_stream, layout, state); + + } } @@ -323,6 +327,7 @@ class LEFDEFFormatDeclaration tl::make_member (&LEFDEFReaderOptions::special_routing_datatype_str, &LEFDEFReaderOptions::set_special_routing_datatype_str, "special-routing-datatype-string") + tl::make_member (&LEFDEFReaderOptions::via_cellname_prefix, &LEFDEFReaderOptions::set_via_cellname_prefix, "via-cellname-prefix") + tl::make_member (&LEFDEFReaderOptions::begin_lef_files, &LEFDEFReaderOptions::end_lef_files, &LEFDEFReaderOptions::push_lef_file, "lef-files") + + tl::make_member (&LEFDEFReaderOptions::read_lef_with_def, &LEFDEFReaderOptions::set_read_lef_with_def, "read-lef-with-def") + tl::make_member (&LEFDEFReaderOptions::macro_resolution_mode, &LEFDEFReaderOptions::set_macro_resolution_mode, "macro-resolution-mode", MacroResolutionModeConverter ()) + tl::make_member (&LEFDEFReaderOptions::separate_groups, &LEFDEFReaderOptions::set_separate_groups, "separate-groups") + tl::make_member (&LEFDEFReaderOptions::map_file, &LEFDEFReaderOptions::set_map_file, "map-file") diff --git a/src/plugins/streamers/lefdef/db_plugin/gsiDeclDbLEFDEF.cc b/src/plugins/streamers/lefdef/db_plugin/gsiDeclDbLEFDEF.cc index fe963515c..c8bcf3ea6 100644 --- a/src/plugins/streamers/lefdef/db_plugin/gsiDeclDbLEFDEF.cc +++ b/src/plugins/streamers/lefdef/db_plugin/gsiDeclDbLEFDEF.cc @@ -712,6 +712,20 @@ gsi::Class decl_lefdef_config ("db", "LEFDEFReaderConfi gsi::method ("lef_files=", &db::LEFDEFReaderOptions::set_lef_files, "@brief Sets the list technology LEF files to additionally import\n" "See \\lef_files for details." + ) + + gsi::method ("read_lef_with_def", &db::LEFDEFReaderOptions::read_lef_with_def, + "@brief Gets a value indicating whether to read all LEF files in the same directory than the DEF file.\n" + "If this property is set to true (the default), the DEF reader will automatically consume all LEF files " + "next to the DEF file in addition to the LEF files specified with \\lef_files. If set to false, only the " + "LEF files specified with \\lef_files will be read.\n" + "\n" + "This property has been added in version 0.27.\n" + ) + + gsi::method ("read_lef_with_def=", &db::LEFDEFReaderOptions::set_read_lef_with_def, gsi::arg ("flag"), + "@brief Sets a value indicating whether to read all LEF files in the same directory than the DEF file.\n" + "See \\read_lef_with_def for details about this property.\n" + "\n" + "This property has been added in version 0.27.\n" ), "@brief Detailed LEF/DEF reader options\n" "This class is a aggregate belonging to the \\LoadLayoutOptions class. It provides options for the LEF/DEF reader. " diff --git a/src/plugins/streamers/lefdef/lay_plugin/LEFDEFTechnologyComponentEditor.ui b/src/plugins/streamers/lefdef/lay_plugin/LEFDEFTechnologyComponentEditor.ui index bd6cf1950..9f3ed99f4 100644 --- a/src/plugins/streamers/lefdef/lay_plugin/LEFDEFTechnologyComponentEditor.ui +++ b/src/plugins/streamers/lefdef/lay_plugin/LEFDEFTechnologyComponentEditor.ui @@ -41,7 +41,7 @@ - LEF Files (specify what LEF files to use additionally) + LEF Files true @@ -189,6 +189,13 @@ + + + + for DEF: also read all LEF files in the same directory than the DEF file + + + diff --git a/src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImportDialogs.cc b/src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImportDialogs.cc index 94697f9c4..7693f38c7 100644 --- a/src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImportDialogs.cc +++ b/src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImportDialogs.cc @@ -452,6 +452,7 @@ LEFDEFReaderOptionsEditor::commit (db::FormatSpecificReaderOptions *options, con data->set_labels_suffix (tl::to_string (suffix_labels->text ())); data->set_labels_datatype (datatype_labels->text ().toInt ()); data->set_separate_groups (separate_groups->isChecked ()); + data->set_read_lef_with_def (read_lef_with_def->isChecked ()); data->set_map_file (tl::to_string (mapfile_path->text ())); data->set_macro_resolution_mode (produce_lef_geo->isChecked () ? 0 : 2); @@ -514,6 +515,7 @@ LEFDEFReaderOptionsEditor::setup (const db::FormatSpecificReaderOptions *options suffix_labels->setText (tl::to_qstring (data->labels_suffix ())); datatype_labels->setText (QString::number (data->labels_datatype ())); separate_groups->setChecked (data->separate_groups ()); + read_lef_with_def->setChecked (data->read_lef_with_def ()); mapfile_path->setText (tl::to_qstring (data->map_file ())); layer_map_mode->setCurrentIndex (data->map_file ().empty () ? 1 : 0); produce_lef_geo->setChecked (data->macro_resolution_mode () == 0); diff --git a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc index dd60edf1c..b4c8a1f8e 100644 --- a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc +++ b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc @@ -27,6 +27,7 @@ #include "dbLEFImporter.h" #include "tlUnitTest.h" +#include "dbTestSupport.h" #include @@ -527,3 +528,48 @@ TEST(114_lef_skips_end_library) run_test (_this, "lef-skips-end-library", "lef:in.lef+def:in.def", "au.oas", opt, false); } +TEST(200_lefdef_plugin) +{ + db::Layout ly; + + std::string fn_path (tl::testsrc ()); + fn_path += "/testdata/lefdef/masks-1/"; + + db::LEFDEFReaderOptions lefdef_opt = default_options (); + lefdef_opt.set_map_file ("in.map"); + db::LoadLayoutOptions opt; + opt.set_options (lefdef_opt); + + { + tl::InputStream is (fn_path + "in.def"); + db::Reader reader (is); + reader.read (ly, opt); + } + + db::compare_layouts (_this, ly, fn_path + "au_plugin_def.oas.gz", db::WriteOAS); +} + +TEST(201_lefdef_plugin_explicit_lef) +{ + db::Layout ly; + + std::string fn_path (tl::testsrc ()); + fn_path += "/testdata/lefdef/masks-1/"; + + db::LEFDEFReaderOptions lefdef_opt = default_options (); + lefdef_opt.set_map_file ("in.map"); + std::vector lf; + lf.push_back ("hidden/in_tech.lef"); + lefdef_opt.set_lef_files (lf); + lefdef_opt.set_read_lef_with_def (false); + db::LoadLayoutOptions opt; + opt.set_options (lefdef_opt); + + { + tl::InputStream is (fn_path + "in.def"); + db::Reader reader (is); + reader.read (ly, opt); + } + + db::compare_layouts (_this, ly, fn_path + "au_plugin_alt_lef.oas.gz", db::WriteOAS); +} diff --git a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFReaderOptionsTests.cc b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFReaderOptionsTests.cc index 7862352bc..9018a98c8 100644 --- a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFReaderOptionsTests.cc +++ b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFReaderOptionsTests.cc @@ -312,6 +312,10 @@ TEST(1) EXPECT_EQ (options.lef_files ().size (), size_t (1)); EXPECT_EQ (*options.begin_lef_files (), "ABC.lef"); + EXPECT_EQ (options.read_lef_with_def (), true); + options.set_read_lef_with_def (false); + EXPECT_EQ (options.read_lef_with_def (), false); + options.set_map_file ("ABC.map"); EXPECT_EQ (options.map_file (), "ABC.map"); diff --git a/testdata/lefdef/masks-1/au.oas.gz b/testdata/lefdef/masks-1/au.oas.gz index 579a0bc453fbb049ac78be435ba6f347a924779e..4d8805a01800c5103809435b1407e25debe09012 100644 GIT binary patch delta 14 VcmeC<=;7G#l!=jR^9v?5MgS$$1d#v$ delta 16 XcmeC-=;PS%l!=*NN^0{nCN)L?Ebau# diff --git a/testdata/lefdef/masks-1/au_map.oas.gz b/testdata/lefdef/masks-1/au_map.oas.gz index 45638cae1ea3ad06a4b1e9a2162a0a3a8d214671..dd9c9bc008868577076f620e8a1ffa688c5d1963 100644 GIT binary patch delta 14 Vcmeys^NweO7AqsyW?fciMgS)S1PTBE delta 16 XcmaFI^MPlB7ArHql+4E=B}H diff --git a/testdata/lefdef/masks-1/au_plugin_alt_lef.oas.gz b/testdata/lefdef/masks-1/au_plugin_alt_lef.oas.gz new file mode 100644 index 0000000000000000000000000000000000000000..9f2f877ccb2d5553180ef5266897829db2dff9a8 GIT binary patch literal 1652 zcmd^9%Wl&^6rDSh)~W4~mc~Ir>4F79AQ8o0Mr;Bx!BSqT(*i52B94Rv5f8DZh%Mq9 z%3tsaX;)RZ{6K(Bmk2i8J7W)H${*lta$fgNjz_s3hr{UhxEn`t#RlQG+H7Sp^J#il z<7C);T$otB;D!^xls zobG2$3T(1~v=#_KE#{(vINNXK4GNLs?gBP+3SfJG42qERRZ~LD<#>&>MpkT%cB{?^ zN>w!^urU%fa@G-1TLRlMzRQeiMu>&XXrwjThAq)R)e%9*#?9@lB~JIPhz&guT;4Zr zP=w=3B5#XhTNjvuhhlW!jF_UbUC84b=h&J$i^hgd0lIH;1{oBQIaFVq?wd4d?35*@ z207g~6J=S|8^;z^R%1h_Wpv;2xZHjQ6<+%S^CS3#pW1soU+o>Q0CFdw$vJUs>ztof zf7n~+u(DQG?MVs$z&>B8|ALuq11y2W<_%VcD)TxiaB{KJYV#U0Q2%)hjWq^ekz83j z+iw{_@R2)gw&`^^@DDI!OYknA;h_3=dZi4G)^Q-ESv^<+lWTYC-_nM42M{nd+3Orb Xw(PL6vwc(C_iioJKz{f?KaBkbp{Jp& literal 0 HcmV?d00001 diff --git a/testdata/lefdef/masks-1/au_plugin_def.oas.gz b/testdata/lefdef/masks-1/au_plugin_def.oas.gz new file mode 100644 index 0000000000000000000000000000000000000000..dd9c9bc008868577076f620e8a1ffa688c5d1963 GIT binary patch literal 1646 zcmd^9%Wl&^6rDSh)~W4~mc~Iv?t%qEAW_9$Mr;Bx#Zq3X-2yACY7z+vDjq_jD~i}6 zzJbr+6Oyi~Zux-#n=TP-xOc`L#*{z6tDMKZXM8-$^(5-Yw}+i1PHHxYV5`Lz7Be5; zyP9PE&Z8`ew+B%-iw9}69qnWf<8Jz(TJdYXl6MFHGWedIWa)5}-HUoX*Lt@9eEQ_+ z#JZGZ+ubA^?F>iJPWpI7pk+nub-SXlh}FHglf8QJdjI7l3$q{#N=$%UxI`0H3spx19UGHdc}tw`TNxXAD7d_D z+Mo!>l|<1N$F?poB@d0!eKW=sm1iN3Uz}rW>MR-?It|c$lRL=oCixtr(Z-XHesfFED*`bkul{hikm!H9+D76f-4)t)27J z`VV{U92VBXY8+JXuj})b<}VoAHoy!>^lz{#)S1_w04Enat^3!If#%OSY%DSOisZuD zTz|^|!jIfx<5jQCfq#H8n}K)v3>P)O)5m1+X&D#NG;4-4U@~^I`E9ac-2ntlZT8x8 Y$it2|HrH>8``)cXwU8hG&ktk20XDXvwg3PC literal 0 HcmV?d00001 diff --git a/testdata/lefdef/masks-1/hidden/in_tech.lef b/testdata/lefdef/masks-1/hidden/in_tech.lef new file mode 100644 index 000000000..8a06777ad --- /dev/null +++ b/testdata/lefdef/masks-1/hidden/in_tech.lef @@ -0,0 +1,32 @@ +LAYER M0PO + TYPE MASTERSLICE ; + WIDTH 0.02 ; + MASKS 2 ; +END M0PO +LAYER VIA0 + TYPE CUT ; + MASKS 2 ; +END VIA0 +LAYER M1 + TYPE MASTERSLICE ; + WIDTH 0.024 ; + MASKS 2 ; +END M1 +LAYER VIA1 + TYPE CUT ; + MASKS 2 ; +END VIA1 +LAYER M2 + TYPE MASTERSLICE ; + WIDTH 0.03 ; + MASKS 2 ; +END M2 + +VIA square + LAYER M0PO ; + RECT -0.08 -0.08 0.08 0.08 ; + LAYER VIA0 ; + RECT -0.08 -0.08 0.08 0.08 ; + LAYER M1 ; + RECT -0.08 -0.08 0.08 0.08 ; +END square diff --git a/testdata/lefdef/masks-1/in_tech.lef b/testdata/lefdef/masks-1/in_tech.lef index c794d34d5..4d7c3fc47 100644 --- a/testdata/lefdef/masks-1/in_tech.lef +++ b/testdata/lefdef/masks-1/in_tech.lef @@ -9,7 +9,7 @@ LAYER VIA0 END VIA0 LAYER M1 TYPE MASTERSLICE ; - WIDTH 0.025 ; + WIDTH 0.024 ; MASKS 2 ; END M1 LAYER VIA1 diff --git a/testdata/ruby/dbReaders.rb b/testdata/ruby/dbReaders.rb index eb33d4c61..f96956f99 100644 --- a/testdata/ruby/dbReaders.rb +++ b/testdata/ruby/dbReaders.rb @@ -353,6 +353,10 @@ class DBReaders_TestClass < TestBase conf.lef_files = [ "u.lef", "v.lef" ] assert_equal(conf.lef_files.join(","), "u.lef,v.lef") + assert_equal(conf.read_lef_with_def, true) + conf.read_lef_with_def = false + assert_equal(conf.read_lef_with_def, false) + end # MAG Options From 35249ef0b551975401ec8a2b5db633ac0a6da405 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Wed, 19 Aug 2020 23:47:25 +0200 Subject: [PATCH 070/121] Reading LEF/DEF map files such that MASK is applied to previous entries too. --- .../lefdef/db_plugin/dbLEFDEFImporter.cc | 51 +++++++++--------- .../lefdef/db_plugin/dbLEFDEFImporter.h | 2 +- .../lefdef/db_plugin/dbLEFDEFPlugin.cc | 2 +- .../lefdef/unit_tests/dbLEFDEFImportTests.cc | 6 +-- testdata/lefdef/mapfile/au.oas.gz | Bin 1091 -> 1059 bytes 5 files changed, 32 insertions(+), 29 deletions(-) diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc index 63d4b2685..6ac750f72 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc @@ -729,6 +729,11 @@ LEFDEFReaderState::read_map_file (const std::string &path, db::Layout &layout) purpose_translation ["VIA"] = ViaGeometry; purpose_translation ["BLOCKAGE"] = Blockage; + std::map purpose_translation_rev; + for (std::map::const_iterator i = purpose_translation.begin (); i != purpose_translation.end (); ++i) { + purpose_translation_rev.insert (std::make_pair (i->second, i->first)); + } + std::map >, db::LayerProperties> layer_map; while (! ts.at_end ()) { @@ -745,7 +750,6 @@ LEFDEFReaderState::read_map_file (const std::string &path, db::Layout &layout) std::string w1, w2; int layer = 0, datatype = 0; size_t max_purpose_str = 10; - bool purpose_abbreviated = false; if (ex.try_read_word (w1) && ex.try_read_word (w2, "._$,/:") && ex.try_read (layer) && ex.try_read (datatype)) { @@ -790,9 +794,12 @@ LEFDEFReaderState::read_map_file (const std::string &path, db::Layout &layout) // (separating, translating and recombing the purposes) std::set > translated_purposes; - std::string purpose_str; std::vector purposes = tl::split (w2, ","); + std::reverse (purposes.begin (), purposes.end ()); + + unsigned int mask = 0; + for (std::vector::const_iterator p = purposes.begin (); p != purposes.end (); ++p) { std::string p_uc = tl::to_upper_case (*p); @@ -801,8 +808,6 @@ LEFDEFReaderState::read_map_file (const std::string &path, db::Layout &layout) std::string ps; ex.read_word_or_quoted (ps); - unsigned int mask = 0; - if (ex.test (":")) { if (ex.test ("MASK") && ex.test (":")) { ex.read (mask); @@ -811,33 +816,31 @@ LEFDEFReaderState::read_map_file (const std::string &path, db::Layout &layout) std::map::const_iterator i = purpose_translation.find (ps); if (i != purpose_translation.end ()) { - translated_purposes.insert (std::make_pair (i->second, mask)); + } - if (! purpose_abbreviated) { + } - if (! purpose_str.empty ()) { - purpose_str += "/"; - } + // create a visual description string for the combined purposes + std::string purpose_str; - if (purpose_str.size () > max_purpose_str) { + for (std::set >::const_iterator p = translated_purposes.begin (); p != translated_purposes.end (); ++p) { - purpose_abbreviated = true; - purpose_str += "..."; + if (p != translated_purposes.begin ()) { + purpose_str += "/"; + } - } else { - - purpose_str += i->first; - - if (mask > 0) { - purpose_str += ":"; - purpose_str += tl::to_string (mask); - } - - } - - } + std::string ps = purpose_translation_rev [p->first]; + if (p->second > 0) { + ps += ":"; + ps += tl::to_string (p->second); + } + if ((purpose_str + ps).size () > max_purpose_str) { + purpose_str += "..."; + break; + } else { + purpose_str += ps; } } diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h index 4009a7ad6..ca1007e6c 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h @@ -851,9 +851,9 @@ enum LayerPurpose Routing = 0, // from DEF only SpecialRouting, // from DEF only ViaGeometry, // from LEF+DEF - Label, // from LEF+DEF Pins, // from DEF LEFPins, // from LEF + Label, // from LEF+DEF Obstructions, // from LEF only Outline, // from LEF+DEF Blockage, // from DEF only diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc index 6ac19b03f..13801edd5 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc @@ -164,7 +164,7 @@ private: if (tl::file_exists (input_dir)) { - std::vector entries = tl::dir_entries (input_dir); + std::vector entries = tl::dir_entries (input_dir, true, false, true); for (std::vector::const_iterator e = entries.begin (); e != entries.end (); ++e) { if (is_lef_format (*e)) { diff --git a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc index b4c8a1f8e..f32115248 100644 --- a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc +++ b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc @@ -492,30 +492,30 @@ TEST(113_masks_1) "'M0PO.SPNET:2' : 'M0PO.SPNET:2' (1/201)\n" "'M0PO.VIA:1' : 'M0PO.VIA:1' (1/102)\n" "'M0PO.VIA:2' : 'M0PO.VIA:2' (1/202)\n" - "M0PO.LABEL : M0PO.LABEL (1/1)\n" "M0PO.PIN : M0PO.PIN (1/2)\n" "'M0PO.PIN:1' : 'M0PO.PIN:1' (1/110)\n" "'M0PO.PIN:2' : 'M0PO.PIN:2' (1/210)\n" + "M0PO.LABEL : M0PO.LABEL (1/1)\n" "'M1.NET:1' : 'M1.NET:1' (3/100)\n" "'M1.NET:2' : 'M1.NET:2' (3/200)\n" "'M1.SPNET:1' : 'M1.SPNET:1' (3/101)\n" "'M1.SPNET:2' : 'M1.SPNET:2' (3/201)\n" "'M1.VIA:1' : 'M1.VIA:1' (3/102)\n" "'M1.VIA:2' : 'M1.VIA:2' (3/202)\n" - "M1.LABEL : M1.LABEL (3/1)\n" "M1.PIN : M1.PIN (3/2)\n" "'M1.PIN:1' : 'M1.PIN:1' (3/110)\n" "'M1.PIN:2' : 'M1.PIN:2' (3/210)\n" + "M1.LABEL : M1.LABEL (3/1)\n" "'VIA0.NET:1' : 'VIA0.NET:1' (2/100)\n" "'VIA0.NET:2' : 'VIA0.NET:2' (2/200)\n" "'VIA0.SPNET:1' : 'VIA0.SPNET:1' (2/101)\n" "'VIA0.SPNET:2' : 'VIA0.SPNET:2' (2/201)\n" "'VIA0.VIA:1' : 'VIA0.VIA:1' (2/102)\n" "'VIA0.VIA:2' : 'VIA0.VIA:2' (2/202)\n" - "VIA0.LABEL : VIA0.LABEL (2/1)\n" "VIA0.PIN : VIA0.PIN (2/2)\n" "'VIA0.PIN:1' : 'VIA0.PIN:1' (2/110)\n" "'VIA0.PIN:2' : 'VIA0.PIN:2' (2/210)\n" + "VIA0.LABEL : VIA0.LABEL (2/1)\n" ) } diff --git a/testdata/lefdef/mapfile/au.oas.gz b/testdata/lefdef/mapfile/au.oas.gz index d0ee614aea2d2210123b3fc51fdfea624971a6e1..b91e51866a40fd9ee6695667c7baf464007eada0 100644 GIT binary patch delta 255 zcmX@iv6y4R4Rs-3g8+X$Ki3fb-~bS*r>Dov#mvBiCO(;+F?4bTquJybMw!X$7@g_` ze2vg_@d0&V73CHR^K>*oQ_T&s1G_j_y&;-uU*hsg=dyi5!X0KxA#+W-In delta 286 zcmZ3?ahPMm4Sg|Rg8+X$A6K^kPd|Mi+iOeDvCm1yuCU0a)5)`gx Date: Sat, 22 Aug 2020 19:09:30 +0200 Subject: [PATCH 071/121] Added LEF/DEF options to strm* buddies --- src/buddies/src/bd/bdReaderOptions.cc | 448 ++++++++++++++++-- src/buddies/src/bd/bdReaderOptions.h | 52 +- src/db/db/dbLoadLayoutOptions.cc | 78 ++- src/db/db/dbLoadLayoutOptions.h | 15 + .../lefdef/db_plugin/dbLEFDEFPlugin.cc | 2 + .../lefdef/db_plugin/gsiDeclDbLEFDEF.cc | 86 ++++ .../LEFDEFTechnologyComponentEditor.ui | 2 +- src/tl/tl/tlCommandLineParser.cc | 2 +- 8 files changed, 621 insertions(+), 64 deletions(-) diff --git a/src/buddies/src/bd/bdReaderOptions.cc b/src/buddies/src/bd/bdReaderOptions.cc index 0140c794d..72b453c5d 100644 --- a/src/buddies/src/bd/bdReaderOptions.cc +++ b/src/buddies/src/bd/bdReaderOptions.cc @@ -28,33 +28,98 @@ namespace bd { GenericReaderOptions::GenericReaderOptions () - : m_prefix ("i"), m_group_prefix ("Input"), m_create_other_layers (true), - m_common_enable_text_objects (true), - m_common_enable_properties (true), - m_gds2_box_mode (1), - m_gds2_allow_big_records (true), - m_gds2_allow_multi_xy_records (true), - m_oasis_read_all_properties (true), - m_oasis_expect_strict_mode (-1), - m_cif_wire_mode (0), - m_cif_dbu (0.001), - m_cif_keep_layer_names (false), - m_dxf_dbu (0.001), - m_dxf_unit (1.0), - m_dxf_text_scaling (100.0), - m_dxf_polyline_mode (0), - m_dxf_circle_points (100), - m_dxf_circle_accuracy (0.0), - m_dxf_contour_accuracy (0.0), - m_dxf_render_texts_as_polygons (false), - m_dxf_keep_layer_names (false), - m_dxf_keep_other_cells (false), - m_magic_lambda (1.0), - m_magic_dbu (0.001), - m_magic_keep_layer_names (false), - m_magic_merge (true) + : m_prefix ("i"), m_group_prefix ("Input"), m_layer_map (), m_create_other_layers (true), + m_dbu (0.001), m_keep_layer_names (false) { - // .. nothing yet .. + // initialize from the default settings + + db::LoadLayoutOptions load_options; + + m_common_enable_text_objects = load_options.get_option_by_name ("text_enabled").to_bool (); + m_common_enable_properties = load_options.get_option_by_name ("properties_enabled").to_bool (); + + m_gds2_box_mode = load_options.get_option_by_name ("gds2_box_mode").to_uint (); + m_gds2_allow_big_records = load_options.get_option_by_name ("gds2_allow_big_records").to_bool (); + m_gds2_allow_multi_xy_records = load_options.get_option_by_name ("gds2_allow_multi_xy_records").to_bool (); + + m_oasis_read_all_properties = load_options.get_option_by_name ("oasis_read_all_properties").to_bool (); + m_oasis_expect_strict_mode = load_options.get_option_by_name ("oasis_expect_strict_mode").to_bool (); + + m_create_other_layers = load_options.get_option_by_name ("cif_create_other_layers").to_bool (); + m_cif_wire_mode = load_options.get_option_by_name ("cif_wire_mode").to_uint (); + + m_dxf_unit = load_options.get_option_by_name ("dxf_unit").to_double (); + m_dxf_text_scaling = load_options.get_option_by_name ("dxf_text_scaling").to_double (); + m_dxf_polyline_mode = load_options.get_option_by_name ("dxf_polyline_mode").to_int (); + m_dxf_circle_points = load_options.get_option_by_name ("dxf_circle_points").to_int (); + m_dxf_circle_accuracy = load_options.get_option_by_name ("dxf_circle_accuracy").to_double (); + m_dxf_contour_accuracy = load_options.get_option_by_name ("dxf_contour_accuracy").to_double (); + m_dxf_render_texts_as_polygons = load_options.get_option_by_name ("dxf_render_texts_as_polygons").to_bool (); + m_dxf_keep_other_cells = load_options.get_option_by_name ("dxf_keep_other_cells").to_bool (); + + m_magic_lambda = load_options.get_option_by_name ("mag_lambda").to_double (); + m_magic_merge = load_options.get_option_by_name ("mag_merge").to_bool (); + + tl::Variant mag_library_paths = load_options.get_option_by_name ("mag_library_paths"); + for (tl::Variant::const_iterator i = mag_library_paths.begin (); i != mag_library_paths.end (); ++i) { + m_magic_lib_path.push_back (i->to_string ()); + } + + tl::Variant v; + + v = load_options.get_option_by_name ("lefdef_config.net_property_name"); + m_lefdef_produce_net_names = ! v.is_nil (); + m_lefdef_net_property_name = v .to_parsable_string (); + + v = load_options.get_option_by_name ("lefdef_config.instance_property_name"); + m_lefdef_produce_inst_names = ! v.is_nil (); + m_lefdef_inst_property_name = v .to_parsable_string (); + + v = load_options.get_option_by_name ("lefdef_config.pin_property_name"); + m_lefdef_produce_pin_names = ! v.is_nil (); + m_lefdef_pin_property_name = v .to_parsable_string (); + + m_lefdef_produce_cell_outlines = load_options.get_option_by_name ("lefdef_config.produce_cell_outlines").to_bool (); + m_lefdef_cell_outline_layer = load_options.get_option_by_name ("lefdef_config.cell_outline_layer").to_string (); + m_lefdef_produce_placement_blockages = load_options.get_option_by_name ("lefdef_config.produce_placement_blockages").to_bool (); + m_lefdef_placement_blockage_layer = load_options.get_option_by_name ("lefdef_config.placement_blockage_layer").to_string (); + m_lefdef_produce_regions = load_options.get_option_by_name ("lefdef_config.produce_regions").to_bool (); + m_lefdef_region_layer = load_options.get_option_by_name ("lefdef_config.region_layer").to_string (); + m_lefdef_produce_via_geometry = load_options.get_option_by_name ("lefdef_config.produce_via_geometry").to_bool (); + m_lefdef_via_geometry_suffix = load_options.get_option_by_name ("lefdef_config.via_geometry_suffix_str").to_string (); + m_lefdef_via_geometry_datatype = load_options.get_option_by_name ("lefdef_config.via_geometry_datatype_str").to_string (); + m_lefdef_via_cellname_prefix = load_options.get_option_by_name ("lefdef_config.via_cellname_prefix").to_string (); + m_lefdef_produce_pins = load_options.get_option_by_name ("lefdef_config.produce_pins").to_bool (); + m_lefdef_pins_suffix = load_options.get_option_by_name ("lefdef_config.pins_suffix_str").to_string (); + m_lefdef_pins_datatype = load_options.get_option_by_name ("lefdef_config.pins_datatype_str").to_string (); + m_lefdef_produce_lef_pins = load_options.get_option_by_name ("lefdef_config.produce_lef_pins").to_bool (); + m_lefdef_lef_pins_suffix = load_options.get_option_by_name ("lefdef_config.lef_pins_suffix_str").to_string (); + m_lefdef_lef_pins_datatype = load_options.get_option_by_name ("lefdef_config.lef_pins_datatype_str").to_string (); + m_lefdef_produce_obstructions = load_options.get_option_by_name ("lefdef_config.produce_obstructions").to_bool (); + m_lefdef_obstruction_suffix = load_options.get_option_by_name ("lefdef_config.obstructions_suffix").to_string (); + m_lefdef_obstruction_datatype = load_options.get_option_by_name ("lefdef_config.obstructions_datatype").to_int (); + m_lefdef_produce_blockages = load_options.get_option_by_name ("lefdef_config.produce_blockages").to_bool (); + m_lefdef_blockage_suffix = load_options.get_option_by_name ("lefdef_config.blockages_suffix").to_string (); + m_lefdef_blockage_datatype = load_options.get_option_by_name ("lefdef_config.blockages_datatype").to_int (); + m_lefdef_produce_labels = load_options.get_option_by_name ("lefdef_config.produce_labels").to_bool (); + m_lefdef_label_suffix = load_options.get_option_by_name ("lefdef_config.labels_suffix").to_string (); + m_lefdef_label_datatype = load_options.get_option_by_name ("lefdef_config.labels_datatype").to_int (); + m_lefdef_produce_routing = load_options.get_option_by_name ("lefdef_config.produce_routing").to_bool (); + m_lefdef_routing_suffix = load_options.get_option_by_name ("lefdef_config.routing_suffix_str").to_string (); + m_lefdef_routing_datatype = load_options.get_option_by_name ("lefdef_config.routing_datatype_str").to_string (); + m_lefdef_produce_special_routing = load_options.get_option_by_name ("lefdef_config.produce_special_routing").to_bool (); + m_lefdef_special_routing_suffix = load_options.get_option_by_name ("lefdef_config.special_routing_suffix_str").to_string (); + m_lefdef_special_routing_datatype = load_options.get_option_by_name ("lefdef_config.special_routing_datatype_str").to_string (); + + tl::Variant lef_files = load_options.get_option_by_name ("lefdef_config.lef_files"); + for (tl::Variant::const_iterator i = lef_files.begin (); i != lef_files.end (); ++i) { + m_lefdef_lef_files.push_back (i->to_string ()); + } + + m_lefdef_read_lef_with_def = load_options.get_option_by_name ("lefdef_config.read_lef_with_def").to_bool (); + m_lefdef_separate_groups = load_options.get_option_by_name ("lefdef_config.separate_groups").to_bool (); + m_lefdef_map_file = load_options.get_option_by_name ("lefdef_config.map_file").to_string (); + m_lefdef_produce_lef_macros = (load_options.get_option_by_name ("lefdef_config.macro_resolution_mode").to_int () == 0); } void @@ -263,6 +328,274 @@ GenericReaderOptions::add_options (tl::CommandLineOptions &cmd) ) ; } + + + { + std::string group ("[" + m_group_prefix + " options - LEF/DEF specific]"); + + cmd << tl::arg (group + + "#!--" + m_long_prefix + "lefdef-dont-produce-net-names", &m_lefdef_produce_net_names, "Disables producing net names as shape properties", + "If this option is present, net names will not be emitted as shape properties." + ) + << tl::arg (group + + "#--" + m_long_prefix + "lefdef-net-property-name=spec", &m_lefdef_net_property_name, "Specifies which property name to use for net names", + "This option gives the name of the shape property used to annotate net names. For 'spec' use:\n" + "\n" + "* \"#n\" for property number \"n\" (compatible with GDS2)\n" + "* A plain word for a named property (not compatible with GDS2)\n" + "\n" + "Producing net name annotation properties can be turned off with '--" + m_long_prefix + "lefdef-dont-produce-net-names'." + ) + << tl::arg (group + + "#!--" + m_long_prefix + "lefdef-dont-produce-instance-names", &m_lefdef_produce_inst_names, "Disables producing DEF macro instance names as instance properties", + "If this option is present, DEF macro instance names will not be emitted as instance properties." + ) + << tl::arg (group + + "#--" + m_long_prefix + "lefdef-instance-property-name=spec", &m_lefdef_inst_property_name, "Specifies which property name to use for DEF macro instance names", + "This option gives the name of the instance property used to annotate DEF macro instance names. " + "For the 'spec' format see '--" + m_long_prefix + "lefdef-net-property-name'." + "\n" + "Producing instance name annotation properties can be turned off with '--" + m_long_prefix + "lefdef-dont-produce-instance-names'." + ) + << tl::arg (group + + "#!--" + m_long_prefix + "lefdef-dont-produce-pin-names", &m_lefdef_produce_pin_names, "Disables producing pin names as shape or instance properties", + "If this option is present, Pin names will not be emitted as shape or instance properties." + ) + << tl::arg (group + + "#--" + m_long_prefix + "lefdef-pin-property-name=spec", &m_lefdef_pin_property_name, "Specifies which property name to use for pin names", + "This option gives the name of the shape or instance property used to annotate pin names. " + "For the 'spec' format see '--" + m_long_prefix + "lefdef-net-property-name'." + "\n" + "Producing pin name annotation properties can be turned off with '--" + m_long_prefix + "lefdef-dont-produce-pin-names'." + ) + << tl::arg (group + + "#!--" + m_long_prefix + "lefdef-dont-produce-cell-outlines", &m_lefdef_produce_cell_outlines, "Disables producing cell outlines", + "If this option is present, cell outlines will be skipped. Otherwise the cell outlines will be written to a layer given with '--" + m_long_prefix + "lefdef-cell-outline-layer'." + ) + << tl::arg (group + + "#--" + m_long_prefix + "lefdef-cell-outline-layer=spec", &m_lefdef_cell_outline_layer, "Specifies which layer to use for the cell outlines", + "This option specifies the layer to use for the cell outline polygons. For 'spec' use:\n" + "\n" + "* \"l\" or \"l/d\" for a numerical layer or layer/datatype combination.\n" + "* A plain word for a named layer\n" + "* A name followed by a layer or layer/datatype combination in round brackets for a combined specification\n" + "\n" + "Producing cell outline markers can be turned off with '--" + m_long_prefix + "lefdef-dont-produce-cell-outlines'." + ) + << tl::arg (group + + "#!--" + m_long_prefix + "lefdef-dont-produce-placement-blockages", &m_lefdef_produce_placement_blockages, "Disables producing blockage markers", + "If this option is present, blockages will be skipped. Otherwise the blockage markers will be written to a layer given with '--" + m_long_prefix + "lefdef-placement-blockage-layer'." + ) + << tl::arg (group + + "#--" + m_long_prefix + "lefdef-placement-blockage-layer=spec", &m_lefdef_placement_blockage_layer, "Specifies which layer to use for the placement blockage markers", + "For the 'spec' format see '--" + m_long_prefix + "lefdef-cell-outline-layer'.\n" + "\n" + "Producing cell placement blockage markers can be turned off with '--" + m_long_prefix + "lefdef-dont-produce-placement-blockages'." + ) + << tl::arg (group + + "#!--" + m_long_prefix + "lefdef-dont-produce-regions", &m_lefdef_produce_regions, "Disables producing regions", + "If this option is present, regions will be skipped. Otherwise the regions will be written to a layer given with '--" + m_long_prefix + "lefdef-region-layer'." + ) + << tl::arg (group + + "#--" + m_long_prefix + "lefdef-region-layer=spec", &m_lefdef_region_layer, "Specifies which layer to use for the regions", + "For the 'spec' format see '--" + m_long_prefix + "lefdef-cell-outline-layer'.\n" + "\n" + "Producing regions can be turned off with '--" + m_long_prefix + "lefdef-dont-produce-regions'." + ) + << tl::arg (group + + "#--" + m_long_prefix + "lefdef-separate-groups", &m_lefdef_separate_groups, "Specifies to separate groups of regions into a hierarchy", + "This option is used together with '--" + m_long_prefix + "lefdef-produce-regions'. If given, the region polygons will be put " + "into a cell hierarchy where the cells indicate the region groups.\n" + ) + << tl::arg (group + + "#!--" + m_long_prefix + "lefdef-dont-produce-via-geometry", &m_lefdef_produce_via_geometry, "Skips vias when producing geometry", + "If this option is given, no via geometry will be produced." + ) + << tl::arg (group + + "#--" + m_long_prefix + "lefdef-via-geometry-suffix", &m_lefdef_via_geometry_suffix, "Specifies the via geometry layer suffix in pattern-based mode", + "Use '" + m_long_prefix + "lefdef-via-geometry-suffix' and '--" + m_long_prefix + "lefdef-via-geometry-datatype' together with " + "a layer map (see '-" + m_prefix + "m') to customize where the via geometry will be put.\n" + "\n" + "This option is part of the 'pattern-based' LEF/DEF layer mapping scheme.\n" + "\n" + "The mechanism is this: from the geometry's layer name and the suffix an effective layer name is produced. For example if the " + "geometry is on layer 'M1' and the suffix is '_VIA', the effective layer name will be 'M1_VIA'. This layer is looked up in the " + "layer map. If no such layer is found, the geometry layer name without suffix is looked up. If this layer is found, the datatype " + "is substituted by the datatype specified with the '--" + m_long_prefix + "lefdef-via-geometry-datatype'. So eventually it's " + "possible to use a detailed mapping by layer name + suffix or a generic mapping by layer name + datatype.\n" + "\n" + "Suffix and datatype can be made MASK specific by giving a list of values in the form: \",1:,2:...\". " + "For example, a datatype specification of \"6,1:61,2:62\" will use datatype 6 for via geometry without a mask assignment, " + "datatype 61 for via geometry assigned to MASK 1 and datatype 62 for via geometry assigned to MASK 2.\n" + "\n" + "An alternative way to provide a layer mapping is through a map file (see '--" + m_long_prefix + "lefdef-map-file')." + ) + << tl::arg (group + + "#--" + m_long_prefix + "lefdef-via-geometry-datatype", &m_lefdef_via_geometry_datatype, "Specifies the via geometry layer datatype in pattern-based mode", + "See '--" + m_long_prefix + "lefdef-via-geometry-suffix' for a description of this option.\n" + ) + << tl::arg (group + + "#--" + m_long_prefix + "lefdef-via-cell-prefix", &m_lefdef_via_cellname_prefix, "Specifies the prefix for the cell names generated for vias", + "Vias will be put into their own cells by the LEF/DEF reader. This option gives a prefix that is used to form the name of " + "these cells. The name is built from the prefix plus the via name.\n" + ) + << tl::arg (group + + "#!--" + m_long_prefix + "lefdef-dont-produce-pins", &m_lefdef_produce_pins, "Skips pins when producing geometry", + "If this option is given, no pin geometry will be produced." + ) + << tl::arg (group + + "#--" + m_long_prefix + "lefdef-pins-suffix", &m_lefdef_pins_suffix, "Specifies the pin geometry layer suffix in pattern-based mode", + "The pin geometry generation and layer mapping is designed in the same way than via geometry mapping. " + "See '--" + m_long_prefix + "lefdef-via-geometry-suffix' for a description of the mapping scheme.\n" + ) + << tl::arg (group + + "#--" + m_long_prefix + "lefdef-pins-datatype", &m_lefdef_pins_datatype, "Specifies the pin geometry layer datatype in pattern-based mode", + "The pin geometry generation and layer mapping is designed in the same way than via geometry mapping. " + "See '--" + m_long_prefix + "lefdef-produce-via-geometry' for a description of the mapping scheme.\n" + ) + << tl::arg (group + + "#!--" + m_long_prefix + "lefdef-dont-produce-lef-pins", &m_lefdef_produce_lef_pins, "Skips LEF pins when producing geometry", + "If this option is given, no LEF pin geometry will be produced." + ) + << tl::arg (group + + "#--" + m_long_prefix + "lefdef-lef-pins-suffix", &m_lefdef_lef_pins_suffix, "Specifies the LEF pin geometry layer suffix in pattern-based mode", + "The LEF pin geometry generation and layer mapping is designed in the same way than via geometry mapping. " + "See '--" + m_long_prefix + "lefdef-via-geometry-suffix' for a description of the mapping scheme.\n" + ) + << tl::arg (group + + "#--" + m_long_prefix + "lefdef-lef-pins-datatype", &m_lefdef_lef_pins_datatype, "Specifies the LEF pin geometry layer datatype in pattern-based mode", + "The LEF pin geometry generation and layer mapping is designed in the same way than via geometry mapping. " + "See '--" + m_long_prefix + "lefdef-produce-via-geometry' for a description of the mapping scheme.\n" + ) + << tl::arg (group + + "#!--" + m_long_prefix + "lefdef-dont-produce-routing", &m_lefdef_produce_routing, "Skips routing when producing geometry", + "If this option is given, no routing geometry will be produced." + ) + << tl::arg (group + + "#--" + m_long_prefix + "lefdef-routing-suffix", &m_lefdef_routing_suffix, "Specifies the routing geometry layer suffix in pattern-based mode", + "The routing geometry generation and layer mapping is designed in the same way than via geometry mapping. " + "See '--" + m_long_prefix + "lefdef-via-geometry-suffix' for a description of the mapping scheme.\n" + ) + << tl::arg (group + + "#--" + m_long_prefix + "lefdef-routing-datatype", &m_lefdef_routing_datatype, "Specifies the routing geometry layer datatype in pattern-based mode", + "The routing geometry generation and layer mapping is designed in the same way than via geometry mapping. " + "See '--" + m_long_prefix + "lefdef-via-geometry-suffix' for a description of the mapping scheme.\n" + ) + << tl::arg (group + + "#!--" + m_long_prefix + "lefdef-dont-produce-special-routing", &m_lefdef_produce_special_routing, "Skips special routing when producing geometry", + "If this option is given, no special routing geometry will be produced." + ) + << tl::arg (group + + "#--" + m_long_prefix + "lefdef-special-routing-suffix", &m_lefdef_special_routing_suffix, "Specifies the special routing geometry layer suffix in pattern-based mode", + "The special routing geometry generation and layer mapping is designed in the same way than via geometry mapping. " + "See '--" + m_long_prefix + "lefdef-via-geometry-suffix' for a description of the mapping scheme.\n" + ) + << tl::arg (group + + "#--" + m_long_prefix + "lefdef-special-routing-datatype", &m_lefdef_special_routing_datatype, "Specifies the special routing geometry layer datatype in pattern-based mode", + "The special routing geometry generation and layer mapping is designed in the same way than via geometry mapping. " + "See '--" + m_long_prefix + "lefdef-via-geometry-suffix' for a description of the mapping scheme.\n" + ) + << tl::arg (group + + "#!--" + m_long_prefix + "lefdef-dont-produce-obstructions", &m_lefdef_produce_obstructions, "Skips obstructions when producing geometry", + "If this option is given, no obstruction marker geometry will be produced." + ) + << tl::arg (group + + "#--" + m_long_prefix + "lefdef-obstruction-suffix", &m_lefdef_obstruction_suffix, "Specifies the obstruction markers layer suffix in pattern-based mode", + "The obstruction marker generation and layer mapping is designed in the same way than via geometry mapping, except the option to use mask specific target layers. " + "See '--" + m_long_prefix + "lefdef-via-geometry-suffix' for a description of the mapping scheme.\n" + ) + << tl::arg (group + + "#--" + m_long_prefix + "lefdef-obstruction-datatype", &m_lefdef_obstruction_datatype, "Specifies the obstruction markers layer datatype in pattern-based mode", + "The obstruction marker generation and layer mapping is designed in the same way than via geometry mapping, except the option to use mask specific target layers. " + "See '--" + m_long_prefix + "lefdef-via-geometry-suffix' for a description of the mapping scheme.\n" + ) + << tl::arg (group + + "#!--" + m_long_prefix + "lefdef-dont-produce-blockages", &m_lefdef_produce_blockages, "Skips blockages when producing geometry", + "If this option is given, no blockage geometry will be produced." + ) + << tl::arg (group + + "#--" + m_long_prefix + "lefdef-blockage-suffix", &m_lefdef_blockage_suffix, "Specifies the blockage markers layer suffix in pattern-based mode", + "The blockage marker generation and layer mapping is designed in the same way than via geometry mapping, except the option to use mask specific target layers. " + "See '--" + m_long_prefix + "lefdef-via-geometry-suffix' for a description of the mapping scheme.\n" + ) + << tl::arg (group + + "#--" + m_long_prefix + "lefdef-blockage-datatype", &m_lefdef_blockage_datatype, "Specifies the blockage markers layer datatype in pattern-based mode", + "The blockage marker generation and layer mapping is designed in the same way than via geometry mapping, except the option to use mask specific target layers. " + "See '--" + m_long_prefix + "lefdef-via-geometry-suffix' for a description of the mapping scheme.\n" + ) + << tl::arg (group + + "#!--" + m_long_prefix + "lefdef-dont-produce-labels", &m_lefdef_produce_labels, "Skips label when producing geometry", + "If this option is given, no blockage geometry will be produced." + ) + << tl::arg (group + + "#--" + m_long_prefix + "lefdef-label-suffix", &m_lefdef_label_suffix, "Specifies the label markers layer suffix in pattern-based mode", + "The label marker generation and layer mapping is designed in the same way than via geometry mapping, except the option to use mask specific target layers. " + "See '--" + m_long_prefix + "lefdef-via-geometry-suffix' for a description of the mapping scheme.\n" + ) + << tl::arg (group + + "#--" + m_long_prefix + "lefdef-label-datatype", &m_lefdef_label_datatype, "Specifies the label markers layer datatype in pattern-based mode", + "The label marker generation and layer mapping is designed in the same way than via geometry mapping, except the option to use mask specific target layers. " + "See '--" + m_long_prefix + "lefdef-via-geometry-suffix' for a description of the mapping scheme.\n" + ) + << tl::arg (group + + "--" + m_long_prefix + "lefdef-map", &m_lefdef_map_file, "Specifies to use a layer map file", + "Use this option to turn off pattern-based layer mapping and to use an explicit mapping file instead. " + "See '--" + m_long_prefix + "lefdef-via-geometry-suffix' for a description of the pattern-based mapping scheme.\n" + "\n" + "Using a map file is an alternative way to specify layer mapping. With a layer mapping file, the individual target " + "layers need to specified individually for different layer/purpose combinations.\n" + "\n" + "The mapping file is one layer mapping entry per line. Each line is a layer name, followed by a list of purposes (VIA, PIN ...) " + "and a layer and datatype number. In addition, 'DIEAREA' can be used to map the design outline to a layer. 'NAME' in place of the " + "layer name and using layer/purpose in the purpose column allows mapping labels to specific layers.\n" + "\n" + "This is an example for a layer map file:\n" + "\n" + "DIEAREA ALL 100 0\n" + "M1 LEFPIN 12 0\n" + "M1 PIN 12 2\n" + "M1 NET 12 3\n" + "M1 SPNET 12 4\n" + "M1 VIA 12 5\n" + "M1 BLOCKAGE 12 10\n" + "NAME M1/PIN 12 10\n" + "VIA1 LEFPIN,VIA,PIN,NET,SPNET 13 0\n" + "M2 LEFPIN,PIN,NET,SPNET,VIA 14 0\n" + "\n" + "If a map file is used, only the layers present in the map file are generated. No other layers are produced." + ) + << tl::arg (group + + "!--" + m_long_prefix + "lefdef-no-lef-macros", &m_lefdef_produce_lef_macros, "Don't produce LEF macro geometry", + "This option applies when reading DEF files.\n" + "\n" + "If this option is present, no geometry will be produced for LEF macros. Instead, a ghost cell with the name of the LEF " + "macro will be produced. If this option is not given, the LEF macros will be inserted in to these cells " + "unless a FOREIGN specification is present in the LEF macro. If a FOREIGN specification is given, LEF geometry is never " + "inserted into a DEF file. Instead ghost cells are created." + ) + << tl::arg (group + + "!--" + m_long_prefix + "lefdef-no-implicit-lef", &m_lefdef_read_lef_with_def, "Disables reading all LEF files together with DEF files", + "This option applies when reading DEF files.\n" + "\n" + "If this option is given, only the LEF files specified with '--" + m_long_prefix + "lefdef-lef-files' will be read." + "\n" + "If this option is not present, the DEF reader will look for all files with 'LEF' or related extensions " + "in the same place than the DEF file and read these files before the DEF file is read. In addition, it will read the " + "LEF files specified with '--" + m_long_prefix + "lefdef-lef-files'." + ) + << tl::arg (group + + "--" + m_long_prefix + "lefdef-lefs", &m_lefdef_lef_files, "Specifies which additional LEF files to read", + "This option applies when reading DEF files.\n" + "\n" + "Use a comma-separated list of file names here to specify which LEF files to read. " + "See also '--" + m_long_prefix + "lefdef-read-lef-with-def' for an option to implicitly read all LEF files in the same " + "place than the DEF file.\n" + "\n" + "Relative paths are resolved based on the location of the DEF file which is read." + ) + ; + + } } void GenericReaderOptions::set_layer_map (const std::string &lm) @@ -279,16 +612,12 @@ void GenericReaderOptions::set_layer_map (const std::string &lm) void GenericReaderOptions::set_read_named_layers (bool f) { - m_dxf_keep_layer_names = f; - m_cif_keep_layer_names = f; - m_magic_keep_layer_names = f; + m_keep_layer_names = f; } void GenericReaderOptions::set_dbu (double dbu) { - m_dxf_dbu = dbu; - m_cif_dbu = dbu; - m_magic_dbu = dbu; + m_dbu = dbu; } void @@ -308,13 +637,13 @@ GenericReaderOptions::configure (db::LoadLayoutOptions &load_options) const load_options.set_option_by_name ("cif_layer_map", tl::Variant::make_variant (m_layer_map)); load_options.set_option_by_name ("cif_create_other_layers", m_create_other_layers); - load_options.set_option_by_name ("cif_dbu", m_dxf_dbu); + load_options.set_option_by_name ("cif_dbu", m_dbu); load_options.set_option_by_name ("cif_wire_mode", m_cif_wire_mode); - load_options.set_option_by_name ("cif_keep_layer_names", m_cif_keep_layer_names); + load_options.set_option_by_name ("cif_keep_layer_names", m_keep_layer_names); load_options.set_option_by_name ("dxf_layer_map", tl::Variant::make_variant (m_layer_map)); load_options.set_option_by_name ("dxf_create_other_layers", m_create_other_layers); - load_options.set_option_by_name ("dxf_dbu", m_dxf_dbu); + load_options.set_option_by_name ("dxf_dbu", m_dbu); load_options.set_option_by_name ("dxf_unit", m_dxf_unit); load_options.set_option_by_name ("dxf_text_scaling", m_dxf_text_scaling); load_options.set_option_by_name ("dxf_polyline_mode", m_dxf_polyline_mode); @@ -322,16 +651,59 @@ GenericReaderOptions::configure (db::LoadLayoutOptions &load_options) const load_options.set_option_by_name ("dxf_circle_accuracy", m_dxf_circle_accuracy); load_options.set_option_by_name ("dxf_contour_accuracy", m_dxf_contour_accuracy); load_options.set_option_by_name ("dxf_render_texts_as_polygons", m_dxf_render_texts_as_polygons); - load_options.set_option_by_name ("dxf_keep_layer_names", m_dxf_keep_layer_names); + load_options.set_option_by_name ("dxf_keep_layer_names", m_keep_layer_names); load_options.set_option_by_name ("dxf_keep_other_cells", m_dxf_keep_other_cells); load_options.set_option_by_name ("mag_layer_map", tl::Variant::make_variant (m_layer_map)); load_options.set_option_by_name ("mag_create_other_layers", m_create_other_layers); - load_options.set_option_by_name ("mag_dbu", m_magic_dbu); + load_options.set_option_by_name ("mag_dbu", m_dbu); load_options.set_option_by_name ("mag_lambda", m_magic_lambda); load_options.set_option_by_name ("mag_merge", m_magic_merge); - load_options.set_option_by_name ("mag_keep_layer_names", m_magic_keep_layer_names); + load_options.set_option_by_name ("mag_keep_layer_names", m_keep_layer_names); load_options.set_option_by_name ("mag_library_paths", tl::Variant (m_magic_lib_path.begin (), m_magic_lib_path.end ())); + + load_options.set_option_by_name ("lefdef_config.layer_map", tl::Variant::make_variant (m_layer_map)); + load_options.set_option_by_name ("lefdef_config.create_other_layers", m_create_other_layers); + load_options.set_option_by_name ("lefdef_config.dbu", m_dbu); + load_options.set_option_by_name ("lefdef_config.net_property_name", m_lefdef_produce_net_names ? tl::Variant (m_lefdef_net_property_name) : tl::Variant ()); + load_options.set_option_by_name ("lefdef_config.instance_property_name", m_lefdef_produce_inst_names ? tl::Variant (m_lefdef_inst_property_name) : tl::Variant ()); + load_options.set_option_by_name ("lefdef_config.pin_property_name", m_lefdef_produce_pin_names ? tl::Variant (m_lefdef_pin_property_name) : tl::Variant ()); + load_options.set_option_by_name ("lefdef_config.produce_cell_outlines", m_lefdef_produce_cell_outlines); + load_options.set_option_by_name ("lefdef_config.cell_outline_layer", m_lefdef_cell_outline_layer); + load_options.set_option_by_name ("lefdef_config.produce_placement_blockages", m_lefdef_produce_placement_blockages); + load_options.set_option_by_name ("lefdef_config.placement_blockage_layer", m_lefdef_placement_blockage_layer); + load_options.set_option_by_name ("lefdef_config.produce_regions", m_lefdef_produce_regions); + load_options.set_option_by_name ("lefdef_config.region_layer", m_lefdef_region_layer); + load_options.set_option_by_name ("lefdef_config.produce_via_geometry", m_lefdef_produce_via_geometry); + load_options.set_option_by_name ("lefdef_config.via_geometry_suffix_str", m_lefdef_via_geometry_suffix); + load_options.set_option_by_name ("lefdef_config.via_geometry_datatype_str", m_lefdef_via_geometry_datatype); + load_options.set_option_by_name ("lefdef_config.via_cellname_prefix", m_lefdef_via_cellname_prefix); + load_options.set_option_by_name ("lefdef_config.produce_pins", m_lefdef_produce_pins); + load_options.set_option_by_name ("lefdef_config.pins_suffix_str", m_lefdef_pins_suffix); + load_options.set_option_by_name ("lefdef_config.pins_datatype_str", m_lefdef_pins_datatype); + load_options.set_option_by_name ("lefdef_config.produce_lef_pins", m_lefdef_produce_lef_pins); + load_options.set_option_by_name ("lefdef_config.lef_pins_suffix_str", m_lefdef_lef_pins_suffix); + load_options.set_option_by_name ("lefdef_config.lef_pins_datatype_str", m_lefdef_lef_pins_datatype); + load_options.set_option_by_name ("lefdef_config.produce_obstructions", m_lefdef_produce_obstructions); + load_options.set_option_by_name ("lefdef_config.obstructions_suffix", m_lefdef_obstruction_suffix); + load_options.set_option_by_name ("lefdef_config.obstructions_datatype", m_lefdef_obstruction_datatype); + load_options.set_option_by_name ("lefdef_config.produce_blockages", m_lefdef_produce_blockages); + load_options.set_option_by_name ("lefdef_config.blockages_suffix", m_lefdef_blockage_suffix); + load_options.set_option_by_name ("lefdef_config.blockages_datatype", m_lefdef_blockage_datatype); + load_options.set_option_by_name ("lefdef_config.produce_labels", m_lefdef_produce_labels); + load_options.set_option_by_name ("lefdef_config.labels_suffix", m_lefdef_label_suffix); + load_options.set_option_by_name ("lefdef_config.labels_datatype", m_lefdef_label_datatype); + load_options.set_option_by_name ("lefdef_config.produce_routing", m_lefdef_produce_routing); + load_options.set_option_by_name ("lefdef_config.routing_suffix_str", m_lefdef_routing_suffix); + load_options.set_option_by_name ("lefdef_config.routing_datatype_str", m_lefdef_routing_datatype); + load_options.set_option_by_name ("lefdef_config.produce_special_routing", m_lefdef_produce_special_routing); + load_options.set_option_by_name ("lefdef_config.special_routing_suffix_str", m_lefdef_special_routing_suffix); + load_options.set_option_by_name ("lefdef_config.special_routing_datatype_str", m_lefdef_special_routing_datatype); + load_options.set_option_by_name ("lefdef_config.lef_files", tl::Variant (m_lefdef_lef_files.begin (), m_lefdef_lef_files.end ())); + load_options.set_option_by_name ("lefdef_config.read_lef_with_def", m_lefdef_read_lef_with_def); + load_options.set_option_by_name ("lefdef_config.separate_groups", m_lefdef_separate_groups); + load_options.set_option_by_name ("lefdef_config.map_file", m_lefdef_map_file); + load_options.set_option_by_name ("lefdef_config.macro_resolution_mode", m_lefdef_produce_lef_macros ? 0 : 2); } } diff --git a/src/buddies/src/bd/bdReaderOptions.h b/src/buddies/src/bd/bdReaderOptions.h index d8bb5fa92..7a0408ead 100644 --- a/src/buddies/src/bd/bdReaderOptions.h +++ b/src/buddies/src/bd/bdReaderOptions.h @@ -99,6 +99,8 @@ private: // generic db::LayerMap m_layer_map; bool m_create_other_layers; + double m_dbu; + bool m_keep_layer_names; // common GDS2+OASIS bool m_common_enable_text_objects; @@ -115,11 +117,8 @@ private: // CIF unsigned int m_cif_wire_mode; - double m_cif_dbu; - bool m_cif_keep_layer_names; // DXF - double m_dxf_dbu; double m_dxf_unit; double m_dxf_text_scaling; int m_dxf_polyline_mode; @@ -127,19 +126,60 @@ private: double m_dxf_circle_accuracy; double m_dxf_contour_accuracy; bool m_dxf_render_texts_as_polygons; - bool m_dxf_keep_layer_names; bool m_dxf_keep_other_cells; // MAGIC double m_magic_lambda; - double m_magic_dbu; - bool m_magic_keep_layer_names; bool m_magic_merge; std::vector m_magic_lib_path; void set_layer_map (const std::string &lm); void set_dbu (double dbu); void set_read_named_layers (bool f); + + // LEFDEF + bool m_lefdef_produce_net_names; + std::string m_lefdef_net_property_name; + bool m_lefdef_produce_inst_names; + std::string m_lefdef_inst_property_name; + bool m_lefdef_produce_pin_names; + std::string m_lefdef_pin_property_name; + bool m_lefdef_produce_cell_outlines; + std::string m_lefdef_cell_outline_layer; + bool m_lefdef_produce_placement_blockages; + std::string m_lefdef_placement_blockage_layer; + bool m_lefdef_produce_regions; + std::string m_lefdef_region_layer; + bool m_lefdef_produce_via_geometry; + std::string m_lefdef_via_geometry_suffix; + std::string m_lefdef_via_geometry_datatype; + std::string m_lefdef_via_cellname_prefix; + bool m_lefdef_produce_pins; + std::string m_lefdef_pins_suffix; + std::string m_lefdef_pins_datatype; + bool m_lefdef_produce_lef_pins; + std::string m_lefdef_lef_pins_suffix; + std::string m_lefdef_lef_pins_datatype; + bool m_lefdef_produce_obstructions; + std::string m_lefdef_obstruction_suffix; + int m_lefdef_obstruction_datatype; + bool m_lefdef_produce_blockages; + std::string m_lefdef_blockage_suffix; + int m_lefdef_blockage_datatype; + bool m_lefdef_produce_labels; + std::string m_lefdef_label_suffix; + int m_lefdef_label_datatype; + bool m_lefdef_produce_routing; + std::string m_lefdef_routing_suffix; + std::string m_lefdef_routing_datatype; + bool m_lefdef_produce_special_routing; + std::string m_lefdef_special_routing_suffix; + std::string m_lefdef_special_routing_datatype; + std::vector m_lefdef_lef_files; + bool m_lefdef_read_lef_with_def; + bool m_lefdef_separate_groups; + std::string m_lefdef_map_file; + bool m_lefdef_produce_lef_macros; }; } diff --git a/src/db/db/dbLoadLayoutOptions.cc b/src/db/db/dbLoadLayoutOptions.cc index cee4dafd0..65cb868c8 100644 --- a/src/db/db/dbLoadLayoutOptions.cc +++ b/src/db/db/dbLoadLayoutOptions.cc @@ -108,32 +108,74 @@ namespace db } void - LoadLayoutOptions::set_option_by_name (const std::string &method, const tl::Variant &value) + LoadLayoutOptions::set_option_by_method (const std::string &method, const tl::Variant &value) { // Utilizes the GSI binding to set the values - tl::Variant options_ref = tl::Variant::make_variant_ref (this); - const tl::EvalClass *eval_cls = options_ref.user_cls ()->eval_cls (); - tl::ExpressionParserContext context; + tl::Variant ref = tl::Variant::make_variant_ref (this); - tl::Variant out; - std::vector args; - args.push_back (value); - eval_cls->execute (context, out, options_ref, method + "=", args); + tl::Extractor ex (method.c_str ()); + + while (! ex.at_end ()) { + + std::string m; + ex.read_word (m, "_="); + if (! ex.at_end ()) { + ex.expect ("."); + } + + tl::Variant out; + + std::vector args; + if (ex.at_end ()) { + args.push_back (value); + } + tl::ExpressionParserContext context; + ref.user_cls ()->eval_cls ()->execute (context, out, ref, m, args); + + ref = out; + + } + } + + tl::Variant + LoadLayoutOptions::get_option_by_method (const std::string &method) + { + // Utilizes the GSI binding to set the values + tl::Variant ref = tl::Variant::make_variant_ref (this); + + tl::Extractor ex (method.c_str ()); + + while (! ex.at_end ()) { + + std::string m; + ex.read_word (m, "_="); + if (! ex.at_end ()) { + ex.expect ("."); + } + + tl::Variant out; + + std::vector args; + tl::ExpressionParserContext context; + ref.user_cls ()->eval_cls ()->execute (context, out, ref, m, args); + + ref = out; + + } + + return ref; + } + + void + LoadLayoutOptions::set_option_by_name (const std::string &method, const tl::Variant &value) + { + return set_option_by_method (method + "=", value); } tl::Variant LoadLayoutOptions::get_option_by_name (const std::string &method) { - // Utilizes the GSI binding to set the values - tl::Variant options_ref = tl::Variant::make_variant_ref (this); - const tl::EvalClass *eval_cls = options_ref.user_cls ()->eval_cls (); - tl::ExpressionParserContext context; - - tl::Variant out; - std::vector args; - eval_cls->execute (context, out, options_ref, method, args); - - return out; + return get_option_by_method (method); } } diff --git a/src/db/db/dbLoadLayoutOptions.h b/src/db/db/dbLoadLayoutOptions.h index 3b125a657..16d873721 100644 --- a/src/db/db/dbLoadLayoutOptions.h +++ b/src/db/db/dbLoadLayoutOptions.h @@ -200,6 +200,21 @@ public: */ tl::Variant get_option_by_name (const std::string &name); + /** + * @brief Sets a layout reader option by calling method + * + * The name is taken to be a GSI method which is called to set the + * option. + */ + void set_option_by_method (const std::string &name, const tl::Variant &value); + + /** + * @brief Gets a layout reader option by calling a method + * + * See "set_option_by_method" for details. + */ + tl::Variant get_option_by_method (const std::string &name); + private: std::map m_options; diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc index 13801edd5..7cb680083 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc @@ -150,6 +150,8 @@ private: std::string lp = correct_path (*l, layout, tl::dirname (m_stream.absolute_path ())); + tl::SelfTimer timer (tl::verbosity () >= 21, tl::to_string (tr ("Reading LEF file: ")) + lp); + tl::InputStream lef_stream (lp); tl::log << tl::to_string (tr ("Reading")) << " " << lp; importer.read_lef (lef_stream, layout, state); diff --git a/src/plugins/streamers/lefdef/db_plugin/gsiDeclDbLEFDEF.cc b/src/plugins/streamers/lefdef/db_plugin/gsiDeclDbLEFDEF.cc index c8bcf3ea6..05c81afc2 100644 --- a/src/plugins/streamers/lefdef/db_plugin/gsiDeclDbLEFDEF.cc +++ b/src/plugins/streamers/lefdef/db_plugin/gsiDeclDbLEFDEF.cc @@ -220,6 +220,32 @@ gsi::Class decl_lefdef_config ("db", "LEFDEFReaderConfi "@brief Sets the layer on which to produce the placement blockage.\n" "See \\placement_blockage_layer for details.\n" ) + + gsi::method ("produce_regions", &db::LEFDEFReaderOptions::produce_regions, + "@brief Gets a value indicating whether to produce regions.\n" + "If set to true, polygons will be produced representing the regions on the layer given by \\region_layer.\n" + "\n" + "The attribute has been introduced in version 0.27." + ) + + gsi::method ("produce_regions=", &db::LEFDEFReaderOptions::set_produce_regions, gsi::arg ("produce"), + "@brief Sets a value indicating whether to produce regions.\n" + "See \\produce_regions for details.\n" + "\n" + "The attribute has been introduced in version 0.27." + ) + + gsi::method ("region_layer", &db::LEFDEFReaderOptions::region_layer, + "@brief Gets the layer on which to produce the regions.\n" + "This attribute is a string correspondig to the string representation of \\LayerInfo. " + "This string can be either a layer number, a layer/datatype pair, a name or a combination of both. See \\LayerInfo for details." + "The setter for this attribute is \\region_layer=. See also \\produce_regions.\n" + "\n" + "The attribute has been introduced in version 0.27." + ) + + gsi::method ("region_layer=", &db::LEFDEFReaderOptions::set_region_layer, + "@brief Sets the layer on which to produce the regions.\n" + "See \\region_layer for details.\n" + "\n" + "The attribute has been introduced in version 0.27." + ) + gsi::method ("produce_via_geometry", &db::LEFDEFReaderOptions::produce_via_geometry, "@brief Sets a value indicating whether via geometries shall be produced.\n" "\n" @@ -300,6 +326,18 @@ gsi::Class decl_lefdef_config ("db", "LEFDEFReaderConfi "\n\n" "Mask specific rules have been introduced in version 0.27." ) + + gsi::method ("via_geometry_suffix_str", &db::LEFDEFReaderOptions::via_geometry_suffix_str, + "@hide" + ) + + gsi::method ("via_geometry_suffix_str=", &db::LEFDEFReaderOptions::set_via_geometry_suffix_str, gsi::arg ("suffix"), + "@hide" + ) + + gsi::method ("via_geometry_datatype_str", &db::LEFDEFReaderOptions::via_geometry_datatype_str, + "@hide" + ) + + gsi::method ("via_geometry_datatype_str=", &db::LEFDEFReaderOptions::set_via_geometry_datatype_str, gsi::arg ("datatype"), + "@hide" + ) + gsi::method ("via_cellname_prefix", &db::LEFDEFReaderOptions::via_cellname_prefix, "@brief Gets the via cellname prefix.\n" "Vias are represented by cells. The cell name is formed by combining the via cell name prefix and the via name.\n" @@ -376,6 +414,18 @@ gsi::Class decl_lefdef_config ("db", "LEFDEFReaderConfi "\n\n" "Mask specific rules have been introduced in version 0.27." ) + + gsi::method ("pins_suffix_str", &db::LEFDEFReaderOptions::pins_suffix_str, + "@hide" + ) + + gsi::method ("pins_suffix_str=", &db::LEFDEFReaderOptions::set_pins_suffix_str, gsi::arg ("suffix"), + "@hide" + ) + + gsi::method ("pins_datatype_str", &db::LEFDEFReaderOptions::pins_datatype_str, + "@hide" + ) + + gsi::method ("pins_datatype_str=", &db::LEFDEFReaderOptions::set_pins_datatype_str, gsi::arg ("datatype"), + "@hide" + ) + gsi::method ("produce_lef_pins", &db::LEFDEFReaderOptions::produce_lef_pins, "@brief Gets a value indicating whether LEF pin geometries shall be produced.\n" "See \\produce_via_geometry for details about the layer production rules." @@ -440,6 +490,18 @@ gsi::Class decl_lefdef_config ("db", "LEFDEFReaderConfi "\n\n" "Mask specific rules have been introduced in version 0.27." ) + + gsi::method ("lef_pins_suffix_str", &db::LEFDEFReaderOptions::lef_pins_suffix_str, + "@hide" + ) + + gsi::method ("lef_pins_suffix_str=", &db::LEFDEFReaderOptions::set_lef_pins_suffix_str, gsi::arg ("suffix"), + "@hide" + ) + + gsi::method ("lef_pins_datatype_str", &db::LEFDEFReaderOptions::lef_pins_datatype_str, + "@hide" + ) + + gsi::method ("lef_pins_datatype_str=", &db::LEFDEFReaderOptions::set_lef_pins_datatype_str, gsi::arg ("datatype"), + "@hide" + ) + gsi::method ("produce_obstructions", &db::LEFDEFReaderOptions::produce_obstructions, "@brief Gets a value indicating whether obstruction markers shall be produced.\n" "See \\produce_via_geometry for details about the layer production rules." @@ -576,6 +638,18 @@ gsi::Class decl_lefdef_config ("db", "LEFDEFReaderConfi "\n\n" "Mask specific rules have been introduced in version 0.27." ) + + gsi::method ("routing_suffix_str", &db::LEFDEFReaderOptions::routing_suffix_str, + "@hide" + ) + + gsi::method ("routing_suffix_str=", &db::LEFDEFReaderOptions::set_routing_suffix_str, gsi::arg ("suffix"), + "@hide" + ) + + gsi::method ("routing_datatype_str", &db::LEFDEFReaderOptions::routing_datatype_str, + "@hide" + ) + + gsi::method ("routing_datatype_str=", &db::LEFDEFReaderOptions::set_routing_datatype_str, gsi::arg ("datatype"), + "@hide" + ) + gsi::method ("produce_special_routing", &db::LEFDEFReaderOptions::produce_special_routing, "@brief Gets a value indicating whether special routing geometry shall be produced.\n" "See \\produce_via_geometry for details about the layer production rules.\n" @@ -652,6 +726,18 @@ gsi::Class decl_lefdef_config ("db", "LEFDEFReaderConfi "\n\n" "Mask specific rules have been introduced in version 0.27." ) + + gsi::method ("special_routing_suffix_str", &db::LEFDEFReaderOptions::special_routing_suffix_str, + "@hide" + ) + + gsi::method ("special_routing_suffix_str=", &db::LEFDEFReaderOptions::set_special_routing_suffix_str, gsi::arg ("suffix"), + "@hide" + ) + + gsi::method ("special_routing_datatype_str", &db::LEFDEFReaderOptions::special_routing_datatype_str, + "@hide" + ) + + gsi::method ("special_routing_datatype_str=", &db::LEFDEFReaderOptions::set_special_routing_datatype_str, gsi::arg ("datatype"), + "@hide" + ) + gsi::method ("separate_groups", &db::LEFDEFReaderOptions::separate_groups, "@brief Gets a value indicating whether to create separate parent cells for individual groups.\n" "If this property is set to true, instances belonging to different groups are separated by putting them into " diff --git a/src/plugins/streamers/lefdef/lay_plugin/LEFDEFTechnologyComponentEditor.ui b/src/plugins/streamers/lefdef/lay_plugin/LEFDEFTechnologyComponentEditor.ui index 9f3ed99f4..199dbbfaf 100644 --- a/src/plugins/streamers/lefdef/lay_plugin/LEFDEFTechnologyComponentEditor.ui +++ b/src/plugins/streamers/lefdef/lay_plugin/LEFDEFTechnologyComponentEditor.ui @@ -739,7 +739,7 @@ If used inside a technology, the file will be looked up relative to the technolo 0 - 150 + 0 diff --git a/src/tl/tl/tlCommandLineParser.cc b/src/tl/tl/tlCommandLineParser.cc index 6e01585b9..a3aa7bc8b 100644 --- a/src/tl/tl/tlCommandLineParser.cc +++ b/src/tl/tl/tlCommandLineParser.cc @@ -512,7 +512,7 @@ CommandLineOptions::parse (int argc, char *argv[]) ex.read_word (n); std::map::const_iterator a = arg_by_short_option.find (n); if (a == arg_by_short_option.end ()) { - throw tl::Exception (tl::sprintf (tl::to_string (tr ("Unknown command line option --%1 (use -h for help)")), n)); + throw tl::Exception (tl::sprintf (tl::to_string (tr ("Unknown command line option -%1 (use -h for help)")), n)); } arg = a->second; From 03c4eb1f6fd043a9c0f2b3068881380c39679378 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sat, 22 Aug 2020 19:30:59 +0200 Subject: [PATCH 072/121] Fixed issue with OASIS reader options in buddies --- src/buddies/src/bd/bdReaderOptions.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/buddies/src/bd/bdReaderOptions.cc b/src/buddies/src/bd/bdReaderOptions.cc index 72b453c5d..8a331dda6 100644 --- a/src/buddies/src/bd/bdReaderOptions.cc +++ b/src/buddies/src/bd/bdReaderOptions.cc @@ -43,7 +43,7 @@ GenericReaderOptions::GenericReaderOptions () m_gds2_allow_multi_xy_records = load_options.get_option_by_name ("gds2_allow_multi_xy_records").to_bool (); m_oasis_read_all_properties = load_options.get_option_by_name ("oasis_read_all_properties").to_bool (); - m_oasis_expect_strict_mode = load_options.get_option_by_name ("oasis_expect_strict_mode").to_bool (); + m_oasis_expect_strict_mode = (load_options.get_option_by_name ("oasis_expect_strict_mode").to_int () > 0); m_create_other_layers = load_options.get_option_by_name ("cif_create_other_layers").to_bool (); m_cif_wire_mode = load_options.get_option_by_name ("cif_wire_mode").to_uint (); @@ -633,7 +633,7 @@ GenericReaderOptions::configure (db::LoadLayoutOptions &load_options) const load_options.set_option_by_name ("gds2_allow_multi_xy_records", m_gds2_allow_multi_xy_records); load_options.set_option_by_name ("oasis_read_all_properties", m_oasis_read_all_properties); - load_options.set_option_by_name ("oasis_expect_strict_mode", m_oasis_expect_strict_mode); + load_options.set_option_by_name ("oasis_expect_strict_mode", m_oasis_expect_strict_mode ? 1 : 0); load_options.set_option_by_name ("cif_layer_map", tl::Variant::make_variant (m_layer_map)); load_options.set_option_by_name ("cif_create_other_layers", m_create_other_layers); From 77164ea8796bc414149d51095e6b82ee02289dfe Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sat, 22 Aug 2020 21:15:39 +0200 Subject: [PATCH 073/121] WIP: preparations for mask shift in components. --- .../lefdef/db_plugin/dbDEFImporter.cc | 44 +++++---- .../lefdef/db_plugin/dbDEFImporter.h | 1 + .../lefdef/db_plugin/dbLEFDEFImporter.cc | 90 ++++++++++++------- .../lefdef/db_plugin/dbLEFDEFImporter.h | 39 ++++---- .../lefdef/db_plugin/dbLEFImporter.cc | 14 +-- .../lefdef/db_plugin/dbLEFImporter.h | 4 +- 6 files changed, 120 insertions(+), 72 deletions(-) diff --git a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc index 80b1f836b..057402473 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc @@ -895,9 +895,9 @@ DEFImporter::read_vias (db::Layout & /*layout*/, db::Cell & /*design*/, double s // produce a cell for vias std::auto_ptr rule_based_vg; - std::auto_ptr geo_based_vg; + std::auto_ptr geo_based_vg; - std::auto_ptr via_generator; + std::auto_ptr via_generator; std::set seen_layers; std::vector routing_layers; @@ -992,7 +992,7 @@ DEFImporter::read_vias (db::Layout & /*layout*/, db::Cell & /*design*/, double s } else if ((is_polygon = test ("POLYGON")) || test ("RECT")) { if (! geo_based_vg.get ()) { - geo_based_vg.reset (new GeometryBasedViaGenerator ()); + geo_based_vg.reset (new GeometryBasedLayoutGenerator ()); } std::string ln = get (); @@ -1000,9 +1000,9 @@ DEFImporter::read_vias (db::Layout & /*layout*/, db::Cell & /*design*/, double s if (m_lef_importer.is_routing_layer (ln)) { if (routing_layers.size () == 0) { - geo_based_vg->set_bottom_layer (ln); + geo_based_vg->set_maskshift_layer (0, ln); } else if (routing_layers.size () == 1) { - geo_based_vg->set_top_layer (ln); + geo_based_vg->set_maskshift_layer (2, ln); } if (seen_layers.find (ln) == seen_layers.end ()) { @@ -1012,7 +1012,7 @@ DEFImporter::read_vias (db::Layout & /*layout*/, db::Cell & /*design*/, double s } else if (m_lef_importer.is_cut_layer (ln)) { - geo_based_vg->set_cut_layer (ln); + geo_based_vg->set_maskshift_layer (1, ln); } @@ -1267,6 +1267,11 @@ DEFImporter::read_components (std::list > std::string inst_name = get (); std::string model = get (); + db::FTrans ft; + db::Vector d; + bool is_placed = false; + std::string maskshift; + std::pair ct = m_lef_importer.macro_by_name (model); while (test ("+")) { @@ -1277,15 +1282,13 @@ DEFImporter::read_components (std::list > db::Point pt = get_point (scale); test (")"); - db::FTrans ft = get_orient (false /*mandatory*/); - db::Vector d = pt - m_lef_importer.macro_bbox_by_name (model).transformed (ft).lower_left (); + ft = get_orient (false /*mandatory*/); + d = pt - m_lef_importer.macro_bbox_by_name (model).transformed (ft).lower_left (); + is_placed = true; - if (ct.first) { - db::CellInstArray inst (db::CellInst (ct.first->cell_index ()), db::Trans (ft.rot (), d) * ct.second); - instances.push_back (std::make_pair (inst_name, inst)); - } else { - warn (tl::to_string (tr ("Macro not found in LEF file: ")) + model); - } + } else if (test ("MASKSHIFT")) { + + maskshift = get (); } else { while (! peek ("+") && ! peek ("-") && ! peek (";")) { @@ -1297,6 +1300,15 @@ DEFImporter::read_components (std::list > expect (";"); + if (is_placed) { + if (ct.first) { + db::CellInstArray inst (db::CellInst (ct.first->cell_index ()), db::Trans (ft.rot (), d) * ct.second); + instances.push_back (std::make_pair (inst_name, inst)); + } else { + warn (tl::to_string (tr ("Macro not found in LEF file: ")) + model); + } + } + } } @@ -1467,9 +1479,9 @@ DEFImporter::do_read (db::Layout &layout) } else if (test ("COMPONENTMASKSHIFT")) { - warn (tl::to_string (tr ("Component mask shift not supported currently"))); + m_component_maskshift.clear (); while (! at_end () && ! test (";")) { - take (); + m_component_maskshift.push_back (get ()); } } else if (test ("COMPONENTS")) { diff --git a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.h b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.h index dc9e36488..2675bccef 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.h +++ b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.h @@ -66,6 +66,7 @@ private: std::map > m_nondefault_widths; std::map m_via_desc; std::map m_styles; + std::vector m_component_maskshift; void read_polygon (db::Polygon &poly, double scale); void read_rect (db::Polygon &poly, double scale); diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc index 6ac750f72..08e3d1ea8 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc @@ -76,7 +76,7 @@ static bool is_hex_digit (char c) return (cup >= 'A' && cup <= 'F') || (c >= '0' && c <= '9'); } -static int hex_value (char c) +static unsigned int hex_value (char c) { char cup = toupper (c); if (cup >= 'A' && cup <= 'F') { @@ -88,16 +88,42 @@ static int hex_value (char c) } } +static std::vector string2masks (const std::string &s) +{ + std::vector res; + res.reserve (s.size ()); + + for (const char *cp = s.c_str (); *cp; ++cp) { + if (! is_hex_digit (*cp)) { + throw tl::Exception ("Not a hex string: " + s); + } + res.push_back (hex_value (*cp)); + } + + return res; +} + +static unsigned int mask (const std::vector &masks, unsigned int index) +{ + if (index < (unsigned int) masks.size ()) { + return masks [index]; + } else { + return 0; + } +} + // ----------------------------------------------------------------------------------- // RuleBasedViaGenerator implementation RuleBasedViaGenerator::RuleBasedViaGenerator () - : LEFDEFViaGenerator (), m_bottom_mask (0), m_cut_mask (0), m_top_mask (0), m_rows (1), m_columns (1) + : LEFDEFLayoutGenerator (), m_bottom_mask (0), m_cut_mask (0), m_top_mask (0), m_rows (1), m_columns (1) { } void -RuleBasedViaGenerator::create_cell (LEFDEFReaderState &reader, Layout &layout, db::Cell &cell, unsigned int mask_bottom, unsigned int mask_cut, unsigned int mask_top, const LEFDEFNumberOfMasks *nm) +RuleBasedViaGenerator::create_cell (LEFDEFReaderState &reader, Layout &layout, db::Cell &cell, const std::vector &masks, const LEFDEFNumberOfMasks *nm) { + unsigned int mask_bottom = mask (masks, 0), mask_cut = mask (masks, 1), mask_top = mask (masks, 2); + if (mask_bottom == 0) { mask_bottom = m_bottom_mask; } @@ -238,31 +264,27 @@ RuleBasedViaGenerator::create_cell (LEFDEFReaderState &reader, Layout &layout, d // ----------------------------------------------------------------------------------- // GeometryBasedViaGenerator implementation -GeometryBasedViaGenerator::GeometryBasedViaGenerator () - : LEFDEFViaGenerator () +GeometryBasedLayoutGenerator::GeometryBasedLayoutGenerator () + : LEFDEFLayoutGenerator () { } unsigned int -GeometryBasedViaGenerator::mask_for (const std::string &ln, unsigned int m, unsigned int mask_bottom, unsigned int mask_cut, unsigned int mask_top, const LEFDEFNumberOfMasks *nm) const +GeometryBasedLayoutGenerator::mask_for (const std::string &ln, unsigned int m, const std::vector &masks, const LEFDEFNumberOfMasks *nm) const { - if (m == 0 || ! nm) { + for (std::vector::const_iterator l = m_maskshift_layers.begin (); l != m_maskshift_layers.end (); ++l) { - if (ln == m_bottom_layer) { - return mask_bottom; - } else if (ln == m_cut_layer) { - return mask_cut; - } else if (ln == m_top_layer) { - return mask_top; - } + if (*l == ln) { - } else { + unsigned int mm = mask (masks, (unsigned int) (l - m_maskshift_layers.begin ())); + + if (m == 0 || ! nm) { + m = mm; + } else if (m > 0) { + m = (m + mm - 2) % nm->number_of_masks (ln) + 1; + } + + break; - if (ln == m_bottom_layer) { - return mask_bottom > 0 ? ((m + mask_bottom - 2) % nm->number_of_masks (m_bottom_layer) + 1) : m; - } else if (ln == m_cut_layer) { - return mask_cut > 0 ? ((m + mask_cut - 2) % nm->number_of_masks (m_cut_layer) + 1) : m; - } else if (ln == m_top_layer) { - return mask_top > 0 ? ((m + mask_top - 2) % nm->number_of_masks (m_top_layer) + 1) : m; } } @@ -271,11 +293,11 @@ GeometryBasedViaGenerator::mask_for (const std::string &ln, unsigned int m, unsi } void -GeometryBasedViaGenerator::create_cell (LEFDEFReaderState &reader, Layout &layout, db::Cell &cell, unsigned int mask_bottom, unsigned int mask_cut, unsigned int mask_top, const LEFDEFNumberOfMasks *nm) +GeometryBasedLayoutGenerator::create_cell (LEFDEFReaderState &reader, Layout &layout, db::Cell &cell, const std::vector &masks, const LEFDEFNumberOfMasks *nm) { for (std::map > >::const_iterator g = m_polygons.begin (); g != m_polygons.end (); ++g) { for (std::list >::const_iterator i = g->second.begin (); i != g->second.end (); ++i) { - std::pair dl = reader.open_layer (layout, g->first, ViaGeometry, mask_for (g->first, i->first, mask_bottom, mask_cut, mask_top, nm)); + std::pair dl = reader.open_layer (layout, g->first, ViaGeometry, mask_for (g->first, i->first, masks, nm)); if (dl.first) { cell.shapes (dl.second).insert (i->second); } @@ -284,7 +306,7 @@ GeometryBasedViaGenerator::create_cell (LEFDEFReaderState &reader, Layout &layou for (std::map > >::const_iterator g = m_boxes.begin (); g != m_boxes.end (); ++g) { for (std::list >::const_iterator i = g->second.begin (); i != g->second.end (); ++i) { - std::pair dl = reader.open_layer (layout, g->first, ViaGeometry, mask_for (g->first, i->first, mask_bottom, mask_cut, mask_top, nm)); + std::pair dl = reader.open_layer (layout, g->first, ViaGeometry, mask_for (g->first, i->first, masks, nm)); if (dl.first) { cell.shapes (dl.second).insert (i->second); } @@ -293,13 +315,13 @@ GeometryBasedViaGenerator::create_cell (LEFDEFReaderState &reader, Layout &layou } void -GeometryBasedViaGenerator::add_polygon (const std::string &ln, const db::Polygon &poly, unsigned int mask) +GeometryBasedLayoutGenerator::add_polygon (const std::string &ln, const db::Polygon &poly, unsigned int mask) { m_polygons [ln].push_back (std::make_pair (mask, poly)); } void -GeometryBasedViaGenerator::add_box (const std::string &ln, const db::Box &box, unsigned int mask) +GeometryBasedLayoutGenerator::add_box (const std::string &ln, const db::Box &box, unsigned int mask) { m_boxes [ln].push_back (std::make_pair (mask, box)); } @@ -687,7 +709,7 @@ LEFDEFReaderState::LEFDEFReaderState (const LEFDEFReaderOptions *tc, db::Layout LEFDEFReaderState::~LEFDEFReaderState () { - for (std::map::const_iterator i = m_via_generators.begin (); i != m_via_generators.end (); ++i) { + for (std::map::const_iterator i = m_via_generators.begin (); i != m_via_generators.end (); ++i) { delete i->second; } @@ -1166,7 +1188,7 @@ LEFDEFReaderState::finish (db::Layout &layout) } void -LEFDEFReaderState::register_via_cell (const std::string &vn, LEFDEFViaGenerator *generator) +LEFDEFReaderState::register_via_cell (const std::string &vn, LEFDEFLayoutGenerator *generator) { if (m_via_generators.find (vn) != m_via_generators.end ()) { delete m_via_generators [vn]; @@ -1183,10 +1205,10 @@ LEFDEFReaderState::via_cell (const std::string &vn, db::Layout &layout, unsigned db::Cell *cell = 0; - std::map::const_iterator g = m_via_generators.find (vn); + std::map::const_iterator g = m_via_generators.find (vn); if (g != m_via_generators.end ()) { - LEFDEFViaGenerator *vg = g->second; + LEFDEFLayoutGenerator *vg = g->second; std::string mask_suffix; if (mask_bottom > 0 || mask_cut > 0 || mask_top > 0) { @@ -1201,7 +1223,13 @@ LEFDEFReaderState::via_cell (const std::string &vn, db::Layout &layout, unsigned std::string cn = mp_tech_comp->via_cellname_prefix () + vn + mask_suffix; cell = &layout.cell (layout.add_cell (cn.c_str ())); - vg->create_cell (*this, layout, *cell, mask_bottom, mask_cut, mask_top, nm); + std::vector masks; + masks.reserve (3); + masks.push_back (mask_bottom); + masks.push_back (mask_cut); + masks.push_back (mask_top); + + vg->create_cell (*this, layout, *cell, masks, nm); } diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h index ca1007e6c..4b9ca747d 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h @@ -876,25 +876,25 @@ public: /** * @brief Provides a via generator base class */ -class DB_PLUGIN_PUBLIC LEFDEFViaGenerator +class DB_PLUGIN_PUBLIC LEFDEFLayoutGenerator { public: - LEFDEFViaGenerator () { } - virtual ~LEFDEFViaGenerator () { } + LEFDEFLayoutGenerator () { } + virtual ~LEFDEFLayoutGenerator () { } - virtual void create_cell (LEFDEFReaderState &reader, db::Layout &layout, db::Cell &cell, unsigned int mask_bottom, unsigned int mask_cut, unsigned int mask_top, const LEFDEFNumberOfMasks *nm) = 0; + virtual void create_cell (LEFDEFReaderState &reader, db::Layout &layout, db::Cell &cell, const std::vector &masks, const LEFDEFNumberOfMasks *nm) = 0; }; /** * @brief Provides a via generator implementation for rule-based vias */ class DB_PLUGIN_PUBLIC RuleBasedViaGenerator - : public LEFDEFViaGenerator + : public LEFDEFLayoutGenerator { public: RuleBasedViaGenerator (); - virtual void create_cell (LEFDEFReaderState &reader, Layout &layout, db::Cell &cell, unsigned int mask_bottom, unsigned int mask_cut, unsigned int mask_top, const LEFDEFNumberOfMasks *nm); + virtual void create_cell (LEFDEFReaderState &reader, Layout &layout, db::Cell &cell, const std::vector &masks, const LEFDEFNumberOfMasks *nm); void set_cutsize (const db::Vector &cutsize) { m_cutsize = cutsize; } void set_cutspacing (const db::Vector &cutspacing) { m_cutspacing = cutspacing; } @@ -927,26 +927,31 @@ private: /** * @brief Provides a geometry-based via generator implementation */ -class DB_PLUGIN_PUBLIC GeometryBasedViaGenerator - : public LEFDEFViaGenerator +class DB_PLUGIN_PUBLIC GeometryBasedLayoutGenerator + : public LEFDEFLayoutGenerator { public: - GeometryBasedViaGenerator (); + GeometryBasedLayoutGenerator (); - virtual void create_cell (LEFDEFReaderState &reader, Layout &layout, db::Cell &cell, unsigned int mask_bottom, unsigned int mask_cut, unsigned int mask_top, const LEFDEFNumberOfMasks *num_cut_masks); + virtual void create_cell (LEFDEFReaderState &reader, Layout &layout, db::Cell &cell, const std::vector &masks, const LEFDEFNumberOfMasks *num_cut_masks); void add_polygon (const std::string &ln, const db::Polygon &poly, unsigned int mask); void add_box (const std::string &ln, const db::Box &box, unsigned int mask); - void set_bottom_layer (const std::string &ln) { m_bottom_layer = ln; } - void set_cut_layer (const std::string &ln) { m_cut_layer = ln; } - void set_top_layer (const std::string &ln) { m_top_layer = ln; } + + void set_maskshift_layers (const std::vector &ln) { m_maskshift_layers = ln; } + + void set_maskshift_layer (unsigned int l, const std::string &s) + { + m_maskshift_layers.resize (l + 1, std::string ()); + m_maskshift_layers[l] = s; + } private: std::map > > m_polygons; std::map > > m_boxes; - std::string m_bottom_layer, m_cut_layer, m_top_layer; + std::vector m_maskshift_layers; - unsigned int mask_for (const std::string &ln, unsigned int m, unsigned int mask_bottom, unsigned int mask_cut, unsigned int mask_top, const LEFDEFNumberOfMasks *nm) const; + unsigned int mask_for (const std::string &ln, unsigned int m, const std::vector &masks, const LEFDEFNumberOfMasks *nm) const; }; /** @@ -1002,7 +1007,7 @@ public: * * The generator is capable of creating a via for a specific mask configuration */ - void register_via_cell (const std::string &vn, LEFDEFViaGenerator *generator); + void register_via_cell (const std::string &vn, LEFDEFLayoutGenerator *generator); /** * @brief Gets the via cell for the given via name or 0 if no such via is registered @@ -1065,7 +1070,7 @@ private: std::map m_default_number; std::map m_via_cells; const LEFDEFReaderOptions *mp_tech_comp; - std::map m_via_generators; + std::map m_via_generators; std::pair open_layer_uncached (db::Layout &layout, const std::string &name, LayerPurpose purpose, unsigned int mask); void map_layer_explicit (const std::string &n, LayerPurpose purpose, const LayerProperties &lp, unsigned int layer, unsigned int mask); diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc index c4060aec4..a27651b0a 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc @@ -538,7 +538,7 @@ LEFImporter::read_viadef_by_rule (RuleBasedViaGenerator *vg, ViaDesc &via_desc, } void -LEFImporter::read_viadef_by_geometry (GeometryBasedViaGenerator *vg, ViaDesc &via_desc, const std::string &n, double dbu) +LEFImporter::read_viadef_by_geometry (GeometryBasedLayoutGenerator *lg, ViaDesc &via_desc, const std::string &n, double dbu) { // ignore resistance spec if (test ("RESISTANCE")) { @@ -559,9 +559,9 @@ LEFImporter::read_viadef_by_geometry (GeometryBasedViaGenerator *vg, ViaDesc &vi if (m_routing_layers.find (layer_name) != m_routing_layers.end ()) { if (routing_layers.size () == 0) { - vg->set_bottom_layer (layer_name); + lg->set_maskshift_layer (0, layer_name); } else if (routing_layers.size () == 1) { - vg->set_top_layer (layer_name); + lg->set_maskshift_layer (2, layer_name); } if (seen_layers.find (layer_name) == seen_layers.end ()) { @@ -570,7 +570,7 @@ LEFImporter::read_viadef_by_geometry (GeometryBasedViaGenerator *vg, ViaDesc &vi } } else { - vg->set_cut_layer (layer_name); + lg->set_maskshift_layer (1, layer_name); } while (! at_end () && ! test (";")) { @@ -597,7 +597,7 @@ LEFImporter::read_viadef_by_geometry (GeometryBasedViaGenerator *vg, ViaDesc &vi db::Polygon p; p.assign_hull (points.begin (), points.end ()); - vg->add_polygon (layer_name, p, mask); + lg->add_polygon (layer_name, p, mask); expect (";"); @@ -619,7 +619,7 @@ LEFImporter::read_viadef_by_geometry (GeometryBasedViaGenerator *vg, ViaDesc &vi } db::Box b (points [0], points [1]); - vg->add_box (layer_name, b, mask); + lg->add_box (layer_name, b, mask); expect (";"); @@ -667,7 +667,7 @@ LEFImporter::read_viadef (Layout &layout) read_viadef_by_rule (vg.get (), via_desc, n, layout.dbu ()); reader_state ()->register_via_cell (n, vg.release ()); } else { - std::auto_ptr vg (new GeometryBasedViaGenerator ()); + std::auto_ptr vg (new GeometryBasedLayoutGenerator ()); read_viadef_by_geometry (vg.get (), via_desc, n, layout.dbu ()); reader_state ()->register_via_cell (n, vg.release ()); } diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.h b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.h index b1f75eb60..d05d1b345 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.h +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.h @@ -141,11 +141,13 @@ private: std::map m_num_masks; std::vector get_iteration (db::Layout &layout); + // @@@ void read_geometries (db::Layout &layout, db::Cell &cell, LayerPurpose purpose, std::map *collect_bboxes = 0, properties_id_type prop_id = 0); + // void read_geometries (GeometryBasedLayoutGenerator *lg, LayerPurpose purpose, std::map *collect_bboxes = 0, properties_id_type prop_id = 0); void read_nondefaultrule (Layout &layout); void read_viadef (Layout &layout); void read_viadef_by_rule (RuleBasedViaGenerator *vg, ViaDesc &desc, const std::string &n, double dbu); - void read_viadef_by_geometry (GeometryBasedViaGenerator *vg, ViaDesc &desc, const std::string &n, double dbu); + void read_viadef_by_geometry (GeometryBasedLayoutGenerator *lg, ViaDesc &desc, const std::string &n, double dbu); void read_layer (Layout &layout); void read_macro (Layout &layout); }; From 5b472f33acac81d48cc31eb324dac7a7e819864d Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sat, 22 Aug 2020 21:58:07 +0200 Subject: [PATCH 074/121] WIP: Bugfix. --- .../streamers/lefdef/db_plugin/dbDEFImporter.cc | 14 ++++++++------ .../streamers/lefdef/db_plugin/dbLEFDEFImporter.cc | 2 +- .../streamers/lefdef/db_plugin/dbLEFDEFImporter.h | 4 +++- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc index 057402473..ea8fd7f76 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc @@ -999,15 +999,17 @@ DEFImporter::read_vias (db::Layout & /*layout*/, db::Cell & /*design*/, double s if (m_lef_importer.is_routing_layer (ln)) { - if (routing_layers.size () == 0) { - geo_based_vg->set_maskshift_layer (0, ln); - } else if (routing_layers.size () == 1) { - geo_based_vg->set_maskshift_layer (2, ln); - } - if (seen_layers.find (ln) == seen_layers.end ()) { + + if (routing_layers.size () == 0) { + geo_based_vg->set_maskshift_layer (0, ln); + } else if (routing_layers.size () == 1) { + geo_based_vg->set_maskshift_layer (2, ln); + } + seen_layers.insert (ln); routing_layers.push_back (ln); + } } else if (m_lef_importer.is_cut_layer (ln)) { diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc index 08e3d1ea8..96086bc95 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc @@ -279,7 +279,7 @@ GeometryBasedLayoutGenerator::mask_for (const std::string &ln, unsigned int m, c if (m == 0 || ! nm) { m = mm; - } else if (m > 0) { + } else if (mm > 0) { m = (m + mm - 2) % nm->number_of_masks (ln) + 1; } diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h index 4b9ca747d..94e34b3ca 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h @@ -942,7 +942,9 @@ public: void set_maskshift_layer (unsigned int l, const std::string &s) { - m_maskshift_layers.resize (l + 1, std::string ()); + if (m_maskshift_layers.size () <= size_t (l)) { + m_maskshift_layers.resize (l + 1, std::string ()); + } m_maskshift_layers[l] = s; } From dcc99060fc87cf110b743e681f8103185940eec1 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sun, 23 Aug 2020 00:40:28 +0200 Subject: [PATCH 075/121] WIP: further preparations for MASKSHIFT components. --- .../lefdef/db_plugin/dbDEFImporter.cc | 28 +- .../lefdef/db_plugin/dbDEFImporter.h | 2 +- .../lefdef/db_plugin/dbLEFDEFImporter.cc | 202 +++++++++++-- .../lefdef/db_plugin/dbLEFDEFImporter.h | 118 +++++++- .../lefdef/db_plugin/dbLEFImporter.cc | 265 ++++++------------ .../lefdef/db_plugin/dbLEFImporter.h | 27 +- 6 files changed, 412 insertions(+), 230 deletions(-) diff --git a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc index ea8fd7f76..bd567b83b 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc @@ -1028,13 +1028,13 @@ DEFImporter::read_vias (db::Layout & /*layout*/, db::Cell & /*design*/, double s db::Polygon poly; read_polygon (poly, scale); - geo_based_vg->add_polygon (ln, poly, mask); + geo_based_vg->add_polygon (ln, ViaGeometry, poly, mask, 0); } else { db::Polygon poly; read_rect (poly, scale); - geo_based_vg->add_polygon (ln, poly, mask); + geo_based_vg->add_polygon (ln, ViaGeometry, poly, mask, 0); } @@ -1262,7 +1262,7 @@ DEFImporter::read_styles (double scale) } void -DEFImporter::read_components (std::list > &instances, double scale) +DEFImporter::read_components (db::Layout &layout, std::list > &instances, double scale) { while (test ("-")) { @@ -1274,8 +1274,6 @@ DEFImporter::read_components (std::list > bool is_placed = false; std::string maskshift; - std::pair ct = m_lef_importer.macro_by_name (model); - while (test ("+")) { if (test ("PLACED") || test ("FIXED") || test ("COVER")) { @@ -1303,12 +1301,22 @@ DEFImporter::read_components (std::list > expect (";"); if (is_placed) { - if (ct.first) { - db::CellInstArray inst (db::CellInst (ct.first->cell_index ()), db::Trans (ft.rot (), d) * ct.second); - instances.push_back (std::make_pair (inst_name, inst)); - } else { + + std::map::const_iterator m = m_lef_importer.macros ().find (model); + if (m == m_lef_importer.macros ().end ()) { + warn (tl::to_string (tr ("Macro not found in LEF file: ")) + model); + + } else { + + std::pair ct = reader_state ()->macro_cell (model, layout, string2masks (maskshift), m->second, &m_lef_importer); + if (ct.first) { + db::CellInstArray inst (db::CellInst (ct.first->cell_index ()), db::Trans (ft.rot (), d) * ct.second); + instances.push_back (std::make_pair (inst_name, inst)); + } + } + } } @@ -1491,7 +1499,7 @@ DEFImporter::do_read (db::Layout &layout) get_long (); expect (";"); - read_components (instances, scale); + read_components (layout, instances, scale); expect ("END"); expect ("COMPONENTS"); diff --git a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.h b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.h index 2675bccef..49cbc9acd 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.h +++ b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.h @@ -81,7 +81,7 @@ private: void read_vias (db::Layout &layout, db::Cell &design, double scale); void read_pins (db::Layout &layout, db::Cell &design, double scale); void read_styles (double scale); - void read_components (std::list > &instances, double scale); + void read_components (Layout &layout, std::list > &instances, double scale); void read_single_net (std::string &nondefaultrule, db::Layout &layout, db::Cell &design, double scale, properties_id_type prop_id, bool specialnets); void produce_routing_geometry (db::Cell &design, const db::Polygon *style, unsigned int layer, properties_id_type prop_id, const std::vector &pts, const std::vector > &ext, std::pair w); }; diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc index 96086bc95..58e5d128f 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc @@ -88,7 +88,7 @@ static unsigned int hex_value (char c) } } -static std::vector string2masks (const std::string &s) +std::vector string2masks (const std::string &s) { std::vector res; res.reserve (s.size ()); @@ -100,6 +100,8 @@ static std::vector string2masks (const std::string &s) res.push_back (hex_value (*cp)); } + std::reverse (res.begin (), res.end ()); + return res; } @@ -273,7 +275,7 @@ GeometryBasedLayoutGenerator::mask_for (const std::string &ln, unsigned int m, c { for (std::vector::const_iterator l = m_maskshift_layers.begin (); l != m_maskshift_layers.end (); ++l) { - if (*l == ln) { + if (! l->empty () && *l == ln) { unsigned int mm = mask (masks, (unsigned int) (l - m_maskshift_layers.begin ())); @@ -295,35 +297,79 @@ GeometryBasedLayoutGenerator::mask_for (const std::string &ln, unsigned int m, c void GeometryBasedLayoutGenerator::create_cell (LEFDEFReaderState &reader, Layout &layout, db::Cell &cell, const std::vector &masks, const LEFDEFNumberOfMasks *nm) { - for (std::map > >::const_iterator g = m_polygons.begin (); g != m_polygons.end (); ++g) { - for (std::list >::const_iterator i = g->second.begin (); i != g->second.end (); ++i) { - std::pair dl = reader.open_layer (layout, g->first, ViaGeometry, mask_for (g->first, i->first, masks, nm)); - if (dl.first) { - cell.shapes (dl.second).insert (i->second); - } + for (std::map >, db::Shapes>::const_iterator g = m_shapes.begin (); g != m_shapes.end (); ++g) { + std::pair dl = reader.open_layer (layout, g->first.first, g->first.second.first, mask_for (g->first.first, g->first.second.second, masks, nm)); + if (dl.first) { + cell.shapes (dl.second).insert (g->second); } } - for (std::map > >::const_iterator g = m_boxes.begin (); g != m_boxes.end (); ++g) { - for (std::list >::const_iterator i = g->second.begin (); i != g->second.end (); ++i) { - std::pair dl = reader.open_layer (layout, g->first, ViaGeometry, mask_for (g->first, i->first, masks, nm)); - if (dl.first) { - cell.shapes (dl.second).insert (i->second); - } + for (std::list::const_iterator v = m_vias.begin (); v != m_vias.end (); ++v) { + + LEFDEFLayoutGenerator *g = reader.via_generator (v->name); + if (! g) { + continue; } + + std::vector msl = g->maskshift_layers (); + msl.resize (3, std::string ()); + + db::Cell *vc = reader.via_cell (v->name, layout, + mask_for (msl [0], v->bottom_mask, masks, nm), + mask_for (msl [1], v->cut_mask, masks, nm), + mask_for (msl [2], v->top_mask, masks, nm), + nm); + + if (vc) { + cell.insert (db::CellInstArray (db::CellInst (vc->cell_index ()), v->trans)); + } + + } +} + +template +static db::Shape insert_shape (db::Shapes &shapes, const Shape &shape, db::properties_id_type prop_id) +{ + if (prop_id == 0) { + return shapes.insert (shape); + } else { + return shapes.insert (db::object_with_properties (shape, prop_id)); } } void -GeometryBasedLayoutGenerator::add_polygon (const std::string &ln, const db::Polygon &poly, unsigned int mask) +GeometryBasedLayoutGenerator::add_polygon (const std::string &ln, LayerPurpose purpose, const db::Polygon &poly, unsigned int mask, db::properties_id_type prop_id) { - m_polygons [ln].push_back (std::make_pair (mask, poly)); + insert_shape (m_shapes [std::make_pair (ln, std::make_pair (purpose, mask))], poly, prop_id); } void -GeometryBasedLayoutGenerator::add_box (const std::string &ln, const db::Box &box, unsigned int mask) +GeometryBasedLayoutGenerator::add_box (const std::string &ln, LayerPurpose purpose, const db::Box &box, unsigned int mask, db::properties_id_type prop_id) { - m_boxes [ln].push_back (std::make_pair (mask, box)); + insert_shape (m_shapes [std::make_pair (ln, std::make_pair (purpose, mask))], box, prop_id); +} + +void +GeometryBasedLayoutGenerator::add_path (const std::string &ln, LayerPurpose purpose, const db::Path &path, unsigned int mask, db::properties_id_type prop_id) +{ + insert_shape (m_shapes [std::make_pair (ln, std::make_pair (purpose, mask))], path, prop_id); +} + +void +GeometryBasedLayoutGenerator::add_text (const std::string &ln, LayerPurpose purpose, const db::Text &text, unsigned int mask, db::properties_id_type prop_id) +{ + insert_shape (m_shapes [std::make_pair (ln, std::make_pair (purpose, mask))], text, prop_id); +} + +void +GeometryBasedLayoutGenerator::add_via (const std::string &vn, const db::Trans &trans, unsigned int bottom_mask, unsigned int cut_mask, unsigned int top_mask) +{ + m_vias.push_back (Via ()); + m_vias.back ().name = vn; + m_vias.back ().trans = trans; + m_vias.back ().bottom_mask = bottom_mask; + m_vias.back ().cut_mask = cut_mask; + m_vias.back ().top_mask = top_mask; } // ----------------------------------------------------------------------------------- @@ -714,6 +760,12 @@ LEFDEFReaderState::~LEFDEFReaderState () } m_via_generators.clear (); + + for (std::map::const_iterator i = m_macro_generators.begin (); i != m_macro_generators.end (); ++i) { + delete i->second; + } + + m_macro_generators.clear (); } void @@ -1196,6 +1248,17 @@ LEFDEFReaderState::register_via_cell (const std::string &vn, LEFDEFLayoutGenerat m_via_generators [vn] = generator; } +LEFDEFLayoutGenerator * +LEFDEFReaderState::via_generator (const std::string &vn) +{ + std::map::const_iterator g = m_via_generators.find (vn); + if (g != m_via_generators.end ()) { + return g->second; + } else { + return 0; + } +} + db::Cell * LEFDEFReaderState::via_cell (const std::string &vn, db::Layout &layout, unsigned int mask_bottom, unsigned int mask_cut, unsigned int mask_top, const LEFDEFNumberOfMasks *nm) { @@ -1242,6 +1305,109 @@ LEFDEFReaderState::via_cell (const std::string &vn, db::Layout &layout, unsigned } } +void +LEFDEFReaderState::register_macro_cell (const std::string &mn, LEFDEFLayoutGenerator *generator) +{ + if (m_macro_generators.find (mn) != m_macro_generators.end ()) { + delete m_macro_generators [mn]; + } + m_macro_generators [mn] = generator; +} + +LEFDEFLayoutGenerator * +LEFDEFReaderState::macro_generator (const std::string &mn) +{ + std::map::const_iterator g = m_macro_generators.find (mn); + if (g != m_macro_generators.end ()) { + return g->second; + } else { + return 0; + } +} + +std::pair +LEFDEFReaderState::macro_cell (const std::string &mn, Layout &layout, const std::vector &masks, const MacroDesc ¯o_desc, const LEFDEFNumberOfMasks *nm) +{ + MacroKey mk (mn, masks); + std::map >::const_iterator i = m_macro_cells.find (mk); + if (i != m_macro_cells.end ()) { + tl_assert (! i->second.first || i->second.first->layout () == &layout); + return i->second; + } + + db::Cell *cell = 0; + db::Trans tr; + + std::map::const_iterator g = m_macro_generators.find (mn); + if (g == m_macro_generators.end ()) { + return std::make_pair ((db::Cell *) 0, db::Trans ()); + } + + LEFDEFLayoutGenerator *mg = g->second; + + if (! macro_desc.foreign_name.empty ()) { + + db::cell_index_type ci; + std::pair c = layout.cell_by_name (macro_desc.foreign_name.c_str ()); + if (c.first) { + ci = c.second; + } else { + ci = layout.add_cell (macro_desc.foreign_name.c_str ()); + layout.cell (ci).set_ghost_cell (true); + } + + db::Cell *foreign_cell = &layout.cell (ci); + + if (macro_desc.foreign_name != mn) { + + // create an indirection for renaming the cell + cell = &layout.cell (layout.add_cell (mn.c_str ())); + cell->insert (db::CellInstArray (db::CellInst (foreign_cell->cell_index ()), db::Trans (db::Point () - macro_desc.origin) * macro_desc.foreign_trans)); + + } else { + + // use FOREIGN cell instead of new one + cell = foreign_cell; + tr = db::Trans (db::Point () - macro_desc.origin) * macro_desc.foreign_trans; + + } + + } else if (tech_comp ()->macro_resolution_mode () == 2) { + + // create a ghost cell always + + db::cell_index_type ci; + std::pair c = layout.cell_by_name (mn.c_str ()); + if (c.first) { + ci = c.second; + } else { + ci = layout.add_cell (mn.c_str ()); + layout.cell (ci).set_ghost_cell (true); + } + + cell = &layout.cell (ci); + + } else { + + // actually implement the real cell + + std::string mask_suffix; + for (std::vector::const_iterator m = masks.begin (); m != masks.end (); ++m) { + mask_suffix += "_"; + mask_suffix += tl::to_string (*m); + } + + std::string cn = mn + mask_suffix; + + cell = &layout.cell (layout.add_cell (cn.c_str ())); + mg->create_cell (*this, layout, *cell, masks, nm); + + } + + m_macro_cells [mk] = std::make_pair (cell, tr); + return std::make_pair (cell, tr); +} + // ----------------------------------------------------------------------------------- // LEFDEFImporter implementation diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h index 94e34b3ca..97f2ecfd0 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h @@ -44,6 +44,7 @@ namespace db { class LEFDEFReaderState; +struct MacroDesc; /** * @brief Correct a path relative to the stream and technology @@ -51,6 +52,11 @@ class LEFDEFReaderState; DB_PLUGIN_PUBLIC std::string correct_path (const std::string &fn, const db::Layout &layout, const std::string &base_path); +/** + * @brief Convers a string to a MASKSHIFT index list + */ +std::vector string2masks (const std::string &s); + /** * @brief Generic base class of DXF reader exceptions */ @@ -883,6 +889,7 @@ public: virtual ~LEFDEFLayoutGenerator () { } virtual void create_cell (LEFDEFReaderState &reader, db::Layout &layout, db::Cell &cell, const std::vector &masks, const LEFDEFNumberOfMasks *nm) = 0; + virtual std::vector maskshift_layers () const = 0; }; /** @@ -896,6 +903,15 @@ public: virtual void create_cell (LEFDEFReaderState &reader, Layout &layout, db::Cell &cell, const std::vector &masks, const LEFDEFNumberOfMasks *nm); + virtual std::vector maskshift_layers () const + { + std::vector msl; + msl.push_back (m_bottom_layer); + msl.push_back (m_cut_layer); + msl.push_back (m_top_layer); + return msl; + } + void set_cutsize (const db::Vector &cutsize) { m_cutsize = cutsize; } void set_cutspacing (const db::Vector &cutspacing) { m_cutspacing = cutspacing; } void set_offset (const db::Point &offset) { m_offset = offset; } @@ -931,12 +947,23 @@ class DB_PLUGIN_PUBLIC GeometryBasedLayoutGenerator : public LEFDEFLayoutGenerator { public: + struct Via { + Via () : bottom_mask (0), cut_mask (0), top_mask (0) { } + std::string name; + unsigned int bottom_mask, cut_mask, top_mask; + db::Trans trans; + }; + GeometryBasedLayoutGenerator (); virtual void create_cell (LEFDEFReaderState &reader, Layout &layout, db::Cell &cell, const std::vector &masks, const LEFDEFNumberOfMasks *num_cut_masks); + virtual std::vector maskshift_layers () const { return m_maskshift_layers; } - void add_polygon (const std::string &ln, const db::Polygon &poly, unsigned int mask); - void add_box (const std::string &ln, const db::Box &box, unsigned int mask); + void add_polygon (const std::string &ln, LayerPurpose purpose, const db::Polygon &poly, unsigned int mask, properties_id_type prop_id); + void add_box (const std::string &ln, LayerPurpose purpose, const db::Box &box, unsigned int mask, properties_id_type prop_id); + void add_path (const std::string &ln, LayerPurpose purpose, const db::Path &path, unsigned int mask, properties_id_type prop_id); + void add_via (const std::string &vn, const db::Trans &trans, unsigned int bottom_mask, unsigned int cut_mask, unsigned int top_mask); + void add_text (const std::string &ln, LayerPurpose purpose, const db::Text &text, unsigned int mask, db::properties_id_type prop_id); void set_maskshift_layers (const std::vector &ln) { m_maskshift_layers = ln; } @@ -949,8 +976,8 @@ public: } private: - std::map > > m_polygons; - std::map > > m_boxes; + std::map >, db::Shapes> m_shapes; + std::list m_vias; std::vector m_maskshift_layers; unsigned int mask_for (const std::string &ln, unsigned int m, const std::vector &masks, const LEFDEFNumberOfMasks *nm) const; @@ -1016,6 +1043,28 @@ public: */ db::Cell *via_cell (const std::string &vn, Layout &layout, unsigned int mask_bottom, unsigned int mask_cut, unsigned int mask_top, const LEFDEFNumberOfMasks *nm); + /** + * @brief Gets the via generator for a given via name or 0 if there is no such generator + */ + LEFDEFLayoutGenerator *via_generator (const std::string &vn); + + /** + * @brief Registers a macro generator for the macro with the given name + * + * The generator is capable of creating a macro for a specific mask configuration + */ + void register_macro_cell (const std::string &mn, LEFDEFLayoutGenerator *generator); + + /** + * @brief Gets the macro cell for the given macro name or 0 if no such maco is registered + */ + std::pair macro_cell (const std::string &mn, Layout &layout, const std::vector &masks, const MacroDesc ¯o_desc, const LEFDEFNumberOfMasks *nm); + + /** + * @brief Gets the macro generator for a given macro name or 0 if there is no such generator + */ + LEFDEFLayoutGenerator *macro_generator (const std::string &mn); + /** * @brief Get the technology component pointer */ @@ -1060,6 +1109,35 @@ private: unsigned int mask_bottom, mask_cut, mask_top; }; + /** + * @brief A key for the via cache + */ + struct MacroKey + { + MacroKey (const std::string &n, const std::vector &m) + : name (n), masks (m) + { } + + bool operator== (const MacroKey &other) const + { + return name == other.name && masks == other.masks; + } + + bool operator< (const MacroKey &other) const + { + if (name != other.name) { + return name < other.name; + } + if (masks != other.masks) { + return masks < other.masks; + } + return false; + } + + std::string name; + std::vector masks; + }; + // no copying LEFDEFReaderState (const LEFDEFReaderState &); LEFDEFReaderState &operator= (const LEFDEFReaderState &); @@ -1070,9 +1148,11 @@ private: bool m_has_explicit_layer_mapping; int m_laynum; std::map m_default_number; - std::map m_via_cells; const LEFDEFReaderOptions *mp_tech_comp; + std::map m_via_cells; std::map m_via_generators; + std::map > m_macro_cells; + std::map m_macro_generators; std::pair open_layer_uncached (db::Layout &layout, const std::string &name, LayerPurpose purpose, unsigned int mask); void map_layer_explicit (const std::string &n, LayerPurpose purpose, const LayerProperties &lp, unsigned int layer, unsigned int mask); @@ -1091,6 +1171,34 @@ struct DB_PLUGIN_PUBLIC ViaDesc std::string m1, m2; }; +/** + * @brief A structure describing a macro + */ +struct DB_PLUGIN_PUBLIC MacroDesc +{ + MacroDesc () { } + + /** + * @brief The name of the FOREIGN cell if present + */ + std::string foreign_name; + + /** + * @brief The transformation of the FOREIGN cell + */ + db::Trans foreign_trans; + + /** + * @brief The origin + */ + db::Point origin; + + /** + * @brief The bounding box + */ + db::Box bbox; +}; + /** * @brief The LEF importer object */ diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc index a27651b0a..05dc482cc 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc @@ -43,18 +43,7 @@ LEFImporter::~LEFImporter () // .. nothing yet .. } -db::Box -LEFImporter::macro_bbox_by_name (const std::string &name) const -{ - std::map::const_iterator m = m_macro_bboxes_by_name.find (name); - if (m != m_macro_bboxes_by_name.end ()) { - return m->second; - } else { - return db::Box (); - } -} - -double +double LEFImporter::layer_ext (const std::string &layer, double def_ext) const { std::map::const_iterator l = m_default_ext.find (layer); @@ -105,19 +94,8 @@ LEFImporter::layer_width (const std::string &layer, const std::string &nondefaul } } -std::pair -LEFImporter::macro_by_name (const std::string &name) const -{ - std::map >::const_iterator m = m_macros_by_name.find (name); - if (m != m_macros_by_name.end ()) { - return m->second; - } else { - return std::make_pair ((db::Cell *) 0, db::Trans ()); - } -} - std::vector -LEFImporter::get_iteration (db::Layout &layout) +LEFImporter::get_iteration (double dbu) { test ("DO"); long nx = get_long (); @@ -131,7 +109,7 @@ LEFImporter::get_iteration (db::Layout &layout) std::vector t; for (long i = 0; i < nx; ++i) { for (long j = 0; j < ny; ++j) { - t.push_back (db::Trans (db::Vector (db::DVector (dx * i / layout.dbu (), dy * j / layout.dbu ())))); + t.push_back (db::Trans (db::Vector (db::DVector (dx * i / dbu, dy * j / dbu)))); } } return t; @@ -158,10 +136,9 @@ static db::Shape insert_shape (db::Cell &cell, unsigned int layer_id, const Shap } void -LEFImporter::read_geometries (db::Layout &layout, db::Cell &cell, LayerPurpose purpose, std::map *collect_bboxes, db::properties_id_type prop_id) +LEFImporter::read_geometries (GeometryBasedLayoutGenerator *lg, double dbu, LayerPurpose purpose, std::map *collect_boxes_for_labels, db::properties_id_type prop_id) { std::string layer_name; - double dbu = layout.dbu (); double w = 0.0; while (true) { @@ -201,12 +178,6 @@ LEFImporter::read_geometries (db::Layout &layout, db::Cell &cell, LayerPurpose p mask = get_mask (get_long ()); } - int layer_id = -1; - std::pair dl = open_layer (layout, layer_name, purpose, mask); - if (dl.first) { - layer_id = int (dl.second); - } - bool iterate = test ("ITERATE"); while (! peek (";") && ! peek ("DO")) { @@ -221,20 +192,24 @@ LEFImporter::read_geometries (db::Layout &layout, db::Cell &cell, LayerPurpose p db::Path p (points.begin (), points.end (), iw, iw / 2, iw / 2, false); if (iterate) { - std::vector ti = get_iteration (layout); - if (layer_id >= 0) { - for (std::vector::const_iterator t = ti.begin (); t != ti.end (); ++t) { - db::Shape s = insert_shape (cell, layer_id, p, *t, prop_id); - if (collect_bboxes) { - collect_bboxes->insert (std::make_pair (layer_name, db::Box ())).first->second = s.bbox (); - } + + std::vector ti = get_iteration (dbu); + + for (std::vector::const_iterator t = ti.begin (); t != ti.end (); ++t) { + db::Path pt = p.transformed (*t); + lg->add_path (layer_name, purpose, pt, mask, prop_id); + if (collect_boxes_for_labels) { + collect_boxes_for_labels->insert (std::make_pair (layer_name, db::Box ())).first->second = pt.box (); } } - } else if (layer_id >= 0) { - db::Shape s = insert_shape (cell, layer_id, p, prop_id); - if (collect_bboxes) { - collect_bboxes->insert (std::make_pair (layer_name, db::Box ())).first->second = s.bbox (); + + } else { + + lg->add_path (layer_name, purpose, p, mask, prop_id); + if (collect_boxes_for_labels) { + collect_boxes_for_labels->insert (std::make_pair (layer_name, db::Box ())).first->second = p.box (); } + } expect (";"); @@ -248,12 +223,6 @@ LEFImporter::read_geometries (db::Layout &layout, db::Cell &cell, LayerPurpose p mask = get_mask (get_long ()); } - int layer_id = -1; - std::pair dl = open_layer (layout, layer_name, purpose, mask); - if (dl.first) { - layer_id = int (dl.second); - } - bool iterate = test ("ITERATE"); while (! peek (";") && ! peek ("DO")) { @@ -268,20 +237,23 @@ LEFImporter::read_geometries (db::Layout &layout, db::Cell &cell, LayerPurpose p p.assign_hull (points.begin (), points.end ()); if (iterate) { - std::vector ti = get_iteration (layout); - if (layer_id >= 0) { - for (std::vector::const_iterator t = ti.begin (); t != ti.end (); ++t) { - db::Shape s = insert_shape (cell, layer_id, p, *t, prop_id); - if (collect_bboxes) { - collect_bboxes->insert (std::make_pair (layer_name, db::Box ())).first->second = s.bbox (); - } + + std::vector ti = get_iteration (dbu); + for (std::vector::const_iterator t = ti.begin (); t != ti.end (); ++t) { + db::Polygon pt = p.transformed (*t); + lg->add_polygon (layer_name, purpose, pt, mask, prop_id); + if (collect_boxes_for_labels) { + collect_boxes_for_labels->insert (std::make_pair (layer_name, db::Box ())).first->second = pt.box (); } } - } else if (layer_id >= 0) { - db::Shape s = insert_shape (cell, layer_id, p, prop_id); - if (collect_bboxes) { - collect_bboxes->insert (std::make_pair (layer_name, db::Box ())).first->second = s.bbox (); + + } else { + + lg->add_polygon (layer_name, purpose, p, mask, prop_id); + if (collect_boxes_for_labels) { + collect_boxes_for_labels->insert (std::make_pair (layer_name, db::Box ())).first->second = p.box (); } + } expect (";"); @@ -295,39 +267,39 @@ LEFImporter::read_geometries (db::Layout &layout, db::Cell &cell, LayerPurpose p mask = get_mask (get_long ()); } - int layer_id = -1; - std::pair dl = open_layer (layout, layer_name, purpose, mask); - if (dl.first) { - layer_id = int (dl.second); - } - bool iterate = test ("ITERATE"); for (int i = 0; i < 2; ++i) { + test ("("); double x = get_double (); double y = get_double (); points.push_back (db::Point (db::DPoint (x / dbu, y / dbu))); test (")"); + } db::Box b (points [0], points [1]); if (iterate) { - std::vector ti = get_iteration (layout); - if (layer_id >= 0) { - for (std::vector::const_iterator t = ti.begin (); t != ti.end (); ++t) { - db::Shape s = insert_shape (cell, layer_id, b, *t, prop_id); - if (collect_bboxes) { - collect_bboxes->insert (std::make_pair (layer_name, db::Box ())).first->second = s.bbox (); - } + + std::vector ti = get_iteration (dbu); + + for (std::vector::const_iterator t = ti.begin (); t != ti.end (); ++t) { + db::Box bt = b.transformed (*t); + lg->add_box (layer_name, purpose, bt, mask, prop_id); + if (collect_boxes_for_labels) { + collect_boxes_for_labels->insert (std::make_pair (layer_name, db::Box ())).first->second = bt; } } - } else if (layer_id >= 0) { - db::Shape s = insert_shape (cell, layer_id, b, prop_id); - if (collect_bboxes) { - collect_bboxes->insert (std::make_pair (layer_name, db::Box ())).first->second = s.bbox (); + + } else { + + lg->add_box (layer_name, purpose, b, mask, prop_id); + if (collect_boxes_for_labels) { + collect_boxes_for_labels->insert (std::make_pair (layer_name, db::Box ())).first->second = b; } + } expect (";"); @@ -348,12 +320,6 @@ LEFImporter::read_geometries (db::Layout &layout, db::Cell &cell, LayerPurpose p unsigned int mask_cut = (mask / 10) % 10; unsigned int mask_top = (mask / 100) % 10; - int layer_id = -1; - std::pair dl = open_layer (layout, layer_name, purpose, mask); - if (dl.first) { - layer_id = int (dl.second); - } - double x = 0.0, y = 0.0; if (test ("(")) { x = get_double (); @@ -366,20 +332,18 @@ LEFImporter::read_geometries (db::Layout &layout, db::Cell &cell, LayerPurpose p points.push_back (db::Vector (db::DVector (x / dbu, y / dbu))); std::string vn = get (); - db::Cell *vc = reader_state ()->via_cell (vn, layout, mask_bottom, mask_cut, mask_top, this); - if (! vc) { - warn (tl::to_string (tr ("Unknown via: ")) + vn); - } if (iterate) { - std::vector ti = get_iteration (layout); - if (vc) { - for (std::vector::const_iterator t = ti.begin (); t != ti.end (); ++t) { - cell.insert (db::CellInstArray (db::CellInst (vc->cell_index ()), *t * db::Trans (points [0]))); - } + + std::vector ti = get_iteration (dbu); + for (std::vector::const_iterator t = ti.begin (); t != ti.end (); ++t) { + lg->add_via (vn, *t * db::Trans (points [0]), mask_bottom, mask_cut, mask_top); } - } else if (vc) { - cell.insert (db::CellInstArray (db::CellInst (vc->cell_index ()), db::Trans (points [0]))); + + } else { + + lg->add_via (vn, db::Trans (points [0]), mask_bottom, mask_cut, mask_top); + } expect (";"); @@ -597,7 +561,7 @@ LEFImporter::read_viadef_by_geometry (GeometryBasedLayoutGenerator *lg, ViaDesc db::Polygon p; p.assign_hull (points.begin (), points.end ()); - lg->add_polygon (layer_name, p, mask); + lg->add_polygon (layer_name, ViaGeometry, p, mask, 0); expect (";"); @@ -619,7 +583,7 @@ LEFImporter::read_viadef_by_geometry (GeometryBasedLayoutGenerator *lg, ViaDesc } db::Box b (points [0], points [1]); - lg->add_box (layer_name, b, mask); + lg->add_box (layer_name, ViaGeometry, b, mask, 0); expect (";"); @@ -823,14 +787,15 @@ LEFImporter::read_macro (Layout &layout) { std::string mn = get (); - if (m_macros_by_name.find (mn) != m_macros_by_name.end ()) { + if (m_macros.find (mn) != m_macros.end ()) { error (tl::to_string (tr ("Duplicate MACRO name: ")) + mn); } set_cellname (mn); - db::Cell &cell = layout.cell (layout.add_cell ()); - db::Cell *foreign_cell = 0; + GeometryBasedLayoutGenerator *mg = new GeometryBasedLayoutGenerator (); + reader_state ()->register_macro_cell (mn, mg); + db::Trans foreign_trans; std::string foreign_name; @@ -892,14 +857,11 @@ LEFImporter::read_macro (Layout &layout) prop_id = layout.properties_repository ().properties_id (props); } - std::map bboxes; - read_geometries (layout, cell, LEFPins, &bboxes, prop_id); + std::map boxes_for_labels; + read_geometries (mg, layout.dbu (), LEFPins, &boxes_for_labels, prop_id); - for (std::map ::const_iterator b = bboxes.begin (); b != bboxes.end (); ++b) { - std::pair dl = open_layer (layout, b->first, Label, 0); - if (dl.first) { - cell.shapes (dl.second).insert (db::Text (label.c_str (), db::Trans (b->second.center () - db::Point ()))); - } + for (std::map ::const_iterator b = boxes_for_labels.begin (); b != boxes_for_labels.end (); ++b) { + mg->add_text (b->first, Label, db::Text (label.c_str (), db::Trans (b->second.center () - db::Point ())), 0, 0); } expect ("END"); @@ -915,10 +877,6 @@ LEFImporter::read_macro (Layout &layout) } else if (test ("FOREIGN")) { - if (foreign_cell) { - error (tl::to_string (tr ("Duplicate FOREIGN definition"))); - } - std::string cn = get (); db::Point vec; @@ -932,26 +890,24 @@ LEFImporter::read_macro (Layout &layout) if (options ().macro_resolution_mode () != 1) { - db::cell_index_type ci; - std::pair c = layout.cell_by_name (cn.c_str ()); - if (c.first) { - ci = c.second; - } else { - ci = layout.add_cell (cn.c_str ()); - layout.cell (ci).set_ghost_cell (true); + if (! foreign_name.empty ()) { + error (tl::to_string (tr ("Duplicate FOREIGN definition"))); } - foreign_cell = &layout.cell (ci); // What is the definition of the FOREIGN transformation? // Guessing: this transformation moves the lower-left origin to 0,0 foreign_trans = db::Trans (db::Point () - vec) * db::Trans (ft); foreign_name = cn; + if (foreign_name != mn) { + warn (tl::to_string (tr ("FOREIGN name differs from MACRO name in macro: ")) + mn); + } + } } else if (test ("OBS")) { - read_geometries (layout, cell, Obstructions); + read_geometries (mg, layout.dbu (), Obstructions); expect ("END"); } else if (test ("FIXEDMASK")) { @@ -967,69 +923,14 @@ LEFImporter::read_macro (Layout &layout) } - if (! foreign_cell) { + mg->add_box (std::string (), Outline, db::Box (-origin, -origin + size), 0, 0); - if (options ().macro_resolution_mode () != 2) { - - // actually implement the real cell - - layout.rename_cell (cell.cell_index (), mn.c_str ()); - - std::pair dl = open_layer (layout, std::string (), Outline, 0); - if (dl.first) { - cell.shapes (dl.second).insert (db::Box (-origin, -origin + size)); - } - - m_macros_by_name.insert (std::make_pair (mn, std::make_pair (&cell, db::Trans ()))); - - } else { - - // macro resolution mode #2 (always create a MACRO reference, no LEF geometry) - - db::cell_index_type ci; - std::pair c = layout.cell_by_name (mn.c_str ()); - if (c.first) { - ci = c.second; - } else { - ci = layout.add_cell (mn.c_str ()); - layout.cell (ci).set_ghost_cell (true); - } - - layout.delete_cell (cell.cell_index ()); - m_macros_by_name.insert (std::make_pair (mn, std::make_pair (&layout.cell (ci), db::Trans ()))); - - } - - } else if (foreign_name != mn) { - - warn (tl::to_string (tr ("FOREIGN name differs from MACRO name in macro: ")) + mn); - - layout.rename_cell (cell.cell_index (), mn.c_str ()); - - // clear imported LEF geometry with a foreign cell, but provide a level of indirection so we have - // both the MACRO and the FOREIGN name - - for (unsigned int l = 0; l < layout.layers (); ++l) { - if (layout.is_valid_layer (l)) { - cell.clear (l); - } - } - - cell.clear_insts (); - - cell.insert (db::CellInstArray (db::CellInst (foreign_cell->cell_index ()), db::Trans (db::Point () - origin) * foreign_trans)); - m_macros_by_name.insert (std::make_pair (mn, std::make_pair (&cell, db::Trans ()))); - - } else { - - // use FOREIGN cell instead of new one - - layout.delete_cell (cell.cell_index ()); - m_macros_by_name.insert (std::make_pair (mn, std::make_pair (foreign_cell, db::Trans (db::Point () - origin) * foreign_trans))); - - } - - m_macro_bboxes_by_name.insert (std::make_pair (mn, db::Box (-origin, -origin + size))); + MacroDesc macro_desc; + macro_desc.foreign_name = foreign_name; + macro_desc.foreign_trans = foreign_trans; + macro_desc.bbox = db::Box (-origin, -origin + size); + macro_desc.origin = origin; + m_macros.insert (std::make_pair (mn, macro_desc)); reset_cellname (); } diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.h b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.h index d05d1b345..ba1f2ce5d 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.h +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.h @@ -57,14 +57,6 @@ public: */ ~LEFImporter (); - /** - * @brief Get the cell for a macro name - * - * Returns 0 if the name is not a valid macro name. Otherwise it returns the pointer - * to the corresponding db::Cell object. - */ - std::pair macro_by_name (const std::string ¯o_name) const; - /** * @brief Get the cell bbox for the given macro name */ @@ -126,6 +118,16 @@ public: return m_vias; } + /** + * @brief Gets the + * + * The map maps the macro name to the macro description. + */ + const std::map ¯os () const + { + return m_macros; + } + protected: void do_read (db::Layout &layout); @@ -134,16 +136,13 @@ private: std::map > m_default_widths; std::map m_default_ext; std::map > m_min_widths; - std::map > m_macros_by_name; - std::map m_macro_bboxes_by_name; + std::map m_macros; std::map m_vias; std::set m_routing_layers, m_cut_layers; std::map m_num_masks; - std::vector get_iteration (db::Layout &layout); - // @@@ - void read_geometries (db::Layout &layout, db::Cell &cell, LayerPurpose purpose, std::map *collect_bboxes = 0, properties_id_type prop_id = 0); - // void read_geometries (GeometryBasedLayoutGenerator *lg, LayerPurpose purpose, std::map *collect_bboxes = 0, properties_id_type prop_id = 0); + std::vector get_iteration (double dbu); + void read_geometries (GeometryBasedLayoutGenerator *lg, double dbu, LayerPurpose purpose, std::map *collect_bboxes = 0, properties_id_type prop_id = 0); void read_nondefaultrule (Layout &layout); void read_viadef (Layout &layout); void read_viadef_by_rule (RuleBasedViaGenerator *vg, ViaDesc &desc, const std::string &n, double dbu); From af7d8bba89d8a9c2e3718ca5459296bbea5772fd Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sun, 23 Aug 2020 01:29:10 +0200 Subject: [PATCH 076/121] WIP: provide a LEF reader mode where all macros are read. For DEF only those macros which are used are read. --- .../lefdef/db_plugin/dbDEFImporter.cc | 30 ++-- .../lefdef/db_plugin/dbDEFImporter.h | 5 + .../lefdef/db_plugin/dbLEFDEFPlugin.cc | 2 + .../lefdef/db_plugin/dbLEFImporter.cc | 155 +++++++++++------- .../lefdef/db_plugin/dbLEFImporter.h | 13 +- .../lefdef/unit_tests/dbLEFDEFImportTests.cc | 15 +- testdata/lefdef/lefpins/au_no_lefpins.oas.gz | Bin 269 -> 481 bytes 7 files changed, 140 insertions(+), 80 deletions(-) diff --git a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc index bd567b83b..e0950c063 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc @@ -64,6 +64,12 @@ DEFImporter::read_lef (tl::InputStream &stream, db::Layout &layout, LEFDEFReader m_lef_importer.read (stream, layout, state); } +void +DEFImporter::finish_lef (db::Layout &layout) +{ + m_lef_importer.finish_lef (layout); +} + void DEFImporter::read_polygon (db::Polygon &poly, double scale) { @@ -1274,6 +1280,11 @@ DEFImporter::read_components (db::Layout &layout, std::list::const_iterator m = m_lef_importer.macros ().find (model); + if (m == m_lef_importer.macros ().end ()) { + error (tl::to_string (tr ("Macro not found in LEF file: ")) + model); + } + while (test ("+")) { if (test ("PLACED") || test ("FIXED") || test ("COVER")) { @@ -1283,7 +1294,7 @@ DEFImporter::read_components (db::Layout &layout, std::listsecond.bbox.transformed (ft).lower_left (); is_placed = true; } else if (test ("MASKSHIFT")) { @@ -1302,19 +1313,10 @@ DEFImporter::read_components (db::Layout &layout, std::list::const_iterator m = m_lef_importer.macros ().find (model); - if (m == m_lef_importer.macros ().end ()) { - - warn (tl::to_string (tr ("Macro not found in LEF file: ")) + model); - - } else { - - std::pair ct = reader_state ()->macro_cell (model, layout, string2masks (maskshift), m->second, &m_lef_importer); - if (ct.first) { - db::CellInstArray inst (db::CellInst (ct.first->cell_index ()), db::Trans (ft.rot (), d) * ct.second); - instances.push_back (std::make_pair (inst_name, inst)); - } - + std::pair ct = reader_state ()->macro_cell (model, layout, string2masks (maskshift), m->second, &m_lef_importer); + if (ct.first) { + db::CellInstArray inst (db::CellInst (ct.first->cell_index ()), db::Trans (ft.rot (), d) * ct.second); + instances.push_back (std::make_pair (inst_name, inst)); } } diff --git a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.h b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.h index 49cbc9acd..dbe1279bf 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.h +++ b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.h @@ -58,6 +58,11 @@ public: */ void read_lef (tl::InputStream &stream, db::Layout &layout, LEFDEFReaderState &state); + /** + * @brief Provided for test purposes + */ + void finish_lef (Layout &layout); + protected: void do_read (db::Layout &layout); diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc index 7cb680083..9b707373c 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc @@ -140,6 +140,8 @@ private: tl::log << tl::to_string (tr ("Reading")) << " " << m_stream.source (); importer.read (m_stream, layout, state); + importer.finish_lef (layout); + } else { tl::SelfTimer timer (tl::verbosity () >= 21, tl::to_string (tr ("Reading DEF file"))); diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc index 05dc482cc..d4721a7ee 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc @@ -188,26 +188,30 @@ LEFImporter::read_geometries (GeometryBasedLayoutGenerator *lg, double dbu, Laye test (")"); } - db::Coord iw = db::coord_traits::rounded (w / dbu); - db::Path p (points.begin (), points.end (), iw, iw / 2, iw / 2, false); + if (lg) { - if (iterate) { + db::Coord iw = db::coord_traits::rounded (w / dbu); + db::Path p (points.begin (), points.end (), iw, iw / 2, iw / 2, false); - std::vector ti = get_iteration (dbu); + if (iterate) { - for (std::vector::const_iterator t = ti.begin (); t != ti.end (); ++t) { - db::Path pt = p.transformed (*t); - lg->add_path (layer_name, purpose, pt, mask, prop_id); - if (collect_boxes_for_labels) { - collect_boxes_for_labels->insert (std::make_pair (layer_name, db::Box ())).first->second = pt.box (); + std::vector ti = get_iteration (dbu); + + for (std::vector::const_iterator t = ti.begin (); t != ti.end (); ++t) { + db::Path pt = p.transformed (*t); + lg->add_path (layer_name, purpose, pt, mask, prop_id); + if (collect_boxes_for_labels) { + collect_boxes_for_labels->insert (std::make_pair (layer_name, db::Box ())).first->second = pt.box (); + } } - } - } else { + } else { + + lg->add_path (layer_name, purpose, p, mask, prop_id); + if (collect_boxes_for_labels) { + collect_boxes_for_labels->insert (std::make_pair (layer_name, db::Box ())).first->second = p.box (); + } - lg->add_path (layer_name, purpose, p, mask, prop_id); - if (collect_boxes_for_labels) { - collect_boxes_for_labels->insert (std::make_pair (layer_name, db::Box ())).first->second = p.box (); } } @@ -233,25 +237,29 @@ LEFImporter::read_geometries (GeometryBasedLayoutGenerator *lg, double dbu, Laye test (")"); } - db::Polygon p; - p.assign_hull (points.begin (), points.end ()); + if (lg) { - if (iterate) { + db::Polygon p; + p.assign_hull (points.begin (), points.end ()); - std::vector ti = get_iteration (dbu); - for (std::vector::const_iterator t = ti.begin (); t != ti.end (); ++t) { - db::Polygon pt = p.transformed (*t); - lg->add_polygon (layer_name, purpose, pt, mask, prop_id); - if (collect_boxes_for_labels) { - collect_boxes_for_labels->insert (std::make_pair (layer_name, db::Box ())).first->second = pt.box (); + if (iterate) { + + std::vector ti = get_iteration (dbu); + for (std::vector::const_iterator t = ti.begin (); t != ti.end (); ++t) { + db::Polygon pt = p.transformed (*t); + lg->add_polygon (layer_name, purpose, pt, mask, prop_id); + if (collect_boxes_for_labels) { + collect_boxes_for_labels->insert (std::make_pair (layer_name, db::Box ())).first->second = pt.box (); + } } - } - } else { + } else { + + lg->add_polygon (layer_name, purpose, p, mask, prop_id); + if (collect_boxes_for_labels) { + collect_boxes_for_labels->insert (std::make_pair (layer_name, db::Box ())).first->second = p.box (); + } - lg->add_polygon (layer_name, purpose, p, mask, prop_id); - if (collect_boxes_for_labels) { - collect_boxes_for_labels->insert (std::make_pair (layer_name, db::Box ())).first->second = p.box (); } } @@ -279,25 +287,29 @@ LEFImporter::read_geometries (GeometryBasedLayoutGenerator *lg, double dbu, Laye } - db::Box b (points [0], points [1]); + if (lg) { - if (iterate) { + db::Box b (points [0], points [1]); - std::vector ti = get_iteration (dbu); + if (iterate) { - for (std::vector::const_iterator t = ti.begin (); t != ti.end (); ++t) { - db::Box bt = b.transformed (*t); - lg->add_box (layer_name, purpose, bt, mask, prop_id); - if (collect_boxes_for_labels) { - collect_boxes_for_labels->insert (std::make_pair (layer_name, db::Box ())).first->second = bt; + std::vector ti = get_iteration (dbu); + + for (std::vector::const_iterator t = ti.begin (); t != ti.end (); ++t) { + db::Box bt = b.transformed (*t); + lg->add_box (layer_name, purpose, bt, mask, prop_id); + if (collect_boxes_for_labels) { + collect_boxes_for_labels->insert (std::make_pair (layer_name, db::Box ())).first->second = bt; + } } - } - } else { + } else { + + lg->add_box (layer_name, purpose, b, mask, prop_id); + if (collect_boxes_for_labels) { + collect_boxes_for_labels->insert (std::make_pair (layer_name, db::Box ())).first->second = b; + } - lg->add_box (layer_name, purpose, b, mask, prop_id); - if (collect_boxes_for_labels) { - collect_boxes_for_labels->insert (std::make_pair (layer_name, db::Box ())).first->second = b; } } @@ -333,17 +345,21 @@ LEFImporter::read_geometries (GeometryBasedLayoutGenerator *lg, double dbu, Laye std::string vn = get (); - if (iterate) { + if (lg) { + + if (iterate) { + + std::vector ti = get_iteration (dbu); + for (std::vector::const_iterator t = ti.begin (); t != ti.end (); ++t) { + lg->add_via (vn, *t * db::Trans (points [0]), mask_bottom, mask_cut, mask_top); + } + + } else { + + lg->add_via (vn, db::Trans (points [0]), mask_bottom, mask_cut, mask_top); - std::vector ti = get_iteration (dbu); - for (std::vector::const_iterator t = ti.begin (); t != ti.end (); ++t) { - lg->add_via (vn, *t * db::Trans (points [0]), mask_bottom, mask_cut, mask_top); } - } else { - - lg->add_via (vn, db::Trans (points [0]), mask_bottom, mask_cut, mask_top); - } expect (";"); @@ -850,18 +866,24 @@ LEFImporter::read_macro (Layout &layout) } */ - db::properties_id_type prop_id = 0; - if (produce_pin_props ()) { - db::PropertiesRepository::properties_set props; - props.insert (std::make_pair (pin_prop_name_id (), tl::Variant (label))); - prop_id = layout.properties_repository ().properties_id (props); - } + if (reader_state ()->tech_comp ()->produce_lef_pins ()) { - std::map boxes_for_labels; - read_geometries (mg, layout.dbu (), LEFPins, &boxes_for_labels, prop_id); + db::properties_id_type prop_id = 0; + if (produce_pin_props ()) { + db::PropertiesRepository::properties_set props; + props.insert (std::make_pair (pin_prop_name_id (), tl::Variant (label))); + prop_id = layout.properties_repository ().properties_id (props); + } - for (std::map ::const_iterator b = boxes_for_labels.begin (); b != boxes_for_labels.end (); ++b) { - mg->add_text (b->first, Label, db::Text (label.c_str (), db::Trans (b->second.center () - db::Point ())), 0, 0); + std::map boxes_for_labels; + read_geometries (mg, layout.dbu (), LEFPins, &boxes_for_labels, prop_id); + + for (std::map ::const_iterator b = boxes_for_labels.begin (); b != boxes_for_labels.end (); ++b) { + mg->add_text (b->first, Label, db::Text (label.c_str (), db::Trans (b->second.center () - db::Point ())), 0, 0); + } + + } else { + read_geometries (0, layout.dbu (), LEFPins, 0, 0); } expect ("END"); @@ -907,7 +929,12 @@ LEFImporter::read_macro (Layout &layout) } else if (test ("OBS")) { - read_geometries (mg, layout.dbu (), Obstructions); + if (reader_state ()->tech_comp ()->produce_obstructions ()) { + read_geometries (mg, layout.dbu (), Obstructions); + } else { + read_geometries (0, layout.dbu (), Obstructions); + } + expect ("END"); } else if (test ("FIXEDMASK")) { @@ -1037,5 +1064,13 @@ LEFImporter::do_read (db::Layout &layout) } } +void +LEFImporter::finish_lef (db::Layout &layout) +{ + for (std::map::const_iterator m = m_macros.begin (); m != m_macros.end (); ++m) { + reader_state ()->macro_cell (m->first, layout, std::vector (), m->second, this); + } +} + } diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.h b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.h index ba1f2ce5d..95ce1fe4d 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.h +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.h @@ -57,11 +57,6 @@ public: */ ~LEFImporter (); - /** - * @brief Get the cell bbox for the given macro name - */ - db::Box macro_bbox_by_name (const std::string ¯o_name) const; - /** * @brief Get the width for a layer with the given name * @@ -128,6 +123,14 @@ public: return m_macros; } + /** + * @brief Finishes reading a LEF file + * + * This method will create all the macros, so they become visible. + * When reading a LEF as component for a DEF, this method will not be called. + */ + void finish_lef (db::Layout &layout); + protected: void do_read (db::Layout &layout); diff --git a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc index f32115248..2e1390bd8 100644 --- a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc +++ b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc @@ -65,6 +65,8 @@ static db::LayerMap run_test (tl::TestBase *_this, const char *lef_dir, const ch db::LEFDEFReaderState ld (&options, layout, fn_path); db::DEFImporter imp; + bool any_def = false; + bool any_lef = false; while (! ex.at_end ()) { @@ -85,6 +87,8 @@ static db::LayerMap run_test (tl::TestBase *_this, const char *lef_dir, const ch tl::InputStream stream (fn); imp.read (stream, layout, ld); + any_def = true; + } else if (ex.test ("lef:")) { std::string fn = fn_path, f; @@ -94,6 +98,8 @@ static db::LayerMap run_test (tl::TestBase *_this, const char *lef_dir, const ch tl::InputStream stream (fn); imp.read_lef (stream, layout, ld); + any_lef = true; + } else if (ex.test ("gds:")) { std::string fn = fn_path, f; @@ -116,6 +122,8 @@ static db::LayerMap run_test (tl::TestBase *_this, const char *lef_dir, const ch lo.set_options (options); reader.read (layout, lo); + any_def = true; + } else { break; @@ -128,6 +136,10 @@ static db::LayerMap run_test (tl::TestBase *_this, const char *lef_dir, const ch } + if (! any_def && any_lef) { + imp.finish_lef (layout); + } + ld.finish (layout); // normalize the layout by writing to OASIS and reading from .. @@ -198,7 +210,8 @@ TEST(1) TEST(2) { - run_test (_this, "lef2", "lef:in.lef", "au.oas.gz", default_options ()); + // Also tests ability of plugin to properly read LEF + run_test (_this, "lef2", "read:in.lef", "au.oas.gz", default_options ()); } TEST(3) diff --git a/testdata/lefdef/lefpins/au_no_lefpins.oas.gz b/testdata/lefdef/lefpins/au_no_lefpins.oas.gz index 099aeed882a461a3d5e5ce06c40c89cda1901a4f..e788cba0c40ae567b9437287a69cd3e63414b2df 100644 GIT binary patch literal 481 zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDB|rrGn#q9V6m{J>C6WUE)3cLR{TlgW|(I zT|zuKSY&u*Akv|J*c8Z!as|hS_y@#0yZZR>@TBDzrDmq*C8y@(6tnXM$Gf`(#|H%Y z2e<}>L~^p_CMFl<8#1G)Vup%xv-^jJ_;~ucGIKC9@E~(|8AXyg7#f%#F!M499$=JF WXW(GuX8?)4V86i6)G(3(0|NjA9JKZT literal 269 zcmV+o0rLJIiwFoaSEF7419WY0E^lFT08Z@2gEzO`uOnh zq~#Z-W~S#Qr{?4ov-1VVySoI(2L$;CxCVtpar|lmL?XZGQ-4B zbaJ!!8U*+=vobUAz**cZKwSpRY#=chi<`;UkeMAQ0;Rdx{X;{1JpEjmIe>!599{;I z+pG*cyu2cfY$A>9yo`cB7#6UeW8!Am!6+n>%)!vW{D7I4N$>!pj5-4cBR>O3>;?M; Tex`X*yvPFKbKmq^&5KMfG From cb1b3655e98e65031fc52253d799f88d01b2af3e Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sun, 23 Aug 2020 01:55:55 +0200 Subject: [PATCH 077/121] Bugfix in the command line parser: inverted bool options with value have not been inverted. --- src/tl/tl/tlCommandLineParser.cc | 5 +- src/tl/tl/tlCommandLineParser.h | 60 ++++++++++++++++-------- src/tl/unit_tests/tlCommandLineParser.cc | 20 ++++++++ 3 files changed, 65 insertions(+), 20 deletions(-) diff --git a/src/tl/tl/tlCommandLineParser.cc b/src/tl/tl/tlCommandLineParser.cc index a3aa7bc8b..bfd215acb 100644 --- a/src/tl/tl/tlCommandLineParser.cc +++ b/src/tl/tl/tlCommandLineParser.cc @@ -558,7 +558,10 @@ CommandLineOptions::parse (int argc, char *argv[]) if (ex.test ("=")) { arg->take_value (ex); } else { - arg->mark_present (arg->option ().inverted); + arg->mark_present (); + } + if (arg->option ().inverted) { + arg->invert_present (); } } diff --git a/src/tl/tl/tlCommandLineParser.h b/src/tl/tl/tlCommandLineParser.h index 932f0032b..ad094849f 100644 --- a/src/tl/tl/tlCommandLineParser.h +++ b/src/tl/tl/tlCommandLineParser.h @@ -137,7 +137,15 @@ public: /** * @brief Marks an option to be present (for boolean options) */ - virtual void mark_present (bool) + virtual void mark_present () + { + // .. nothing yet .. + } + + /** + * @brief Inverts the presence of an option (for boolean options) + */ + virtual void invert_present () { // .. nothing yet .. } @@ -231,29 +239,30 @@ inline void extract (tl::Extractor &ex, std::vector &t, bool repeated_hint, b * @brief A helper to mark "presence" */ template -inline void mark_presence (T &, bool) +inline void mark_presence (T &) { // .. the default implementation does nothing .. } -inline void mark_presence (bool &t, bool invert) +inline void mark_presence (bool &t) { - t = !invert; + t = true; } -template -inline void mark_presence_setter (C *, void (C::*) (T), bool) +/** + * @brief A helper to invert "presence" + */ +template +inline void invert_presence (T &) { // .. the default implementation does nothing .. } -template -inline void mark_presence_setter (C *c, void (C::*ptr) (bool), bool invert) +inline void invert_presence (bool &t) { - (c->*ptr) (!invert); + t = !t; } - /** * @brief A helper template to extract the actual type from (T) or (const T &) */ @@ -303,9 +312,14 @@ public: extract (ex, *mp_value, option ().repeated); } - virtual void mark_present (bool inverted) + virtual void mark_present () { - mark_presence (*mp_value, inverted); + mark_presence (*mp_value); + } + + virtual void invert_present () + { + invert_presence (*mp_value); } virtual ArgBase *clone () const @@ -330,23 +344,30 @@ class arg_method_setter : public ArgBase { public: + typedef typename type_without_const_ref::inner_type inner_type; + arg_method_setter (const std::string &option, C *object, void (C::*setter)(T), const std::string &brief_doc, const std::string &long_doc) - : ArgBase (option, brief_doc, long_doc), mp_object (object), mp_setter (setter) + : ArgBase (option, brief_doc, long_doc), m_value (), mp_object (object), mp_setter (setter) { // .. nothing yet .. } virtual void take_value (tl::Extractor &ex) { - typedef typename type_without_const_ref::inner_type inner_type; - inner_type t = inner_type (); - extract (ex, t, option ().repeated); - (mp_object->*mp_setter) (t); + extract (ex, m_value, option ().repeated); + (mp_object->*mp_setter) (m_value); } - virtual void mark_present (bool inverted) + virtual void mark_present () { - mark_presence_setter (mp_object, mp_setter, inverted); + mark_presence (m_value); + (mp_object->*mp_setter) (m_value); + } + + virtual void invert_present () + { + invert_presence (m_value); + (mp_object->*mp_setter) (m_value); } virtual ArgBase *clone () const @@ -360,6 +381,7 @@ public: } private: + inner_type m_value; C *mp_object; void (C::*mp_setter)(T); }; diff --git a/src/tl/unit_tests/tlCommandLineParser.cc b/src/tl/unit_tests/tlCommandLineParser.cc index 085b5692f..1540a64fe 100644 --- a/src/tl/unit_tests/tlCommandLineParser.cc +++ b/src/tl/unit_tests/tlCommandLineParser.cc @@ -75,6 +75,26 @@ TEST(1) EXPECT_EQ (b, 0); EXPECT_EQ (c, false); + b = 0; + c = true; + { + const char *argv[] = { "x", "u", "-cc=false" }; + cmd.parse (sizeof (argv) / sizeof (argv[0]), (char **) argv); + } + EXPECT_EQ (a, "u"); + EXPECT_EQ (b, 0); + EXPECT_EQ (c, true); + + b = 0; + c = true; + { + const char *argv[] = { "x", "u", "-cc=true" }; + cmd.parse (sizeof (argv) / sizeof (argv[0]), (char **) argv); + } + EXPECT_EQ (a, "u"); + EXPECT_EQ (b, 0); + EXPECT_EQ (c, false); + { const char *argv[] = { "x", "u", "-c", "-cc" }; cmd.parse (sizeof (argv) / sizeof (argv[0]), (char **) argv); From af2bfce05171bf9159db6e412584eb19d6692ef6 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sun, 23 Aug 2020 18:58:52 +0200 Subject: [PATCH 078/121] Tests and bug fixes for component maskshift implementation --- .../lefdef/db_plugin/dbDEFImporter.cc | 5 +- .../lefdef/db_plugin/dbLEFDEFImporter.cc | 120 ++++++++++++------ .../lefdef/db_plugin/dbLEFDEFImporter.h | 42 ++++-- .../lefdef/db_plugin/dbLEFImporter.cc | 4 +- .../lefdef/unit_tests/dbLEFDEFImportTests.cc | 8 ++ testdata/lefdef/masks-1/in_tech.lef | 10 +- testdata/lefdef/masks-2/au.oas.gz | Bin 0 -> 3217 bytes 7 files changed, 129 insertions(+), 60 deletions(-) create mode 100644 testdata/lefdef/masks-2/au.oas.gz diff --git a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc index e0950c063..4dc1d25ac 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc @@ -1313,7 +1313,7 @@ DEFImporter::read_components (db::Layout &layout, std::list ct = reader_state ()->macro_cell (model, layout, string2masks (maskshift), m->second, &m_lef_importer); + std::pair ct = reader_state ()->macro_cell (model, layout, m_component_maskshift, string2masks (maskshift), m->second, &m_lef_importer); if (ct.first) { db::CellInstArray inst (db::CellInst (ct.first->cell_index ()), db::Trans (ft.rot (), d) * ct.second); instances.push_back (std::make_pair (inst_name, inst)); @@ -1496,6 +1496,9 @@ DEFImporter::do_read (db::Layout &layout) m_component_maskshift.push_back (get ()); } + // because we treat the layers bottom first .. + std::reverse (m_component_maskshift.begin (), m_component_maskshift.end ()); + } else if (test ("COMPONENTS")) { get_long (); diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc index 58e5d128f..6ec7ae99b 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc @@ -122,8 +122,11 @@ RuleBasedViaGenerator::RuleBasedViaGenerator () { } void -RuleBasedViaGenerator::create_cell (LEFDEFReaderState &reader, Layout &layout, db::Cell &cell, const std::vector &masks, const LEFDEFNumberOfMasks *nm) +RuleBasedViaGenerator::create_cell (LEFDEFReaderState &reader, Layout &layout, db::Cell &cell, const std::vector *maskshift_layers, const std::vector &masks, const LEFDEFNumberOfMasks *nm) { + // will not be used with an external maskshift layer stack + tl_assert (maskshift_layers == 0); + unsigned int mask_bottom = mask (masks, 0), mask_cut = mask (masks, 1), mask_top = mask (masks, 2); if (mask_bottom == 0) { @@ -267,41 +270,61 @@ RuleBasedViaGenerator::create_cell (LEFDEFReaderState &reader, Layout &layout, d // GeometryBasedViaGenerator implementation GeometryBasedLayoutGenerator::GeometryBasedLayoutGenerator () - : LEFDEFLayoutGenerator () -{ } + : LEFDEFLayoutGenerator (), m_fixedmask (false) +{ + // .. nothing yet .. +} unsigned int -GeometryBasedLayoutGenerator::mask_for (const std::string &ln, unsigned int m, const std::vector &masks, const LEFDEFNumberOfMasks *nm) const +GeometryBasedLayoutGenerator::get_maskshift (const std::string &ln, const std::vector *msl, const std::vector &masks) { - for (std::vector::const_iterator l = m_maskshift_layers.begin (); l != m_maskshift_layers.end (); ++l) { - - if (! l->empty () && *l == ln) { - - unsigned int mm = mask (masks, (unsigned int) (l - m_maskshift_layers.begin ())); - - if (m == 0 || ! nm) { - m = mm; - } else if (mm > 0) { - m = (m + mm - 2) % nm->number_of_masks (ln) + 1; - } - - break; - - } - + if (! msl) { + msl = &m_maskshift_layers; } - return m; + for (std::vector::const_iterator l = msl->begin (); l != msl->end (); ++l) { + if (! l->empty () && *l == ln) { + return mask (masks, (unsigned int) (l - msl->begin ())); + } + } + + return 0; +} + +unsigned int +GeometryBasedLayoutGenerator::mask_for (const std::string &ln, unsigned int m, unsigned int mshift, const LEFDEFNumberOfMasks *nm) const +{ + // for FIXEDMASK we don't do any mask shifting + if (m_fixedmask || m == 0 || mshift == 0 || !nm) { + return m; + } else { + return (m + mshift - 2) % nm->number_of_masks (ln) + 1; + } +} + +unsigned int +GeometryBasedLayoutGenerator::combine_maskshifts (const std::string &ln, unsigned int mshift1, unsigned int mshift2, const LEFDEFNumberOfMasks *nm) const +{ + if (mshift1 == 0 || mshift2 == 0) { + return mshift1 + mshift2; + } else { + return (mshift1 + mshift2 - 2) % nm->number_of_masks (ln) + 1; + } } void -GeometryBasedLayoutGenerator::create_cell (LEFDEFReaderState &reader, Layout &layout, db::Cell &cell, const std::vector &masks, const LEFDEFNumberOfMasks *nm) +GeometryBasedLayoutGenerator::create_cell (LEFDEFReaderState &reader, Layout &layout, db::Cell &cell, const std::vector *ext_msl, const std::vector &masks, const LEFDEFNumberOfMasks *nm) { for (std::map >, db::Shapes>::const_iterator g = m_shapes.begin (); g != m_shapes.end (); ++g) { - std::pair dl = reader.open_layer (layout, g->first.first, g->first.second.first, mask_for (g->first.first, g->first.second.second, masks, nm)); + + unsigned int mshift = get_maskshift (g->first.first, ext_msl, masks); + unsigned int mask = mask_for (g->first.first, g->first.second.second, mshift, nm); + + std::pair dl = reader.open_layer (layout, g->first.first, g->first.second.first, mask); if (dl.first) { cell.shapes (dl.second).insert (g->second); } + } for (std::list::const_iterator v = m_vias.begin (); v != m_vias.end (); ++v) { @@ -314,10 +337,14 @@ GeometryBasedLayoutGenerator::create_cell (LEFDEFReaderState &reader, Layout &la std::vector msl = g->maskshift_layers (); msl.resize (3, std::string ()); + unsigned mshift_bottom = get_maskshift (msl [0], ext_msl, masks); + unsigned mshift_cut = get_maskshift (msl [1], ext_msl, masks); + unsigned mshift_top = get_maskshift (msl [2], ext_msl, masks); + db::Cell *vc = reader.via_cell (v->name, layout, - mask_for (msl [0], v->bottom_mask, masks, nm), - mask_for (msl [1], v->cut_mask, masks, nm), - mask_for (msl [2], v->top_mask, masks, nm), + combine_maskshifts (msl [0], v->bottom_mask, mshift_bottom, nm), + combine_maskshifts (msl [1], v->cut_mask, mshift_cut, nm), + combine_maskshifts (msl [2], v->top_mask, mshift_top, nm), nm); if (vc) { @@ -1292,7 +1319,7 @@ LEFDEFReaderState::via_cell (const std::string &vn, db::Layout &layout, unsigned masks.push_back (mask_cut); masks.push_back (mask_top); - vg->create_cell (*this, layout, *cell, masks, nm); + vg->create_cell (*this, layout, *cell, 0, masks, nm); } @@ -1326,9 +1353,22 @@ LEFDEFReaderState::macro_generator (const std::string &mn) } std::pair -LEFDEFReaderState::macro_cell (const std::string &mn, Layout &layout, const std::vector &masks, const MacroDesc ¯o_desc, const LEFDEFNumberOfMasks *nm) +LEFDEFReaderState::macro_cell (const std::string &mn, Layout &layout, const std::vector &maskshift_layers, const std::vector &masks, const MacroDesc ¯o_desc, const LEFDEFNumberOfMasks *nm) { - MacroKey mk (mn, masks); + std::map::const_iterator g = m_macro_generators.find (mn); + if (g == m_macro_generators.end ()) { + return std::make_pair ((db::Cell *) 0, db::Trans ()); + } + + LEFDEFLayoutGenerator *mg = g->second; + + MacroKey mk; + if (mg->is_fixedmask ()) { + mk = MacroKey (mn, std::vector ()); + } else { + mk = MacroKey (mn, masks); + } + std::map >::const_iterator i = m_macro_cells.find (mk); if (i != m_macro_cells.end ()) { tl_assert (! i->second.first || i->second.first->layout () == &layout); @@ -1338,13 +1378,6 @@ LEFDEFReaderState::macro_cell (const std::string &mn, Layout &layout, const std: db::Cell *cell = 0; db::Trans tr; - std::map::const_iterator g = m_macro_generators.find (mn); - if (g == m_macro_generators.end ()) { - return std::make_pair ((db::Cell *) 0, db::Trans ()); - } - - LEFDEFLayoutGenerator *mg = g->second; - if (! macro_desc.foreign_name.empty ()) { db::cell_index_type ci; @@ -1392,15 +1425,22 @@ LEFDEFReaderState::macro_cell (const std::string &mn, Layout &layout, const std: // actually implement the real cell std::string mask_suffix; - for (std::vector::const_iterator m = masks.begin (); m != masks.end (); ++m) { - mask_suffix += "_"; - mask_suffix += tl::to_string (*m); + if (! mg->is_fixedmask ()) { + for (std::vector::const_iterator m = masks.begin (); m != masks.end (); ++m) { + mask_suffix += "_"; + mask_suffix += tl::to_string (*m); + } } std::string cn = mn + mask_suffix; cell = &layout.cell (layout.add_cell (cn.c_str ())); - mg->create_cell (*this, layout, *cell, masks, nm); + + if (mg->is_fixedmask ()) { + mg->create_cell (*this, layout, *cell, 0, std::vector (), nm); + } else { + mg->create_cell (*this, layout, *cell, &maskshift_layers, masks, nm); + } } diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h index 97f2ecfd0..bbe4e5502 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h @@ -888,8 +888,9 @@ public: LEFDEFLayoutGenerator () { } virtual ~LEFDEFLayoutGenerator () { } - virtual void create_cell (LEFDEFReaderState &reader, db::Layout &layout, db::Cell &cell, const std::vector &masks, const LEFDEFNumberOfMasks *nm) = 0; + virtual void create_cell (LEFDEFReaderState &reader, db::Layout &layout, db::Cell &cell, const std::vector *maskshift_layers, const std::vector &masks, const LEFDEFNumberOfMasks *nm) = 0; virtual std::vector maskshift_layers () const = 0; + virtual bool is_fixedmask () const = 0; }; /** @@ -901,7 +902,7 @@ class DB_PLUGIN_PUBLIC RuleBasedViaGenerator public: RuleBasedViaGenerator (); - virtual void create_cell (LEFDEFReaderState &reader, Layout &layout, db::Cell &cell, const std::vector &masks, const LEFDEFNumberOfMasks *nm); + virtual void create_cell (LEFDEFReaderState &reader, Layout &layout, db::Cell &cell, const std::vector *maskshift_layers, const std::vector &masks, const LEFDEFNumberOfMasks *nm); virtual std::vector maskshift_layers () const { @@ -912,6 +913,11 @@ public: return msl; } + virtual bool is_fixedmask () const + { + return false; + } + void set_cutsize (const db::Vector &cutsize) { m_cutsize = cutsize; } void set_cutspacing (const db::Vector &cutspacing) { m_cutspacing = cutspacing; } void set_offset (const db::Point &offset) { m_offset = offset; } @@ -947,17 +953,11 @@ class DB_PLUGIN_PUBLIC GeometryBasedLayoutGenerator : public LEFDEFLayoutGenerator { public: - struct Via { - Via () : bottom_mask (0), cut_mask (0), top_mask (0) { } - std::string name; - unsigned int bottom_mask, cut_mask, top_mask; - db::Trans trans; - }; - GeometryBasedLayoutGenerator (); - virtual void create_cell (LEFDEFReaderState &reader, Layout &layout, db::Cell &cell, const std::vector &masks, const LEFDEFNumberOfMasks *num_cut_masks); + virtual void create_cell (LEFDEFReaderState &reader, Layout &layout, db::Cell &cell, const std::vector *maskshift_layers, const std::vector &masks, const LEFDEFNumberOfMasks *num_cut_masks); virtual std::vector maskshift_layers () const { return m_maskshift_layers; } + virtual bool is_fixedmask () const { return m_fixedmask; } void add_polygon (const std::string &ln, LayerPurpose purpose, const db::Polygon &poly, unsigned int mask, properties_id_type prop_id); void add_box (const std::string &ln, LayerPurpose purpose, const db::Box &box, unsigned int mask, properties_id_type prop_id); @@ -975,12 +975,27 @@ public: m_maskshift_layers[l] = s; } + void set_fixedmask (bool f) + { + m_fixedmask = f; + } + private: + struct Via { + Via () : bottom_mask (0), cut_mask (0), top_mask (0) { } + std::string name; + unsigned int bottom_mask, cut_mask, top_mask; + db::Trans trans; + }; + std::map >, db::Shapes> m_shapes; std::list m_vias; std::vector m_maskshift_layers; + bool m_fixedmask; - unsigned int mask_for (const std::string &ln, unsigned int m, const std::vector &masks, const LEFDEFNumberOfMasks *nm) const; + unsigned int get_maskshift (const std::string &ln, const std::vector *maskshift_layers, const std::vector &masks); + unsigned int mask_for (const std::string &ln, unsigned int m, unsigned int mshift, const LEFDEFNumberOfMasks *nm) const; + unsigned int combine_maskshifts (const std::string &ln, unsigned int mshift1, unsigned int mshift2, const LEFDEFNumberOfMasks *nm) const; }; /** @@ -1058,7 +1073,7 @@ public: /** * @brief Gets the macro cell for the given macro name or 0 if no such maco is registered */ - std::pair macro_cell (const std::string &mn, Layout &layout, const std::vector &masks, const MacroDesc ¯o_desc, const LEFDEFNumberOfMasks *nm); + std::pair macro_cell (const std::string &mn, Layout &layout, const std::vector &maskshift_layers, const std::vector &masks, const MacroDesc ¯o_desc, const LEFDEFNumberOfMasks *nm); /** * @brief Gets the macro generator for a given macro name or 0 if there is no such generator @@ -1114,6 +1129,9 @@ private: */ struct MacroKey { + MacroKey () + { } + MacroKey (const std::string &n, const std::vector &m) : name (n), masks (m) { } diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc index d4721a7ee..c1a6caa1c 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc @@ -939,7 +939,7 @@ LEFImporter::read_macro (Layout &layout) } else if (test ("FIXEDMASK")) { - // we do actually expect FIXEDMASK to be the case always. + mg->set_fixedmask (true); expect (";"); } else { @@ -1068,7 +1068,7 @@ void LEFImporter::finish_lef (db::Layout &layout) { for (std::map::const_iterator m = m_macros.begin (); m != m_macros.end (); ++m) { - reader_state ()->macro_cell (m->first, layout, std::vector (), m->second, this); + reader_state ()->macro_cell (m->first, layout, std::vector (), std::vector (), m->second, this); } } diff --git a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc index 2e1390bd8..e082869a8 100644 --- a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc +++ b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc @@ -541,6 +541,14 @@ TEST(114_lef_skips_end_library) run_test (_this, "lef-skips-end-library", "lef:in.lef+def:in.def", "au.oas", opt, false); } +TEST(115_componentmaskshift) +{ + db::LEFDEFReaderOptions options = default_options (); + options.set_map_file ("in.map"); + + run_test (_this, "masks-2", "lef:in_tech.lef+lef:in.lef+def:in.def", "au.oas.gz", options, false); +} + TEST(200_lefdef_plugin) { db::Layout ly; diff --git a/testdata/lefdef/masks-1/in_tech.lef b/testdata/lefdef/masks-1/in_tech.lef index 4d7c3fc47..b85d99283 100644 --- a/testdata/lefdef/masks-1/in_tech.lef +++ b/testdata/lefdef/masks-1/in_tech.lef @@ -1,25 +1,25 @@ LAYER M0PO TYPE MASTERSLICE ; WIDTH 0.02 ; - MASKS 2 ; + MASK 2 ; END M0PO LAYER VIA0 TYPE CUT ; - MASKS 2 ; + MASK 2 ; END VIA0 LAYER M1 TYPE MASTERSLICE ; WIDTH 0.024 ; - MASKS 2 ; + MASK 2 ; END M1 LAYER VIA1 TYPE CUT ; - MASKS 2 ; + MASK 2 ; END VIA1 LAYER M2 TYPE MASTERSLICE ; WIDTH 0.03 ; - MASKS 2 ; + MASK 2 ; END M2 VIA square diff --git a/testdata/lefdef/masks-2/au.oas.gz b/testdata/lefdef/masks-2/au.oas.gz new file mode 100644 index 0000000000000000000000000000000000000000..4f2623eabd324d2091876e892aae4768c35662ba GIT binary patch literal 3217 zcmd^9J#QOF5WT(G6Di&u$+ONd5YUwnqzcWu(r^kTIx7Syk`U>9H3vZ^0V5IR*f3zj zO$;HO4OsA>&`)rmCU&LB4TCf;U8+=>*`3|JJ(5Y`lsN(<-Y5 zbw^>1LDKFxA1aRhw61bZQ@SXlDLF;O5 zl#d6){Hv_j3o3{E_ow%MnpEned}n)<5BCPcY;XMix_5ANcs~IhhuY!(!yog*{euTb z(EO&ml|TIX(f)%;-oZ}_wSs}5P-4W^rc%4ebf9TvBzd}!m0(sbg4t1#2T{>M zP64Rf0!+BJB*C+=f4EW-QU@!*4EAXZM=+IxTr`clGHTqL0Hg@6cu4Ksx2_ypE} zc`o@2FqOv|WMZNOdM$b)rv>ywgqF{MJ}*;vC!|Vw4CwI^V>DzX0Q##%1tq&7F9E$3 z%@~BSR5|NOXDwu6DR|^81qq^asd3hm&X%wh7YWi?Eg%A&O{KG*bk_Wr=aQG6bXG?2 zUL!IwQ9?RPL4xRPYCG#mXBR1SO;XBPPddB67!BFzk+UQ!DA^5p=}Bi(8&Jzio;8j&V8hm}T@UzHSop#nFDjZ_~DM)>ym!UsSmrDpne7Vy3t>U3?q~+C*c`H&!7{FQ z2Ukt2swq)Ug2sAi==ed-Yr~BVS%%BWH{GTAYnnO?#Oknrl7YB;;<3_#o+Oi zC-F0gpSfXJhJG2YBYex0`q+iAYKUW)#)4TxW@;%sjgQd@seq*%*D%iU51^Z&-z+o)@18zNM8wp;G_?0*N)!j(EH!Q42^TrAI&P%vb z%60!C^~BSeK{O9PF0&TR{g2D6L}%;bO{@R(NE!a#Q@i=cn=Y=(0KImzzHOP-!+X7M#X{ Vy Date: Sun, 23 Aug 2020 19:20:53 +0200 Subject: [PATCH 079/121] LEF/DEF component maskshift: some implementation tuning and test updates. --- .../lefdef/db_plugin/dbLEFDEFImporter.cc | 4 +- .../lefdef/unit_tests/dbLEFDEFImportTests.cc | 6 +- testdata/lefdef/masks-2/au.oas.gz | Bin 3217 -> 3190 bytes testdata/lefdef/masks-2/in.def | 44 ++++++++++++++ testdata/lefdef/masks-2/in.lef | 56 ++++++++++++++++++ testdata/lefdef/masks-2/in.map | 56 ++++++++++++++++++ testdata/lefdef/masks-2/in_tech.lef | 41 +++++++++++++ 7 files changed, 203 insertions(+), 4 deletions(-) create mode 100644 testdata/lefdef/masks-2/in.def create mode 100644 testdata/lefdef/masks-2/in.lef create mode 100644 testdata/lefdef/masks-2/in.map create mode 100644 testdata/lefdef/masks-2/in_tech.lef diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc index 6ec7ae99b..9187412d6 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc @@ -295,8 +295,10 @@ unsigned int GeometryBasedLayoutGenerator::mask_for (const std::string &ln, unsigned int m, unsigned int mshift, const LEFDEFNumberOfMasks *nm) const { // for FIXEDMASK we don't do any mask shifting - if (m_fixedmask || m == 0 || mshift == 0 || !nm) { + if (m_fixedmask || mshift == 0) { return m; + } else if (m == 0) { + return mshift; } else { return (m + mshift - 2) % nm->number_of_masks (ln) + 1; } diff --git a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc index e082869a8..a5af38f95 100644 --- a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc +++ b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc @@ -274,17 +274,17 @@ TEST(14) TEST(15) { - run_test (_this, "def6", "lef:cells.lef+lef:tech.lef+def:in.def.gz", "au.oas.gz", default_options ()); + run_test (_this, "def6", "lef:cells.lef+lef:tech.lef+def:in.def.gz", "au-new.oas.gz", default_options ()); } TEST(16) { db::LEFDEFReaderOptions options = default_options (); options.set_placement_blockage_layer ("PLACEMENT_BLK (11/0)"); - run_test (_this, "def7", "lef:cells.lef+lef:tech.lef+def:in.def.gz", "au.oas.gz", options); + run_test (_this, "def7", "lef:cells.lef+lef:tech.lef+def:in.def.gz", "au-new.oas.gz", options); options.set_placement_blockage_layer ("PLACEMENT_BLK (60/0)"); - run_test (_this, "def7", "map:in.map+lef:cells.lef+lef:tech.lef+def:in.def.gz", "au_with_map_file.oas.gz", options); + run_test (_this, "def7", "map:in.map+lef:cells.lef+lef:tech.lef+def:in.def.gz", "au_with_map_file-new.oas.gz", options); } TEST(17) diff --git a/testdata/lefdef/masks-2/au.oas.gz b/testdata/lefdef/masks-2/au.oas.gz index 4f2623eabd324d2091876e892aae4768c35662ba..0cceaa128b5334ba2ddfbc2ed792871b2f12f4b1 100644 GIT binary patch delta 125 zcmbOz`AuSj1gBJ5MP;Q(GxI4%k!B`lUS5&gjHehOLX&klFNoyzFxvDo+KOCezQkzL z!zeP5wUueI9G9fXB}TXm6Hr39n1PvbvJY1}A5du?NabYKON>CZ7q}F7VY2lPcly4!KEM|oXo(;C~}$k5+g*(=BHc}8381b B9XkL3 diff --git a/testdata/lefdef/masks-2/in.def b/testdata/lefdef/masks-2/in.def new file mode 100644 index 000000000..2c162e44b --- /dev/null +++ b/testdata/lefdef/masks-2/in.def @@ -0,0 +1,44 @@ + +VERSION 5.8 ; +DIVIDERCHAR "/" ; +BUSBITCHARS "[]" ; +DESIGN mapfile ; +UNITS DISTANCE MICRONS 1000 ; + +DIEAREA ( 0 0 ) ( 3000 3000 ) ; + +COMPONENTMASKSHIFT M2 M1 M0PO ; + +COMPONENTS 3 ; + +- comp1 mask_macro + + PLACED ( 0 0 ) N ; +- comp1 mask_macro + + MASKSHIFT 2 + + PLACED ( 1000 0 ) N ; +- comp1 mask_macro + + MASKSHIFT 221 + + PLACED ( 2000 0 ) N ; + +- comp1 nomask_macro + + PLACED ( 0 1000 ) N ; +- comp1 nomask_macro + + MASKSHIFT 2 + + PLACED ( 1000 1000 ) N ; +- comp1 nomask_macro + + MASKSHIFT 221 + + PLACED ( 2000 1000 ) N ; + +- comp1 fixedmask_macro + + PLACED ( 0 2000 ) N ; +- comp1 fixedmask_macro + + MASKSHIFT 2 + + PLACED ( 1000 2000 ) N ; +- comp1 fixedmask_macro + + MASKSHIFT 221 + + PLACED ( 2000 2000 ) N ; + +END COMPONENTS ; + +END DESIGN + diff --git a/testdata/lefdef/masks-2/in.lef b/testdata/lefdef/masks-2/in.lef new file mode 100644 index 000000000..89cb2d9f0 --- /dev/null +++ b/testdata/lefdef/masks-2/in.lef @@ -0,0 +1,56 @@ + +MACRO nomask_macro + CLASS CORE ; + ORIGIN 0.3 0.3 ; + SIZE 0.6 BY 0.6 ; + PIN Z + PORT + LAYER M0PO ; + RECT -0.07 -0.03 0.07 0.03 ; + LAYER M1 ; + RECT 0.07 -0.03 0.13 0.03 ; + LAYER M2 ; + RECT -0.13 -0.03 -0.07 0.03 ; + VIA 0.0 0.2 square_nomask ; + VIA 0.0 -0.2 square_nomask ; + END + END Z +END nomask_macro + +MACRO mask_macro + CLASS CORE ; + ORIGIN 0.3 0.3 ; + SIZE 0.6 BY 0.6 ; + PIN Z + PORT + LAYER M0PO ; + RECT MASK 2 -0.07 -0.03 0.07 0.03 ; + LAYER M1 ; + RECT MASK 2 0.07 -0.03 0.13 0.03 ; + LAYER M2 ; + RECT MASK 1 -0.13 -0.03 -0.07 0.03 ; + VIA MASK 200 0.0 0.2 square ; + VIA 0.0 -0.2 square ; + END + END Z +END mask_macro + +MACRO fixedmask_macro + CLASS CORE ; + FIXEDMASK ; + ORIGIN 0.3 0.3 ; + SIZE 0.6 BY 0.6 ; + PIN Z + PORT + LAYER M0PO ; + RECT MASK 2 -0.07 -0.03 0.07 0.03 ; + LAYER M1 ; + RECT MASK 2 0.07 -0.03 0.13 0.03 ; + LAYER M2 ; + RECT MASK 1 -0.13 -0.03 -0.07 0.03 ; + VIA MASK 200 0.0 0.2 square ; + VIA 0.0 -0.2 square ; + END + END Z +END fixedmask_macro + diff --git a/testdata/lefdef/masks-2/in.map b/testdata/lefdef/masks-2/in.map new file mode 100644 index 000000000..4981df24d --- /dev/null +++ b/testdata/lefdef/masks-2/in.map @@ -0,0 +1,56 @@ +DIEAREA ALL 4 0 +NAME M0PO 1 1 +M0PO LEFPIN,PIN 1 2 +M0PO VIA 1 3 +M0PO NET:MASK:1 1 100 +M0PO NET:MASK:2 1 200 +M0PO SPNET:MASK:1 1 101 +M0PO SPNET:MASK:2 1 201 +M0PO VIA:MASK:1 1 102 +M0PO VIA:MASK:2 1 202 +M0PO LEFPIN,PIN:MASK:1 1 110 +M0PO LEFPIN,PIN:MASK:2 1 210 +NAME VIA0 2 1 +VIA0 LEFPIN,PIN 2 2 +VIA0 VIA 2 3 +VIA0 NET:MASK:1 2 100 +VIA0 NET:MASK:2 2 200 +VIA0 SPNET:MASK:1 2 101 +VIA0 SPNET:MASK:2 2 201 +VIA0 VIA:MASK:1 2 102 +VIA0 VIA:MASK:2 2 202 +VIA0 LEFPIN,PIN:MASK:1 2 110 +VIA0 LEFPIN,PIN:MASK:2 2 210 +NAME M1 3 1 +M1 PIN,LEFPIN 3 2 +M1 VIA 3 3 +M1 NET:MASK:1 3 100 +M1 NET:MASK:2 3 200 +M1 SPNET:MASK:1 3 101 +M1 SPNET:MASK:2 3 201 +M1 VIA:MASK:1 3 102 +M1 VIA:MASK:2 3 202 +M1 PIN,LEFPIN:MASK:1 3 110 +M1 PIN,LEFPIN:MASK:2 3 210 +NAME VIA1 4 1 +VIA1 PIN,LEFPIN 4 2 +VIA1 VIA 4 3 +VIA1 NET:MASK:1 4 100 +VIA1 NET:MASK:2 4 200 +VIA1 SPNET:MASK:1 4 101 +VIA1 SPNET:MASK:2 4 201 +VIA1 VIA:MASK:1 4 102 +VIA1 VIA:MASK:2 4 202 +VIA1 PIN,LEFPIN:MASK:1 4 110 +VIA1 PIN,LEFPIN:MASK:2 4 210 +NAME M2 5 1 +M2 PIN,LEFPIN 5 2 +M2 VIA 5 3 +M2 NET:MASK:1 5 100 +M2 NET:MASK:2 5 200 +M2 SPNET:MASK:1 5 101 +M2 SPNET:MASK:2 5 201 +M2 VIA:MASK:1 5 102 +M2 VIA:MASK:2 5 202 +M2 PIN,LEFPIN:MASK:1 5 110 +M2 PIN,LEFPIN:MASK:2 5 210 diff --git a/testdata/lefdef/masks-2/in_tech.lef b/testdata/lefdef/masks-2/in_tech.lef new file mode 100644 index 000000000..4414b627f --- /dev/null +++ b/testdata/lefdef/masks-2/in_tech.lef @@ -0,0 +1,41 @@ +LAYER M0PO + TYPE MASTERSLICE ; + WIDTH 0.02 ; + MASK 2 ; +END M0PO +LAYER VIA0 + TYPE CUT ; + MASK 2 ; +END VIA0 +LAYER M1 + TYPE MASTERSLICE ; + WIDTH 0.024 ; + MASK 2 ; +END M1 +LAYER VIA1 + TYPE CUT ; + MASK 2 ; +END VIA1 +LAYER M2 + TYPE MASTERSLICE ; + WIDTH 0.03 ; + MASK 2 ; +END M2 + +VIA square + LAYER M0PO ; + RECT MASK 2 -0.06 -0.06 0.06 0.06 ; + LAYER VIA0 ; + RECT -0.06 -0.06 0.06 0.06 ; + LAYER M1 ; + RECT MASK 1 -0.06 -0.06 0.06 0.06 ; +END square + +VIA square_nomask + LAYER M0PO ; + RECT -0.06 -0.06 0.06 0.06 ; + LAYER VIA0 ; + RECT -0.06 -0.06 0.06 0.06 ; + LAYER M1 ; + RECT -0.06 -0.06 0.06 0.06 ; +END square_nomask From 98973e345d4e0480a625bf12ece9bbb39ba4b3e2 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sun, 23 Aug 2020 19:41:51 +0200 Subject: [PATCH 080/121] Bugfix for command line parser - did not print name of unknown option --- src/tl/tl/tlCommandLineParser.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/tl/tl/tlCommandLineParser.cc b/src/tl/tl/tlCommandLineParser.cc index bfd215acb..471688905 100644 --- a/src/tl/tl/tlCommandLineParser.cc +++ b/src/tl/tl/tlCommandLineParser.cc @@ -502,7 +502,7 @@ CommandLineOptions::parse (int argc, char *argv[]) ex.read_word (n, "_-"); std::map::const_iterator a = arg_by_long_option.find (n); if (a == arg_by_long_option.end ()) { - throw tl::Exception (tl::sprintf (tl::to_string (tr ("Unknown command line option --%1 (use -h for help)")), n)); + throw tl::Exception (tl::sprintf (tl::to_string (tr ("Unknown command line option --%s (use -h for help)")), n)); } arg = a->second; @@ -512,14 +512,14 @@ CommandLineOptions::parse (int argc, char *argv[]) ex.read_word (n); std::map::const_iterator a = arg_by_short_option.find (n); if (a == arg_by_short_option.end ()) { - throw tl::Exception (tl::sprintf (tl::to_string (tr ("Unknown command line option -%1 (use -h for help)")), n)); + throw tl::Exception (tl::sprintf (tl::to_string (tr ("Unknown command line option -%s (use -h for help)")), n)); } arg = a->second; } else { if (next_plain_arg == plain_args.end ()) { - throw tl::Exception (tl::sprintf (tl::to_string (tr ("Unknown command line component %1 - no further plain argument expected (use -h for help)")), arg_as_utf8)); + throw tl::Exception (tl::sprintf (tl::to_string (tr ("Unknown command line component %s - no further plain argument expected (use -h for help)")), arg_as_utf8)); } arg = *next_plain_arg; From be15e2dbf641561509de5309c9716a1d55fabfd8 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sun, 23 Aug 2020 19:42:23 +0200 Subject: [PATCH 081/121] Updated priority of map file purposes according to Stefan's suggestions. --- .../lefdef/db_plugin/dbLEFDEFImporter.h | 4 ++-- .../lefdef/unit_tests/dbLEFDEFImportTests.cc | 18 +++++++++--------- testdata/lefdef/mapfile/au.oas.gz | Bin 1059 -> 1043 bytes 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h index bbe4e5502..cdffcdace 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h @@ -855,10 +855,10 @@ private: enum LayerPurpose { Routing = 0, // from DEF only - SpecialRouting, // from DEF only - ViaGeometry, // from LEF+DEF Pins, // from DEF + SpecialRouting, // from DEF only LEFPins, // from LEF + ViaGeometry, // from LEF+DEF Label, // from LEF+DEF Obstructions, // from LEF only Outline, // from LEF+DEF diff --git a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc index a5af38f95..3c4fb1003 100644 --- a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc +++ b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc @@ -501,33 +501,33 @@ TEST(113_masks_1) "OUTLINE : OUTLINE (4/0)\n" "'M0PO.NET:1' : 'M0PO.NET:1' (1/100)\n" "'M0PO.NET:2' : 'M0PO.NET:2' (1/200)\n" + "M0PO.PIN : M0PO.PIN (1/2)\n" + "'M0PO.PIN:1' : 'M0PO.PIN:1' (1/110)\n" + "'M0PO.PIN:2' : 'M0PO.PIN:2' (1/210)\n" "'M0PO.SPNET:1' : 'M0PO.SPNET:1' (1/101)\n" "'M0PO.SPNET:2' : 'M0PO.SPNET:2' (1/201)\n" "'M0PO.VIA:1' : 'M0PO.VIA:1' (1/102)\n" "'M0PO.VIA:2' : 'M0PO.VIA:2' (1/202)\n" - "M0PO.PIN : M0PO.PIN (1/2)\n" - "'M0PO.PIN:1' : 'M0PO.PIN:1' (1/110)\n" - "'M0PO.PIN:2' : 'M0PO.PIN:2' (1/210)\n" "M0PO.LABEL : M0PO.LABEL (1/1)\n" "'M1.NET:1' : 'M1.NET:1' (3/100)\n" "'M1.NET:2' : 'M1.NET:2' (3/200)\n" + "M1.PIN : M1.PIN (3/2)\n" + "'M1.PIN:1' : 'M1.PIN:1' (3/110)\n" + "'M1.PIN:2' : 'M1.PIN:2' (3/210)\n" "'M1.SPNET:1' : 'M1.SPNET:1' (3/101)\n" "'M1.SPNET:2' : 'M1.SPNET:2' (3/201)\n" "'M1.VIA:1' : 'M1.VIA:1' (3/102)\n" "'M1.VIA:2' : 'M1.VIA:2' (3/202)\n" - "M1.PIN : M1.PIN (3/2)\n" - "'M1.PIN:1' : 'M1.PIN:1' (3/110)\n" - "'M1.PIN:2' : 'M1.PIN:2' (3/210)\n" "M1.LABEL : M1.LABEL (3/1)\n" "'VIA0.NET:1' : 'VIA0.NET:1' (2/100)\n" "'VIA0.NET:2' : 'VIA0.NET:2' (2/200)\n" + "VIA0.PIN : VIA0.PIN (2/2)\n" + "'VIA0.PIN:1' : 'VIA0.PIN:1' (2/110)\n" + "'VIA0.PIN:2' : 'VIA0.PIN:2' (2/210)\n" "'VIA0.SPNET:1' : 'VIA0.SPNET:1' (2/101)\n" "'VIA0.SPNET:2' : 'VIA0.SPNET:2' (2/201)\n" "'VIA0.VIA:1' : 'VIA0.VIA:1' (2/102)\n" "'VIA0.VIA:2' : 'VIA0.VIA:2' (2/202)\n" - "VIA0.PIN : VIA0.PIN (2/2)\n" - "'VIA0.PIN:1' : 'VIA0.PIN:1' (2/110)\n" - "'VIA0.PIN:2' : 'VIA0.PIN:2' (2/210)\n" "VIA0.LABEL : VIA0.LABEL (2/1)\n" ) } diff --git a/testdata/lefdef/mapfile/au.oas.gz b/testdata/lefdef/mapfile/au.oas.gz index b91e51866a40fd9ee6695667c7baf464007eada0..942c568de6f272436bf824a5f90b385709a0b28e 100644 GIT binary patch delta 320 zcmZ3?F_~k+OlkJq#DcWUoK$AE+{EOfd_!igFi*$$;=GCbL?`}N6le1_)B`GD=3!>yL1IsqXOx|s!zee|hEZa27h_yKpRW;$ zVSGTtu!wOB03Bg~qLLeAEjCfGT0<1Iyim0mqGG&EBDc91czAh5nt517nzvN+tffV*m>8LQ7*iM+#6Gb|vN1A(BxMvi82K4D%P_Mu F0sscqMfLyy delta 324 zcmbQtv6y4R%!!MHIhfgV6ARKZb0%(4Q5W(x2=LeQa}CiC4gisQdV0)U%nUqe;uC)> zN^|%c>VXw8^DwjUpztQ=GD=RCVU(C0z$iDljWMoXz}E=PP(GlcSVg&o!aN-f&{T7S zoPb>%tlkh!Jug%}R9p$}7oY?$qsVP81|D8sk!BuNk!EfNUIxJ*jFT&wjJTNuKQO*v sf59&JfnoACCTnT2Uo4Vrj9?)K8AT38enwFvCPt Date: Sun, 23 Aug 2020 21:13:02 +0200 Subject: [PATCH 082/121] Buddies: added option to concatenate files with '+' --- src/buddies/src/bd/bdConverterMain.cc | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/buddies/src/bd/bdConverterMain.cc b/src/buddies/src/bd/bdConverterMain.cc index 5628a14d6..4b8da9a34 100644 --- a/src/buddies/src/bd/bdConverterMain.cc +++ b/src/buddies/src/bd/bdConverterMain.cc @@ -41,7 +41,9 @@ int converter_main (int argc, char *argv[], const std::string &format) generic_writer_options.add_options (cmd, format); generic_reader_options.add_options (cmd); - cmd << tl::arg ("input", &infile, "The input file (any format, may be gzip compressed)") + cmd << tl::arg ("input", &infile, "The input file (any format, may be gzip compressed)", + "You can use '+' to supply multiple files which will be read after each other into the same layout. " + "This provides some cheap, but risky way of merging files. Beware of cell name conflicts.") << tl::arg ("output", &outfile, tl::sprintf ("The output file (%s format)", format)) ; @@ -55,9 +57,13 @@ int converter_main (int argc, char *argv[], const std::string &format) db::LoadLayoutOptions load_options; generic_reader_options.configure (load_options); - tl::InputStream stream (infile); - db::Reader reader (stream); - reader.read (layout, load_options); + std::vector files = tl::split (infile, "+"); + + for (std::vector::const_iterator f = files.begin (); f != files.end (); ++f) { + tl::InputStream stream (*f); + db::Reader reader (stream); + reader.read (layout, load_options); + } } { From 1eea4e32b1de3192edb86ab120ebe5c2dde728df Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sat, 29 Aug 2020 08:56:43 +0200 Subject: [PATCH 083/121] Provide scroll bars for rule-based part of LEF/DEF options. --- .../LEFDEFTechnologyComponentEditor.ui | 1109 +++++++++-------- 1 file changed, 563 insertions(+), 546 deletions(-) diff --git a/src/plugins/streamers/lefdef/lay_plugin/LEFDEFTechnologyComponentEditor.ui b/src/plugins/streamers/lefdef/lay_plugin/LEFDEFTechnologyComponentEditor.ui index 199dbbfaf..18825ffa5 100644 --- a/src/plugins/streamers/lefdef/lay_plugin/LEFDEFTechnologyComponentEditor.ui +++ b/src/plugins/streamers/lefdef/lay_plugin/LEFDEFTechnologyComponentEditor.ui @@ -6,7 +6,7 @@ 0 0 - 628 + 638 868 @@ -214,10 +214,23 @@ 4 - - - - LEF import + + + + + 0 + 0 + + + + + + + + + 0 + 0 + @@ -234,10 +247,10 @@ - - + + - Via cell name prefix + Groups @@ -255,46 +268,6 @@ - - - - Groups - - - - - - - - 0 - 0 - - - - - - - - - 0 - 0 - - - - - - - - - 1 - 0 - - - - µm - - - @@ -318,6 +291,33 @@ + + + + LEF import + + + + + + + Via cell name prefix + + + + + + + + 1 + 0 + + + + µm + + + @@ -500,7 +500,7 @@ - Blockages + Blockages (2*) @@ -614,7 +614,7 @@ - Regions + Regions (2*) @@ -634,7 +634,7 @@ - Cell outlines + Die area (2*) @@ -676,7 +676,7 @@ - 1 + 0 @@ -707,7 +707,8 @@ If a layer map file is given, pattern based rules are ignored. -If used inside a technology, the file will be looked up relative to the technology's base path. +If used inside a technology, the file will be looked up relative to the technology's base path. +(2*) Die area, Blockage and Region layers in map file will have priority over global production rules above. true @@ -734,488 +735,522 @@ If used inside a technology, the file will be looked up relative to the technolo Pattern Based Layer Production Rules + + 0 + + + 0 + + + 0 + + + 0 + - - - - 0 - 0 - + + + QFrame::NoFrame - - - 0 + + true + + + + + 0 + 0 + 616 + 375 + - - 0 - - - 0 - - - 0 - - - - - - 0 - 0 - - - - - - - - - 0 - 0 - - - - - - - :/right.png - - - - - - - - 0 - 0 - - - - - - - - - 0 - 0 - - - - - - - - Special routing (*) - - - - - - - - 0 - 0 - - - - - - - - - 0 - 0 - - - - - - - - - 0 - 0 - - - - - - - - - 0 - 0 - - - - - - - :/right.png - - - - - - - - 0 - 0 - - - - - - - - - 0 - 0 - - - - - - - - - 0 - 0 - - - - - - - - - 0 - 0 - - - - - - - :/right.png - - - - - - - - 0 - 0 - - - - - - - :/right.png - - - - - - - Routing (*) - - - - - - - - 0 - 0 - - - - - - - - - 0 - 0 - - - - - - - :/right.png - - - - - - - - 0 - 0 - - - - - - - :/right.png - - - - - - - Via geometry (*) - - - - - - - Pin labels - - - - - - - LEF Pins (*) - - - - - - - Layer name + + + + + + 0 + 0 + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 0 + + + + + + + + + 0 + 0 + + + + + + + :/right.png + + + + + + + + 0 + 0 + + + + + + + + + 0 + 0 + + + + + + + + Special routing (*) + + + + + + + + 0 + 0 + + + + + + + + + 0 + 0 + + + + + + + + + 0 + 0 + + + + + + + + + 0 + 0 + + + + + + + :/right.png + + + + + + + + 0 + 0 + + + + + + + + + 0 + 0 + + + + + + + + + 0 + 0 + + + + + + + + + 0 + 0 + + + + + + + :/right.png + + + + + + + + 0 + 0 + + + + + + + :/right.png + + + + + + + Routing (*) + + + + + + + + 0 + 0 + + + + + + + + + 0 + 0 + + + + + + + :/right.png + + + + + + + + 0 + 0 + + + + + + + :/right.png + + + + + + + Via geometry (*) + + + + + + + Pin labels + + + + + + + LEF Pins (*) + + + + + + + Layer name suffix ... - - - - - - - Pins (*) - - - - - - - - 0 - 0 - - - - - - - - - 0 - 0 - - - - - - - - GDS data- + + + + + + + Pins (*) + + + + + + + + 0 + 0 + + + + + + + + + 0 + 0 + + + + + + + + GDS data- type ... - - - - - - - - 0 - 0 - - - - - - - :/right.png - - - - - - - - 0 - 0 - - - - - - - - - 0 - 0 - - - - - - - - - 0 - 0 - - - - - - - - Blockages - - - - - - - Obstructions - - - - - - - - 0 - 0 - - - - - - - :/right.png - - - - - - - - 0 - 0 - - - - - - - - Layer name + + + + + + + + 0 + 0 + + + + + + + :/right.png + + + + + + + + 0 + 0 + + + + + + + + + 0 + 0 + + + + + + + + + 0 + 0 + + + + + + + + Blockages + + + + + + + Obstructions + + + + + + + + 0 + 0 + + + + + + + :/right.png + + + + + + + + 0 + 0 + + + + + + + + Layer name suffix ... - - - - - - - GDS data- + + + + + + + GDS data- type ... - - - - - - - Qt::Vertical - - - - - - - - - - (*) Separate suffixes or datatypes can be given for different masks, using the following notation: + + + + + + + Qt::Vertical + + + + + + + + + + (*) Separate suffixes or datatypes can be given for different masks, using the following notation: "x,1:y,2:z ..." (which will use x by default, y for MASK 1, z for MASK 2 etc.) - - - true - - - - - - - - 0 - 1 - - - - Layer Mapping (filter/modify layers, assign GDS layer/datatypes) - - - true - - - - 9 - - - 4 - - - 9 - - - 4 - - - - - Read all layers (additionally to the ones in the mapping table) - - - - - - - - 0 - 1 - - - - - 16 - 0 - - - - QFrame::NoFrame - - - QFrame::Raised - - - - - - - Qt::Horizontal - - - - + + + true + + + + + + + + 0 + 1 + + + + Layer Mapping (filter/modify layers, assign GDS layer/datatypes) + + + true + + + + 9 + + + 4 + + + 9 + + + 4 + + + + + Read all layers (additionally to the ones in the mapping table) + + + + + + + + 0 + 1 + + + + + 16 + 0 + + + + QFrame::NoFrame + + + QFrame::Raised + + + + + + + Qt::Horizontal + + + + + + + + @@ -1282,29 +1317,11 @@ type ... produce_blockages suffix_blockages datatype_blockages - read_all_cbx mapfile_path browse_mapfile - - - layer_map - enable_all_layers(bool) - read_all_cbx - setChecked(bool) - - - 229 - 838 - - - 198 - 701 - - - - + From 213eb9f1e89dd51820c3b46f7ab6a10e8cf5b55d Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sat, 29 Aug 2020 08:57:10 +0200 Subject: [PATCH 084/121] Ignore COMP .. statements in LEF/DEF map file, "outline" renamed to "die area" --- .../streamers/lefdef/db_plugin/dbLEFDEFImporter.cc | 4 ++++ src/plugins/streamers/lefdef/db_plugin/gsiDeclDbLEFDEF.cc | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc index 9187412d6..cc7a613f6 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc @@ -887,6 +887,10 @@ LEFDEFReaderState::read_map_file (const std::string &path, db::Layout &layout) layer_map [std::make_pair (*l, std::make_pair (Label, (unsigned int) 0))] = db::LayerProperties (layer, datatype, final_name); } + } else if (w1 == "COMP") { + + // ignore "COMP (ALL) ..." + } else { // converts a line like diff --git a/src/plugins/streamers/lefdef/db_plugin/gsiDeclDbLEFDEF.cc b/src/plugins/streamers/lefdef/db_plugin/gsiDeclDbLEFDEF.cc index 05c81afc2..4aacdb490 100644 --- a/src/plugins/streamers/lefdef/db_plugin/gsiDeclDbLEFDEF.cc +++ b/src/plugins/streamers/lefdef/db_plugin/gsiDeclDbLEFDEF.cc @@ -185,21 +185,21 @@ gsi::Class decl_lefdef_config ("db", "LEFDEFReaderConfi "This method has been introduced in version 0.26.4." ) + gsi::method ("produce_cell_outlines", &db::LEFDEFReaderOptions::produce_cell_outlines, - "@brief Gets a value indicating whether to produce cell outlines.\n" + "@brief Gets a value indicating whether to produce cell outlines (diearea).\n" "If set to true, cell outlines will be produced on the layer given by \\cell_outline_layer. " ) + gsi::method ("produce_cell_outlines=", &db::LEFDEFReaderOptions::set_produce_cell_outlines, gsi::arg ("produce"), - "@brief Sets a value indicating whether to produce cell outlines.\n" + "@brief Sets a value indicating whether to produce cell outlines (diearea).\n" "See \\produce_cell_outlines for details.\n" ) + gsi::method ("cell_outline_layer", &db::LEFDEFReaderOptions::cell_outline_layer, - "@brief Gets the layer on which to produce the cell outline.\n" + "@brief Gets the layer on which to produce the cell outline (diearea).\n" "This attribute is a string correspondig to the string representation of \\LayerInfo. " "This string can be either a layer number, a layer/datatype pair, a name or a combination of both. See \\LayerInfo for details.\n" "The setter for this attribute is \\cell_outline_layer=. See also \\produce_cell_outlines." ) + gsi::method ("cell_outline_layer=", &db::LEFDEFReaderOptions::set_cell_outline_layer, gsi::arg ("spec"), - "@brief Sets the layer on which to produce the cell outline.\n" + "@brief Sets the layer on which to produce the cell outline (diearea).\n" "See \\cell_outline_layer for details.\n" ) + gsi::method ("produce_placement_blockages", &db::LEFDEFReaderOptions::produce_placement_blockages, From a425d522ccb2574da98ef8d0fda5834e58703264 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sat, 29 Aug 2020 10:07:17 +0200 Subject: [PATCH 085/121] Added multi-cell mapping for transferring multiple cells from one layout to another while including their hierarchy without duplicating cells. --- src/db/db/dbCellMapping.cc | 30 +++++++++--- src/db/db/dbCellMapping.h | 65 ++++++++++++++++++++++--- src/db/db/dbDeepShapeStore.cc | 2 +- src/db/db/gsiDeclDbCellMapping.cc | 54 +++++++++++++++++++- src/db/unit_tests/dbCellMappingTests.cc | 37 ++++++++++++++ testdata/ruby/dbCellMapping.rb | 35 +++++++++++++ 6 files changed, 205 insertions(+), 18 deletions(-) diff --git a/src/db/db/dbCellMapping.cc b/src/db/db/dbCellMapping.cc index f441e893d..5c65eb914 100644 --- a/src/db/db/dbCellMapping.cc +++ b/src/db/db/dbCellMapping.cc @@ -276,7 +276,19 @@ CellMapping::create_single_mapping (const db::Layout & /*layout_a*/, db::cell_in map (cell_index_b, cell_index_a); } -void +void +CellMapping::create_multi_mapping (const db::Layout & /*layout_a*/, const std::vector &cell_index_a, const db::Layout & /*layout_b*/, const std::vector &cell_index_b) +{ + clear (); + if (cell_index_a.size () != cell_index_b.size ()) { + throw tl::Exception (tl::to_string (tr ("cell index arrays for A and B cells must have same length in 'create_multi_mapping'"))); + } + for (std::vector::const_iterator ia = cell_index_a.begin (), ib = cell_index_b.begin (); ia != cell_index_a.end (); ++ia, ++ib) { + map (*ib, *ia); + } +} + +void CellMapping::create_from_names (const db::Layout &layout_a, db::cell_index_type cell_index_a, const db::Layout &layout_b, db::cell_index_type cell_index_b) { clear (); @@ -295,31 +307,33 @@ CellMapping::create_from_names (const db::Layout &layout_a, db::cell_index_type } std::vector -CellMapping::create_missing_mapping (db::Layout &layout_a, db::cell_index_type cell_index_a, const db::Layout &layout_b, db::cell_index_type cell_index_b, const std::set *exclude_cells, const std::set *include_cells) +CellMapping::create_missing_mapping (db::Layout &layout_a, const db::Layout &layout_b, const std::vector &cell_index_b, const std::set *exclude_cells, const std::set *include_cells) { std::vector new_cells; - do_create_missing_mapping (layout_a, cell_index_a, layout_b, cell_index_b, exclude_cells, include_cells, &new_cells, 0); + do_create_missing_mapping (layout_a, layout_b, cell_index_b, exclude_cells, include_cells, &new_cells, 0); return new_cells; } std::vector > -CellMapping::create_missing_mapping2 (db::Layout &layout_a, db::cell_index_type cell_index_a, const db::Layout &layout_b, db::cell_index_type cell_index_b, const std::set *exclude_cells, const std::set *include_cells) +CellMapping::create_missing_mapping2 (db::Layout &layout_a, const db::Layout &layout_b, const std::vector &cell_index_b, const std::set *exclude_cells, const std::set *include_cells) { std::vector > cell_pairs; - do_create_missing_mapping (layout_a, cell_index_a, layout_b, cell_index_b, exclude_cells, include_cells, 0, &cell_pairs); + do_create_missing_mapping (layout_a, layout_b, cell_index_b, exclude_cells, include_cells, 0, &cell_pairs); return cell_pairs; } void -CellMapping::do_create_missing_mapping (db::Layout &layout_a, db::cell_index_type /*cell_index_a*/, const db::Layout &layout_b, db::cell_index_type cell_index_b, const std::set *exclude_cells, const std::set *include_cells, std::vector *new_cells_ptr, std::vector > *mapped_pairs) +CellMapping::do_create_missing_mapping (db::Layout &layout_a, const db::Layout &layout_b, const std::vector &cell_index_b, const std::set *exclude_cells, const std::set *include_cells, std::vector *new_cells_ptr, std::vector > *mapped_pairs) { std::vector new_cells_int; std::vector &new_cells = *(new_cells_ptr ? new_cells_ptr : &new_cells_int); std::vector new_cells_b; std::set called_b; - layout_b.cell (cell_index_b).collect_called_cells (called_b); - called_b.insert (cell_index_b); + for (std::vector::const_iterator i = cell_index_b.begin (); i != cell_index_b.end (); ++i) { + layout_b.cell (*i).collect_called_cells (called_b); + called_b.insert (*i); + } for (std::set::const_iterator b = called_b.begin (); b != called_b.end (); ++b) { if (m_b2a_mapping.find (*b) == m_b2a_mapping.end () diff --git a/src/db/db/dbCellMapping.h b/src/db/db/dbCellMapping.h index ae776286e..8857ad5c8 100644 --- a/src/db/db/dbCellMapping.h +++ b/src/db/db/dbCellMapping.h @@ -81,7 +81,30 @@ public: std::vector create_single_mapping_full (db::Layout &layout_a, db::cell_index_type cell_index_a, const db::Layout &layout_b, db::cell_index_type cell_index_b) { create_single_mapping (layout_a, cell_index_a, layout_b, cell_index_b); - return create_missing_mapping (layout_a, cell_index_a, layout_b, cell_index_b); + return create_missing_mapping (layout_a, layout_b, cell_index_b); + } + + /** + * @brief Create a multi-cell mapping + * + * The mapping created by this function will map the cells of cell_indexes_b to cell_indexes_a. Both arrays need to have + * the same length. + * This cell mapping will not map the child cells. When used for hierarchical copy this will basically + * flatten the cells on copy. + */ + void create_multi_mapping (const db::Layout &layout_a, const std::vector &cell_indexes_a, const db::Layout &layout_b, const std::vector &cell_indexes_b); + + /** + * @brief Create a single cell full mapping + * + * The mapping created by this function will map the cells of cell_indexes_a to cell_indexes_b. Both arrays need to have + * the same length. In addition, new cells for the child cells of all cell_indexes_b cells are created in layout_a and + * included in the mapping. + */ + std::vector create_multi_mapping_full (db::Layout &layout_a, const std::vector &cell_indexes_a, const db::Layout &layout_b, const std::vector &cell_indexes_b) + { + create_multi_mapping (layout_a, cell_indexes_a, layout_b, cell_indexes_b); + return create_missing_mapping (layout_a, layout_b, cell_indexes_b); } /** @@ -100,7 +123,7 @@ public: std::vector create_from_geometry_full (db::Layout &layout_a, db::cell_index_type cell_index_a, const db::Layout &layout_b, db::cell_index_type cell_index_b) { create_from_geometry (layout_a, cell_index_a, layout_b, cell_index_b); - return create_missing_mapping (layout_a, cell_index_a, layout_b, cell_index_b); + return create_missing_mapping (layout_a, layout_b, cell_index_b); } /** @@ -119,7 +142,7 @@ public: std::vector create_from_names_full (db::Layout &layout_a, db::cell_index_type cell_index_a, const db::Layout &layout_b, db::cell_index_type cell_index_b) { create_from_names (layout_a, cell_index_a, layout_b, cell_index_b); - return create_missing_mapping (layout_a, cell_index_a, layout_b, cell_index_b); + return create_missing_mapping (layout_a, layout_b, cell_index_b); } /** @@ -184,8 +207,9 @@ public: /** * @brief Creates mappings for all cells not mapped yet * - * When constructing a cell mapping by explicit mapping (map (a, b)), some cells may be - * left unmapped. This method allows creating mappings for these missing cells by adding + * When constructing a cell mapping by explicit mapping (map (a, b)), some child cells of the + * mapped other cells may be left unmapped. + * This method allows creating mappings for these missing cells by adding * new cells and the corresponding instances into the target layout_a. * * If given, "exclude_cells" can specify a list of cells not to map. @@ -195,7 +219,18 @@ public: * * The returned vector lists the new cells. */ - std::vector create_missing_mapping (db::Layout &layout_a, db::cell_index_type cell_index_a, const db::Layout &layout_b, db::cell_index_type cell_index_b, const std::set *exclude_cells = 0, const std::set *include_cells = 0); + std::vector create_missing_mapping (db::Layout &layout_a, const db::Layout &layout_b, const std::vector &cell_index_b, const std::set *exclude_cells = 0, const std::set *include_cells = 0); + + /** + * @brief A convenience version of create_missing_mappings which takes a single cell for cell_index_a and cell_index_b. + */ + std::vector create_missing_mapping (db::Layout &layout_a, const db::Layout &layout_b, db::cell_index_type cell_index_b, const std::set *exclude_cells = 0, const std::set *include_cells = 0) + { + std::vector cib; + cib.reserve (1); + cib.push_back (cell_index_b); + return create_missing_mapping (layout_a, layout_b, cib, exclude_cells, include_cells); + } /** * @brief Like create_missing_mapping, but returns the newly mapped pairs @@ -203,7 +238,21 @@ public: * The first cell index of the pair is the old cell in layout_a, the second cell index * is the new cell in layout_b. */ - std::vector > create_missing_mapping2 (db::Layout &layout_a, db::cell_index_type cell_index_a, const db::Layout &layout_b, db::cell_index_type cell_index_b, const std::set *exclude_cells = 0, const std::set *include_cells = 0); + std::vector > create_missing_mapping2 (db::Layout &layout_a, const db::Layout &layout_b, const std::vector &cell_index_b, const std::set *exclude_cells = 0, const std::set *include_cells = 0); + + /** + * @brief Like create_missing_mapping, but returns the newly mapped pairs (single-cell version) + * + * The first cell index of the pair is the old cell in layout_a, the second cell index + * is the new cell in layout_b. + */ + std::vector > create_missing_mapping2 (db::Layout &layout_a, const db::Layout &layout_b, db::cell_index_type cell_index_b, const std::set *exclude_cells = 0, const std::set *include_cells = 0) + { + std::vector cib; + cib.reserve (1); + cib.push_back (cell_index_b); + return create_missing_mapping2 (layout_a, layout_b, cib, exclude_cells, include_cells); + } private: void extract_unique (std::map >::const_iterator cand, @@ -213,7 +262,7 @@ private: void dump_mapping (const std::map > &candidates, const db::Layout &layout_a, const db::Layout &layout_b); - void do_create_missing_mapping (db::Layout &layout_a, db::cell_index_type cell_index_a, const db::Layout &layout_b, db::cell_index_type cell_index_b, const std::set *exclude_cells, const std::set *include_cells, std::vector *new_cells, std::vector > *mapped_pairs); + void do_create_missing_mapping (db::Layout &layout_a, const db::Layout &layout_b, const std::vector &cell_index_b, const std::set *exclude_cells, const std::set *include_cells, std::vector *new_cells, std::vector > *mapped_pairs); std::map m_b2a_mapping; }; diff --git a/src/db/db/dbDeepShapeStore.cc b/src/db/db/dbDeepShapeStore.cc index a2e11a840..f95667da2 100644 --- a/src/db/db/dbDeepShapeStore.cc +++ b/src/db/db/dbDeepShapeStore.cc @@ -977,7 +977,7 @@ DeepShapeStore::cell_mapping_to_original (unsigned int layout_index, db::Layout // Add new cells for the variants and (possible) devices which are cells added during the device // extraction process - std::vector > new_pairs = cm->second.create_missing_mapping2 (*into_layout, into_cell, *source_layout, source_top, excluded_cells, included_cells); + std::vector > new_pairs = cm->second.create_missing_mapping2 (*into_layout, *source_layout, source_top, excluded_cells, included_cells); // the variant's originals we are going to delete std::set cells_to_delete; diff --git a/src/db/db/gsiDeclDbCellMapping.cc b/src/db/db/gsiDeclDbCellMapping.cc index 3c92720da..14690fac9 100644 --- a/src/db/db/gsiDeclDbCellMapping.cc +++ b/src/db/db/gsiDeclDbCellMapping.cc @@ -76,10 +76,42 @@ Class decl_CellMapping ("db", "CellMapping", "The cell mapping is created for cell_b to cell_a in the respective layouts. " "This method clears the mapping and creates one for the single cell pair. " "In addition and in contrast to \\for_single_cell, this method completes the mapping by adding all the child cells " - "of cell_b to layout_a and creating the proper instances. " + "of cell_b to layout_a and creating the proper instances.\n" "\n" "This method has been introduced in version 0.23." ) + + gsi::method ("for_multi_cells", &db::CellMapping::create_multi_mapping, gsi::arg ("layout_a"), gsi::arg ("cell_indexes_a"), gsi::arg ("layout_b"), gsi::arg ("cell_indexes_b"), + "@brief Initializes the cell mapping for top-level identity\n" + "\n" + "@param layout_a The target layout.\n" + "@param cell_indexes_a A list of cell indexes for the target cells.\n" + "@param layout_b The source layout.\n" + "@param cell_indexes_b A list of cell indexes for the source cells (same number of indexes than \\cell_indexes_a).\n" + "\n" + "The cell mapping is created for cells from cell_indexes_b to cell from cell_indexes_a in the respective layouts. " + "This method clears the mapping and creates one for each cell pair from cell_indexes_b vs. cell_indexes_a. " + "If used for \\Layout#copy_tree or \\Layout#move_tree, this cell mapping will essentially " + "flatten the source cells in the target layout.\n" + "\n" + "This method is equivalent to \\clear, followed by \\map(cell_index_a, cell_index_b) for each cell pair.\n" + "\n" + "This method has been introduced in version 0.27." + ) + + gsi::method ("for_multi_cells_full", &db::CellMapping::create_multi_mapping_full, gsi::arg ("layout_a"), gsi::arg ("cell_indexes_a"), gsi::arg ("layout_b"), gsi::arg ("cell_indexes_b"), + "@brief Initializes the cell mapping for top-level identity\n" + "\n" + "@param layout_a The target layout.\n" + "@param cell_indexes_a A list of cell indexes for the target cells.\n" + "@param layout_b The source layout.\n" + "@param cell_indexes_b A list of cell indexes for the source cells (same number of indexes than \\cell_indexes_a).\n" + "\n" + "The cell mapping is created for cells from cell_indexes_b to cell from cell_indexes_a in the respective layouts. " + "This method clears the mapping and creates one for each cell pair from cell_indexes_b vs. cell_indexes_a. " + "In addition and in contrast to \\for_multi_cells, this method completes the mapping by adding all the child cells " + "of all cells in cell_indexes_b to layout_a and creating the proper instances.\n" + "\n" + "This method has been introduced in version 0.27." + ) + gsi::method ("from_geometry_full", &db::CellMapping::create_from_geometry_full, gsi::arg ("layout_a"), gsi::arg ("cell_index_a"), gsi::arg ("layout_b"), gsi::arg ("cell_index_b"), "@brief Initializes the cell mapping using the geometrical identity in full mapping mode\n" "\n" @@ -234,6 +266,26 @@ Class decl_CellMapping ("db", "CellMapping", "\n" "CellMapping objects play a role mainly in the hierarchical copy or move operations of \\Layout. " "However, use is not restricted to these applications.\n" + "\n" + "Here is one example for using \\CellMapping. It extracts cells 'A', 'B' and 'C' from one layout " + "and copies them to another. It will also copy all shapes and all child cells. Child cells which are " + "shared between the three initial cells will be shared in the target layout too.\n" + "\n" + "@code\n" + "cell_names = [ \"A\", \"B\", \"C\" ]\n" + "\n" + "source = RBA::Layout::new\n" + "source.read(\"input.gds\")\n" + "\n" + "target = RBA::Layout::new\n" + "\n" + "source_cells = cell_names.collect { |n| source.cell_by_name(n).cell_index }\n" + "target_cells = cell_names.collect { |n| target.create_cell(n).cell_index }\n" + "\n" + "cm = RBA::CellMapping::new\n" + "cm.for_multi_cells_full(source, source_cells, target, target_cells)\n" + "target.copy_tree_shapes(source, cm)\n" + "@/code\n" ); } diff --git a/src/db/unit_tests/dbCellMappingTests.cc b/src/db/unit_tests/dbCellMappingTests.cc index 8392d5e25..5559abbe0 100644 --- a/src/db/unit_tests/dbCellMappingTests.cc +++ b/src/db/unit_tests/dbCellMappingTests.cc @@ -453,3 +453,40 @@ TEST(6) EXPECT_EQ (l2s (h), "a0top#0:cell_index=1 r90 0,0 array=(0,10,10,0 5x2),cell_index=2 r90 0,0 array=(0,10,10,0 5x2);a4#1:;a5#2:"); } +// Multi-mapping +TEST(7) +{ + std::auto_ptr g (new db::Layout ()); + db::Cell &a0 (g->cell (g->add_cell ("a0"))); + db::Cell &a1 (g->cell (g->add_cell ("a1"))); + db::Cell &a2 (g->cell (g->add_cell ("a2"))); + db::Cell &a3 (g->cell (g->add_cell ("a3"))); + db::Cell &a4 = g->cell (g->add_cell ("a4")); + db::Cell &a5 = g->cell (g->add_cell ("a5")); + + a3.insert (db::CellInstArray (db::CellInst (a4.cell_index ()), db::Trans ())); + a3.insert (db::CellInstArray (db::CellInst (a5.cell_index ()), db::Trans ())); + + a1.insert (db::CellInstArray (db::CellInst (a4.cell_index ()), db::Trans ())); + a1.insert (db::CellInstArray (db::CellInst (a3.cell_index ()), db::Trans ())); + a2.insert (db::CellInstArray (db::CellInst (a4.cell_index ()), db::Trans ())); + + db::Layout h; + db::Cell &b0 (h.cell (h.add_cell ("b0"))); + db::Cell &b1 (h.cell (h.add_cell ("b1"))); + db::Cell &b2 (h.cell (h.add_cell ("b2"))); + + db::CellMapping cm; + std::vector cib, cia; + cia.push_back (a0.cell_index ()); + cia.push_back (a1.cell_index ()); + cia.push_back (a2.cell_index ()); + cib.push_back (b0.cell_index ()); + cib.push_back (b1.cell_index ()); + cib.push_back (b2.cell_index ()); + cm.create_multi_mapping_full (h, cib, *g, cia); + EXPECT_EQ (m2s (cm, *g, h), "a0->b0;a1->b1;a2->b2;a3->a3;a4->a4;a5->a5"); + + EXPECT_EQ (l2s (h), "b0#0:;b1#1:cell_index=3 r0 0,0,cell_index=4 r0 0,0;b2#2:cell_index=4 r0 0,0;a3#3:cell_index=4 r0 0,0,cell_index=5 r0 0,0;a4#4:;a5#5:"); +} + diff --git a/testdata/ruby/dbCellMapping.rb b/testdata/ruby/dbCellMapping.rb index b15a25ba3..e7ef1496b 100644 --- a/testdata/ruby/dbCellMapping.rb +++ b/testdata/ruby/dbCellMapping.rb @@ -205,6 +205,41 @@ class DBCellMapping_TestClass < TestBase end + def test_2 + + ly = RBA::Layout::new + + a0 = ly.create_cell("a0") + a1 = ly.create_cell("a1") + a2 = ly.create_cell("a2") + a3 = ly.create_cell("a3") + a4 = ly.create_cell("a4") + a5 = ly.create_cell("a5") + + a3.insert(RBA::CellInstArray::new(a4.cell_index, RBA::Trans::new)) + a3.insert(RBA::CellInstArray::new(a5.cell_index, RBA::Trans::new)) + + a1.insert(RBA::CellInstArray::new(a4.cell_index, RBA::Trans::new)) + a1.insert(RBA::CellInstArray::new(a3.cell_index, RBA::Trans::new)) + a2.insert(RBA::CellInstArray::new(a4.cell_index, RBA::Trans::new)) + + ly_target = RBA::Layout::new + b0 = ly_target.create_cell("b0") + b1 = ly_target.create_cell("b1") + b2 = ly_target.create_cell("b2") + + cm = RBA::CellMapping::new + cm.for_multi_cells(ly_target, [ b0, b1, b2 ].collect { |c| c.cell_index }, ly, [ a0, a1, a2 ].collect { |c| c.cell_index }) + + assert_equal(mapping_to_s(ly_target, ly, cm), "b0=>a0;b1=>a1;b2=>a2") + + cm = RBA::CellMapping::new + cm.for_multi_cells_full(ly_target, [ b0, b1, b2 ].collect { |c| c.cell_index }, ly, [ a0, a1, a2 ].collect { |c| c.cell_index }) + + assert_equal(mapping_to_s(ly_target, ly, cm), "b0=>a0;b1=>a1;b2=>a2;a3=>a3;a4=>a4;a5=>a5") + + end + end load("test_epilogue.rb") From 2a3fe08e7b6e31b83d272db2ac354baefa6bfd94 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sat, 29 Aug 2020 22:49:38 +0200 Subject: [PATCH 086/121] Provide multi-cell copy/move of shapes (GSI binding) --- src/db/db/dbCellMapping.cc | 11 +++ src/db/db/dbCellMapping.h | 5 ++ src/db/db/gsiDeclDbLayout.cc | 95 ++++++++++++++++++++++ testdata/ruby/dbLayout.rb | 149 +++++++++++++++++++++++++++++++++++ 4 files changed, 260 insertions(+) diff --git a/src/db/db/dbCellMapping.cc b/src/db/db/dbCellMapping.cc index 5c65eb914..19c4fee39 100644 --- a/src/db/db/dbCellMapping.cc +++ b/src/db/db/dbCellMapping.cc @@ -269,6 +269,17 @@ void CellMapping::clear () m_b2a_mapping.clear (); } +std::vector CellMapping::source_cells () const +{ + std::vector s; + s.reserve (m_b2a_mapping.size ()); + for (iterator m = begin (); m != end (); ++m) { + s.push_back (m->first); + } + return s; +} + + void CellMapping::create_single_mapping (const db::Layout & /*layout_a*/, db::cell_index_type cell_index_a, const db::Layout & /*layout_b*/, db::cell_index_type cell_index_b) { diff --git a/src/db/db/dbCellMapping.h b/src/db/db/dbCellMapping.h index 8857ad5c8..761ff31b5 100644 --- a/src/db/db/dbCellMapping.h +++ b/src/db/db/dbCellMapping.h @@ -196,6 +196,11 @@ public: return m_b2a_mapping.end (); } + /** + * @brief Gets the source cells + */ + std::vector source_cells () const; + /** * @brief Access to the mapping table */ diff --git a/src/db/db/gsiDeclDbLayout.cc b/src/db/db/gsiDeclDbLayout.cc index d6d5c9975..e2e358a4c 100644 --- a/src/db/db/gsiDeclDbLayout.cc +++ b/src/db/db/gsiDeclDbLayout.cc @@ -37,6 +37,8 @@ #include "dbEdgePairs.h" #include "dbTexts.h" #include "dbLayoutUtils.h" +#include "dbLayerMapping.h" +#include "dbCellMapping.h" #include "tlStream.h" namespace gsi @@ -822,6 +824,56 @@ static void scale_and_snap2 (db::Layout *layout, db::cell_index_type ci, db::Coo scale_and_snap (*layout, layout->cell (ci), g, m, d); } +static void copy_tree_shapes2 (db::Layout *layout, const db::Layout &source_layout, const db::CellMapping &cm) +{ + if (layout == &source_layout) { + throw tl::Exception (tl::to_string (tr ("Cannot copy shapes within the same layout"))); + } + + db::ICplxTrans trans (source_layout.dbu () / layout->dbu ()); + + db::LayerMapping lm; + lm.create_full (*layout, source_layout); + + db::copy_shapes (*layout, source_layout, trans, cm.source_cells (), cm.table (), lm.table ()); +} + +static void copy_tree_shapes3 (db::Layout *layout, const db::Layout &source_layout, const db::CellMapping &cm, const db::LayerMapping &lm) +{ + if (layout == &source_layout) { + throw tl::Exception (tl::to_string (tr ("Cannot copy shapes within the same layout"))); + } + + db::ICplxTrans trans (source_layout.dbu () / layout->dbu ()); + + db::copy_shapes (*layout, source_layout, trans, cm.source_cells (), cm.table (), lm.table ()); +} + +static void move_tree_shapes2 (db::Layout *layout, db::Layout &source_layout, const db::CellMapping &cm) +{ + if (layout == &source_layout) { + throw tl::Exception (tl::to_string (tr ("Cannot copy shapes within the same layout"))); + } + + db::ICplxTrans trans (source_layout.dbu () / layout->dbu ()); + + db::LayerMapping lm; + lm.create_full (*layout, source_layout); + + db::move_shapes (*layout, source_layout, trans, cm.source_cells (), cm.table (), lm.table ()); +} + +static void move_tree_shapes3 (db::Layout *layout, db::Layout &source_layout, const db::CellMapping &cm, const db::LayerMapping &lm) +{ + if (layout == &source_layout) { + throw tl::Exception (tl::to_string (tr ("Cannot copy shapes within the same layout"))); + } + + db::ICplxTrans trans (source_layout.dbu () / layout->dbu ()); + + db::move_shapes (*layout, source_layout, trans, cm.source_cells (), cm.table (), lm.table ()); +} + Class decl_LayoutMetaInfo ("db", "LayoutMetaInfo", gsi::constructor ("new", &layout_meta_info_ctor, gsi::arg ("name"), gsi::arg ("value"), gsi::arg ("description", std::string ()), "@brief Creates a layout meta info object\n" @@ -1529,6 +1581,49 @@ Class decl_Layout ("db", "Layout", "an index in the range of 0 to layers-1 needs to be a valid layer. These layers can be either valid, " "special or unused. Use \\is_valid_layer? and \\is_special_layer? to test for the first two states.\n" ) + + gsi::method_ext ("copy_tree_shapes", ©_tree_shapes2, gsi::arg ("source_layout"), gsi::arg ("cell_mapping"), + "@brief Copies the shapes for all given mappings in the \\CellMapping object\n" + "@param source_layout The layout where to take the shapes from\n" + "@param cell_mapping The cell mapping object that determines how cells are identified between source and target layout\n" + "\n" + "Provide a \\CellMapping object to specify pairs of cells which are mapped from the source layout to this " + "layout. When constructing such a cell mapping object for example with \\CellMapping#for_multi_cell_full, use self " + "as the target layout. During the cell mapping construction, the cell mapper will usually create a suitable target " + "hierarchy already. After having completed the cell mapping, use \\copy_tree_shapes to copy over the shapes from " + "the source to the target layout.\n" + "\n" + "This method has been added in version 0.27.\n" + ) + + gsi::method_ext ("copy_tree_shapes", ©_tree_shapes3, gsi::arg ("source_layout"), gsi::arg ("cell_mapping"), gsi::arg ("layer_mapping"), + "@brief Copies the shapes for all given mappings in the \\CellMapping object using the given layer mapping\n" + "@param source_layout The layout where to take the shapes from\n" + "@param cell_mapping The cell mapping object that determines how cells are identified between source and target layout\n" + "@param layer_mapping Specifies which layers are copied from the source layout to the target layout\n" + "\n" + "Provide a \\CellMapping object to specify pairs of cells which are mapped from the source layout to this " + "layout. When constructing such a cell mapping object for example with \\CellMapping#for_multi_cell_full, use self " + "as the target layout. During the cell mapping construction, the cell mapper will usually create a suitable target " + "hierarchy already. After having completed the cell mapping, use \\copy_tree_shapes to copy over the shapes from " + "the source to the target layout.\n" + "\n" + "This method has been added in version 0.27.\n" + ) + + gsi::method_ext ("move_tree_shapes", &move_tree_shapes2, gsi::arg ("source_layout"), gsi::arg ("cell_mapping"), + "@brief Moves the shapes for all given mappings in the \\CellMapping object\n" + "\n" + "This method acts like the corresponding \\copy_tree_shapes method, but removes the shapes from the source layout " + "after they have been copied.\n" + "\n" + "This method has been added in version 0.27.\n" + ) + + gsi::method_ext ("move_tree_shapes", &move_tree_shapes3, gsi::arg ("source_layout"), gsi::arg ("cell_mapping"), gsi::arg ("layer_mapping"), + "@brief Moves the shapes for all given mappings in the \\CellMapping object using the given layer mapping\n" + "\n" + "This method acts like the corresponding \\copy_tree_shapes method, but removes the shapes from the source layout " + "after they have been copied.\n" + "\n" + "This method has been added in version 0.27.\n" + ) + gsi::method_ext ("scale_and_snap", &scale_and_snap1, gsi::arg ("cell"), gsi::arg ("grid"), gsi::arg ("mult"), gsi::arg ("div"), "@brief Scales and snaps the layout below a given cell by the given rational factor and snaps to the given grid\n" "\n" diff --git a/testdata/ruby/dbLayout.rb b/testdata/ruby/dbLayout.rb index cdefe938b..ecb2efff1 100644 --- a/testdata/ruby/dbLayout.rb +++ b/testdata/ruby/dbLayout.rb @@ -1994,6 +1994,155 @@ END end + def test_20 + + # copy shapes between cell trees starting from multiple cells + + l = RBA::Layout.new + l.insert_layer_at(0, RBA::LayerInfo.new(1, 0)) + l.insert_layer_at(1, RBA::LayerInfo.new(2, 0)) + c0 = l.cell(l.add_cell("c0")) + c9 = l.cell(l.add_cell("c9")) + c1 = l.cell(l.add_cell("c1")) + c2 = l.cell(l.add_cell("c2")) + c3 = l.cell(l.add_cell("c3")) + + b = RBA::Box.new(0, 100, 1000, 1200) + c0.shapes(0).insert(b) + c1.shapes(0).insert(b) + c2.shapes(0).insert(b) + c3.shapes(0).insert(b) + b = RBA::Box.new(1, 101, 1001, 1201) + s = c0.shapes(1).insert(b) + s.set_property("p", 17) + + tt = RBA::Trans.new + s = c0.insert(RBA::CellInstArray.new(c1.cell_index, tt)) + s.set_property("p", 18) + c0.insert(RBA::CellInstArray.new(c2.cell_index, RBA::Trans.new(RBA::Point.new(100, -100)))) + c0.insert(RBA::CellInstArray.new(c3.cell_index, RBA::Trans.new(1))) + c2.insert(RBA::CellInstArray.new(c3.cell_index, RBA::Trans.new(RBA::Point.new(1100, 0)))) + c9.insert(RBA::CellInstArray.new(c1.cell_index, tt)) + + assert_equal(collect(c0.begin_shapes_rec(0), l), "[c0](0,100;1000,1200)/[c2](100,0;1100,1100)/[c3](1200,0;2200,1100)/[c3](-1200,0;-100,1000)/[c1](0,100;1000,1200)") + assert_equal(collect(c0.begin_shapes_rec(1), l), "[c0](1,101;1001,1201)") + assert_equal(collect(c9.begin_shapes_rec(0), l), "[c1](0,100;1000,1200)") + assert_equal(collect(c9.begin_shapes_rec(1), l), "") + + lt = RBA::Layout::new + + new_cells = [ c0, c9 ].collect { |c| lt.add_cell(c.name) } + ( c0t, c9t ) = new_cells.collect { |ci| lt.cell(ci) } + org_cells = [ c0, c9 ].collect { |c| c.cell_index } + + cm = RBA::CellMapping::new + cm.for_multi_cells(lt, new_cells, l, org_cells) + + lt.copy_tree_shapes(l, cm) + assert_equal(collect(c0t.begin_shapes_rec(0), lt), "[c0](0,100;1000,1200)/[c0](0,100;1000,1200)/[c0](100,0;1100,1100)/[c0](-1200,0;-100,1000)/[c0](1200,0;2200,1100)") + assert_equal(c0t.begin_shapes_rec(0).shape.property("p"), nil) + assert_equal(collect(c9t.begin_shapes_rec(0), lt), "[c9](0,100;1000,1200)") + assert_equal(collect(c0t.begin_shapes_rec(1), l), "[c0](1,101;1001,1201)") + assert_equal(c0t.begin_shapes_rec(1).shape.property("p"), 17) + assert_equal(collect(c9t.begin_shapes_rec(1), l), "") + + lt = RBA::Layout::new + + new_cells = [ c0, c9 ].collect { |c| lt.add_cell(c.name) } + ( c0t, c9t ) = new_cells.collect { |ci| lt.cell(ci) } + org_cells = [ c0, c9 ].collect { |c| c.cell_index } + + cm = RBA::CellMapping::new + cm.for_multi_cells_full(lt, new_cells, l, org_cells) + + lt.copy_tree_shapes(l, cm) + assert_equal(collect(c0t.begin_shapes_rec(0), lt), "[c0](0,100;1000,1200)/[c2](100,0;1100,1100)/[c3](1200,0;2200,1100)/[c3](-1200,0;-100,1000)/[c1](0,100;1000,1200)") + assert_equal(c0t.begin_shapes_rec(0).shape.property("p"), nil) + assert_equal(collect(c9t.begin_shapes_rec(0), lt), "[c1](0,100;1000,1200)") + assert_equal(collect(c0t.begin_shapes_rec(1), l), "[c0](1,101;1001,1201)") + assert_equal(c0t.begin_shapes_rec(1).shape.property("p"), 17) + assert_equal(collect(c9t.begin_shapes_rec(1), l), "") + + lt = RBA::Layout::new + lt.layer + lt.layer + ll = lt.layer + + new_cells = [ c0, c9 ].collect { |c| lt.add_cell(c.name) } + ( c0t, c9t ) = new_cells.collect { |ci| lt.cell(ci) } + org_cells = [ c0, c9 ].collect { |c| c.cell_index } + + cm = RBA::CellMapping::new + cm.for_multi_cells_full(lt, new_cells, l, org_cells) + + lm = RBA::LayerMapping::new + lm.map(0, ll) + + lt.copy_tree_shapes(l, cm, lm) + assert_equal(collect(c0t.begin_shapes_rec(ll), lt), "[c0](0,100;1000,1200)/[c2](100,0;1100,1100)/[c3](1200,0;2200,1100)/[c3](-1200,0;-100,1000)/[c1](0,100;1000,1200)") + assert_equal(c0t.begin_shapes_rec(ll).shape.property("p"), nil) + assert_equal(collect(c9t.begin_shapes_rec(ll), lt), "[c1](0,100;1000,1200)") + + lt = RBA::Layout::new + ls = l.dup + + assert_equal(ls.cell(c0.cell_index).name, "c0") + assert_equal(ls.cell(c9.cell_index).name, "c9") + + new_cells = [ c0, c9 ].collect { |c| lt.add_cell(c.name) } + ( c0t, c9t ) = new_cells.collect { |ci| lt.cell(ci) } + org_cells = [ c0, c9 ].collect { |c| c.cell_index } + + cm = RBA::CellMapping::new + cm.for_multi_cells(lt, new_cells, ls, org_cells) + + lt.move_tree_shapes(ls, cm) + + assert_equal(collect(ls.cell(c0.cell_index).begin_shapes_rec(0), ls), "") + assert_equal(collect(ls.cell(c0.cell_index).begin_shapes_rec(1), ls), "") + assert_equal(collect(ls.cell(c9.cell_index).begin_shapes_rec(0), ls), "") + assert_equal(collect(ls.cell(c9.cell_index).begin_shapes_rec(1), ls), "") + + assert_equal(collect(c0t.begin_shapes_rec(0), lt), "[c0](0,100;1000,1200)/[c0](0,100;1000,1200)/[c0](100,0;1100,1100)/[c0](-1200,0;-100,1000)/[c0](1200,0;2200,1100)") + assert_equal(c0t.begin_shapes_rec(0).shape.property("p"), nil) + assert_equal(collect(c9t.begin_shapes_rec(0), lt), "[c9](0,100;1000,1200)") + assert_equal(collect(c0t.begin_shapes_rec(1), l), "[c0](1,101;1001,1201)") + assert_equal(c0t.begin_shapes_rec(1).shape.property("p"), 17) + assert_equal(collect(c9t.begin_shapes_rec(1), l), "") + + lt = RBA::Layout::new + lt.layer + lt.layer + ll = lt.layer + + ls = l.dup + + assert_equal(ls.cell(c0.cell_index).name, "c0") + assert_equal(ls.cell(c9.cell_index).name, "c9") + + new_cells = [ c0, c9 ].collect { |c| lt.add_cell(c.name) } + ( c0t, c9t ) = new_cells.collect { |ci| lt.cell(ci) } + org_cells = [ c0, c9 ].collect { |c| c.cell_index } + + cm = RBA::CellMapping::new + cm.for_multi_cells(lt, new_cells, ls, org_cells) + + lm = RBA::LayerMapping::new + lm.map(0, ll) + + lt.move_tree_shapes(ls, cm, lm) + + assert_equal(collect(ls.cell(c0.cell_index).begin_shapes_rec(0), ls), "") + assert_equal(collect(ls.cell(c0.cell_index).begin_shapes_rec(1), ls), "[c0](1,101;1001,1201)") + assert_equal(collect(ls.cell(c9.cell_index).begin_shapes_rec(0), ls), "") + assert_equal(collect(ls.cell(c9.cell_index).begin_shapes_rec(1), ls), "") + + assert_equal(collect(c0t.begin_shapes_rec(ll), lt), "[c0](0,100;1000,1200)/[c0](0,100;1000,1200)/[c0](100,0;1100,1100)/[c0](-1200,0;-100,1000)/[c0](1200,0;2200,1100)") + assert_equal(c0t.begin_shapes_rec(ll).shape.property("p"), nil) + assert_equal(collect(c9t.begin_shapes_rec(ll), lt), "[c9](0,100;1000,1200)") + + end + # Iterating while flatten def test_issue200 From d762074bc04666ba966b41797e858e698cabfb15 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sat, 29 Aug 2020 23:43:05 +0200 Subject: [PATCH 087/121] Some refactoring, Cell#dup for convenience --- src/db/db/dbCell.cc | 311 +++++++++++++++++++++++++++++++++++++ src/db/db/dbCell.h | 80 ++++++++++ src/db/db/gsiDeclDbCell.cc | 304 +++++------------------------------- testdata/ruby/dbLayout.rb | 39 +++++ 4 files changed, 466 insertions(+), 268 deletions(-) diff --git a/src/db/db/dbCell.cc b/src/db/db/dbCell.cc index 1c8968b28..0b1522e82 100644 --- a/src/db/db/dbCell.cc +++ b/src/db/db/dbCell.cc @@ -26,6 +26,9 @@ #include "dbManager.h" #include "dbBox.h" #include "dbPCellVariant.h" +#include "dbLayoutUtils.h" +#include "dbLayerMapping.h" +#include "dbCellMapping.h" #include @@ -726,5 +729,313 @@ Cell::set_name (const std::string &name) layout ()->rename_cell (cell_index (), name.c_str ()); } +void +Cell::copy_shapes (const db::Cell &source_cell, const db::LayerMapping &layer_mapping) +{ + if (this == &source_cell) { + throw tl::Exception (tl::to_string (tr ("Cannot copy shapes within the same cell"))); + } + + db::Layout *target_layout = layout (); + if (! target_layout) { + throw tl::Exception (tl::to_string (tr ("Cell does not reside in a layout"))); + } + const db::Layout *source_layout = source_cell.layout (); + if (! source_layout) { + throw tl::Exception (tl::to_string (tr ("Source cell does not reside in a layout"))); + } + + if (target_layout != source_layout) { + db::PropertyMapper pm (*target_layout, *source_layout); + db::ICplxTrans trans (source_layout->dbu () / target_layout->dbu ()); + for (std::map::const_iterator lm = layer_mapping.begin (); lm != layer_mapping.end (); ++lm) { + shapes (lm->second).insert_transformed (source_cell.shapes (lm->first), trans, pm); + } + } else { + for (std::map::const_iterator lm = layer_mapping.begin (); lm != layer_mapping.end (); ++lm) { + shapes (lm->second).insert (source_cell.shapes (lm->first)); + } + } +} + +void +Cell::copy_shapes (const db::Cell &source_cell) +{ + if (this == &source_cell) { + throw tl::Exception (tl::to_string (tr ("Cannot copy shapes within the same cell"))); + } + db::Layout *target_layout = layout (); + if (! target_layout) { + throw tl::Exception (tl::to_string (tr ("Cell does not reside in a layout"))); + } + + if (target_layout != source_cell.layout ()) { + if (! source_cell.layout ()) { + throw tl::Exception (tl::to_string (tr ("Source cell does not reside in a layout"))); + } + db::LayerMapping lm; + lm.create_full (*target_layout, *source_cell.layout ()); + this->copy_shapes (source_cell, lm); + } else { + for (db::Layout::layer_iterator l = target_layout->begin_layers (); l != target_layout->end_layers (); ++l) { + shapes ((*l).first).insert (source_cell.shapes ((*l).first)); + } + } +} + +void +Cell::copy_instances (const db::Cell &source_cell) +{ + if (this == &source_cell) { + throw tl::Exception (tl::to_string (tr ("Cannot copy instances within the same cell"))); + } + if (layout () != source_cell.layout ()) { + throw tl::Exception (tl::to_string (tr ("Cells do not reside in the same layout"))); + } + + for (db::Cell::const_iterator i = source_cell.begin (); ! i.at_end (); ++i) { + insert (*i); + } +} + +std::vector +Cell::copy_tree (const db::Cell &source_cell) +{ + if (this == &source_cell) { + throw tl::Exception (tl::to_string (tr ("Cannot copy shapes within the same cell"))); + } + + db::Layout *target_layout = layout (); + if (! target_layout) { + throw tl::Exception (tl::to_string (tr ("Cell does not reside in a layout"))); + } + const db::Layout *source_layout = source_cell.layout (); + if (! source_layout) { + throw tl::Exception (tl::to_string (tr ("Source cell does not reside in a layout"))); + } + + db::ICplxTrans trans (source_layout->dbu () / target_layout->dbu ()); + + db::CellMapping cm; + std::vector new_cells = cm.create_single_mapping_full (*target_layout, cell_index (), *source_layout, source_cell.cell_index ()); + + db::LayerMapping lm; + lm.create_full (*target_layout, *source_cell.layout ()); + + std::vector source_cells; + source_cells.push_back (source_cell.cell_index ()); + db::copy_shapes (*target_layout, *source_layout, trans, source_cells, cm.table (), lm.table ()); + + return new_cells; +} + +void +Cell::copy_tree_shapes (const db::Cell &source_cell, const db::CellMapping &cm) +{ + if (this == &source_cell) { + throw tl::Exception (tl::to_string (tr ("Cannot copy shapes within the same cell"))); + } + + db::Layout *target_layout = layout (); + if (! target_layout) { + throw tl::Exception (tl::to_string (tr ("Cell does not reside in a layout"))); + } + const db::Layout *source_layout = source_cell.layout (); + if (! source_layout) { + throw tl::Exception (tl::to_string (tr ("Source cell does not reside in a layout"))); + } + + db::ICplxTrans trans (source_layout->dbu () / target_layout->dbu ()); + + db::LayerMapping lm; + lm.create_full (*target_layout, *source_cell.layout ()); + + std::vector source_cells; + source_cells.push_back (source_cell.cell_index ()); + db::copy_shapes (*target_layout, *source_layout, trans, source_cells, cm.table (), lm.table ()); +} + +void +Cell::copy_tree_shapes (const db::Cell &source_cell, const db::CellMapping &cm, const db::LayerMapping &lm) +{ + if (this == &source_cell) { + throw tl::Exception (tl::to_string (tr ("Cannot copy shapes within the same cell"))); + } + + db::Layout *target_layout = layout (); + if (! target_layout) { + throw tl::Exception (tl::to_string (tr ("Cell does not reside in a layout"))); + } + const db::Layout *source_layout = source_cell.layout (); + if (! source_layout) { + throw tl::Exception (tl::to_string (tr ("Source cell does not reside in a layout"))); + } + + db::ICplxTrans trans (source_layout->dbu () / target_layout->dbu ()); + + std::vector source_cells; + source_cells.push_back (source_cell.cell_index ()); + db::copy_shapes (*target_layout, *source_layout, trans, source_cells, cm.table (), lm.table ()); +} + +void +Cell::move_shapes (db::Cell &source_cell, const db::LayerMapping &layer_mapping) +{ + if (this == &source_cell) { + throw tl::Exception (tl::to_string (tr ("Cannot move shapes within the same cell"))); + } + + db::Layout *target_layout = layout (); + if (! target_layout) { + throw tl::Exception (tl::to_string (tr ("Cell does not reside in a layout"))); + } + db::Layout *source_layout = source_cell.layout (); + if (! source_layout) { + throw tl::Exception (tl::to_string (tr ("Source cell does not reside in a layout"))); + } + + if (target_layout != source_layout) { + db::PropertyMapper pm (*target_layout, *source_layout); + db::ICplxTrans trans (source_layout->dbu () / target_layout->dbu ()); + for (std::map::const_iterator lm = layer_mapping.begin (); lm != layer_mapping.end (); ++lm) { + shapes (lm->second).insert_transformed (source_cell.shapes (lm->first), trans, pm); + source_cell.shapes (lm->first).clear (); + } + } else { + for (std::map::const_iterator lm = layer_mapping.begin (); lm != layer_mapping.end (); ++lm) { + shapes (lm->second).insert (source_cell.shapes (lm->first)); + source_cell.shapes (lm->first).clear (); + } + } +} + +void +Cell::move_shapes (db::Cell &source_cell) +{ + if (this == &source_cell) { + throw tl::Exception (tl::to_string (tr ("Cannot move shapes within the same cell"))); + } + db::Layout *target_layout = layout (); + if (! target_layout) { + throw tl::Exception (tl::to_string (tr ("Cell does not reside in a layout"))); + } + + if (target_layout != source_cell.layout ()) { + if (! source_cell.layout ()) { + throw tl::Exception (tl::to_string (tr ("Source cell does not reside in a layout"))); + } + db::LayerMapping lm; + lm.create_full (*target_layout, *source_cell.layout ()); + move_shapes (source_cell, lm); + } else { + for (db::Layout::layer_iterator l = target_layout->begin_layers (); l != target_layout->end_layers (); ++l) { + shapes ((*l).first).insert (source_cell.shapes ((*l).first)); + source_cell.shapes ((*l).first).clear (); + } + } +} + +void +Cell::move_instances (db::Cell &source_cell) +{ + if (this == &source_cell) { + throw tl::Exception (tl::to_string (tr ("Cannot move instances within the same cell"))); + } + if (layout () != source_cell.layout ()) { + throw tl::Exception (tl::to_string (tr ("Cells do not reside in the same layout"))); + } + + for (db::Cell::const_iterator i = source_cell.begin (); ! i.at_end (); ++i) { + insert (*i); + } + + source_cell.clear_insts (); +} + +std::vector +Cell::move_tree (db::Cell &source_cell) +{ + if (this == &source_cell) { + throw tl::Exception (tl::to_string (tr ("Cannot move shapes within the same cell"))); + } + + db::Layout *target_layout = layout (); + if (! target_layout) { + throw tl::Exception (tl::to_string (tr ("Cell does not reside in a layout"))); + } + db::Layout *source_layout = source_cell.layout (); + if (! source_layout) { + throw tl::Exception (tl::to_string (tr ("Source cell does not reside in a layout"))); + } + + db::PropertyMapper pm (*target_layout, *source_layout); + db::ICplxTrans trans (source_layout->dbu () / target_layout->dbu ()); + + db::CellMapping cm; + std::vector new_cells = cm.create_single_mapping_full (*target_layout, cell_index (), *source_layout, source_cell.cell_index ()); + + db::LayerMapping lm; + lm.create_full (*target_layout, *source_cell.layout ()); + + std::vector source_cells; + source_cells.push_back (source_cell.cell_index ()); + db::move_shapes (*target_layout, *source_layout, trans, source_cells, cm.table (), lm.table ()); + + source_layout->prune_subcells (source_cell.cell_index ()); + + return new_cells; +} + +void +Cell::move_tree_shapes (db::Cell &source_cell, const db::CellMapping &cm) +{ + if (this == &source_cell) { + throw tl::Exception (tl::to_string (tr ("Cannot move shapes within the same cell"))); + } + + db::Layout *target_layout = layout (); + if (! target_layout) { + throw tl::Exception (tl::to_string (tr ("Cell does not reside in a layout"))); + } + db::Layout *source_layout = source_cell.layout (); + if (! source_layout) { + throw tl::Exception (tl::to_string (tr ("Source cell does not reside in a layout"))); + } + + db::PropertyMapper pm (*target_layout, *source_layout); + db::ICplxTrans trans (source_layout->dbu () / target_layout->dbu ()); + + db::LayerMapping lm; + lm.create_full (*target_layout, *source_cell.layout ()); + + std::vector source_cells; + source_cells.push_back (source_cell.cell_index ()); + db::move_shapes (*target_layout, *source_layout, trans, source_cells, cm.table (), lm.table ()); +} + +void +Cell::move_tree_shapes (db::Cell &source_cell, const db::CellMapping &cm, const db::LayerMapping &lm) +{ + if (this == &source_cell) { + throw tl::Exception (tl::to_string (tr ("Cannot move shapes within the same cell"))); + } + + db::Layout *target_layout = layout (); + if (! target_layout) { + throw tl::Exception (tl::to_string (tr ("Cell does not reside in a layout"))); + } + db::Layout *source_layout = source_cell.layout (); + if (! source_layout) { + throw tl::Exception (tl::to_string (tr ("Source cell does not reside in a layout"))); + } + + db::PropertyMapper pm (*target_layout, *source_layout); + db::ICplxTrans trans (source_layout->dbu () / target_layout->dbu ()); + + std::vector source_cells; + source_cells.push_back (source_cell.cell_index ()); + db::move_shapes (*target_layout, *source_layout, trans, source_cells, cm.table (), lm.table ()); +} + } diff --git a/src/db/db/dbCell.h b/src/db/db/dbCell.h index 56e5e6b9a..83b9ff2cc 100644 --- a/src/db/db/dbCell.h +++ b/src/db/db/dbCell.h @@ -55,6 +55,8 @@ template class generic_repository; class Layout; class Library; class ImportLayerMapping; +class CellMapping; +class LayerMapping; /** * @brief The cell object @@ -937,6 +939,84 @@ public: return mp_layout; } + /** + * @brief Copies the shapes from the source cell's tree to this cell + * + * This variant uses the given cell mapping and layer mapping. + */ + void copy_tree_shapes (const db::Cell &source_cell, const db::CellMapping &cm); + + /** + * @brief Copies the shapes from the source cell's tree to this cell + * + * This variant uses the given cell mapping and layer mapping. + */ + void copy_tree_shapes (const db::Cell &source_cell, const db::CellMapping &cm, const db::LayerMapping &lm); + + /** + * @brief Copies instances and shapes from the source cell to this cell + * + * If the source and target layout are different ones, the whole cell tree of the source cell + * will be copied. + * This will create new cells in the target layout to accomodate the source cell tree. + * Returns an array with the freshly created cells which acommodate the cell tree. + */ + std::vector copy_tree (const db::Cell &source_cell); + + /** + * @brief Copies the instances from the source to this cell. + */ + void copy_instances (const db::Cell &source_cell); + + /** + * @brief Copies all shapes from the source cell to this cell + */ + void copy_shapes (const db::Cell &source_cell); + + /** + * @brief Copies all shapes from the source cell to this cell using the given layer mapping + */ + void copy_shapes (const db::Cell &source_cell, const db::LayerMapping &layer_mapping); + + /** + * @brief Moves the shapes from the source cell's tree to this cell + * + * This variant uses the given cell mapping and layer mapping. + */ + void move_tree_shapes (db::Cell &source_cell, const db::CellMapping &cm); + + /** + * @brief Moves the shapes from the source cell's tree to this cell + * + * This variant uses the given cell mapping and layer mapping. + */ + void move_tree_shapes (db::Cell &source_cell, const db::CellMapping &cm, const db::LayerMapping &lm); + + /** + * @brief Moves instances and shapes from the source cell to this cell + * + * If the source and target layout are different ones, the whole cell tree of the source cell + * will be copied. + * This will create new cells in the target layout to accomodate the source cell tree. + * Returns an array with the freshly created cells which acommodate the cell tree. + */ + std::vector move_tree (db::Cell &source_cell); + + /** + * @brief Moves the instances from the source to this cell. + */ + void move_instances (db::Cell &source_cell); + + /** + * @brief Moves all shapes from the source cell to this cell + */ + void move_shapes (db::Cell &source_cell); + + /** + * @brief Moves all shapes from the source cell to this cell using the given layer mapping + */ + void move_shapes (db::Cell &source_cell, const db::LayerMapping &layer_mapping); + protected: /** * @brief Standard constructor: create an empty cell object diff --git a/src/db/db/gsiDeclDbCell.cc b/src/db/db/gsiDeclDbCell.cc index e41ef5972..1ca13c811 100644 --- a/src/db/db/gsiDeclDbCell.cc +++ b/src/db/db/gsiDeclDbCell.cc @@ -1206,298 +1206,42 @@ begin_shapes_rec_overlapping_um (const db::Cell *cell, unsigned int layer, db::D static void copy_shapes2 (db::Cell *cell, const db::Cell &source_cell, const db::LayerMapping &layer_mapping) { - if (cell == &source_cell) { - throw tl::Exception (tl::to_string (tr ("Cannot copy shapes within the same cell"))); - } - - db::Layout *target_layout = cell->layout (); - if (! target_layout) { - throw tl::Exception (tl::to_string (tr ("Cell does not reside in a layout"))); - } - const db::Layout *source_layout = source_cell.layout (); - if (! source_layout) { - throw tl::Exception (tl::to_string (tr ("Source cell does not reside in a layout"))); - } - - if (target_layout != source_layout) { - db::PropertyMapper pm (*target_layout, *source_layout); - db::ICplxTrans trans (source_layout->dbu () / target_layout->dbu ()); - for (std::map::const_iterator lm = layer_mapping.begin (); lm != layer_mapping.end (); ++lm) { - cell->shapes (lm->second).insert_transformed (source_cell.shapes (lm->first), trans, pm); - } - } else { - for (std::map::const_iterator lm = layer_mapping.begin (); lm != layer_mapping.end (); ++lm) { - cell->shapes (lm->second).insert (source_cell.shapes (lm->first)); - } - } + cell->copy_shapes (source_cell, layer_mapping); } static void copy_shapes1 (db::Cell *cell, const db::Cell &source_cell) { - if (cell == &source_cell) { - throw tl::Exception (tl::to_string (tr ("Cannot copy shapes within the same cell"))); - } - db::Layout *layout = cell->layout (); - if (! layout) { - throw tl::Exception (tl::to_string (tr ("Cell does not reside in a layout"))); - } - - if (layout != source_cell.layout ()) { - if (! source_cell.layout ()) { - throw tl::Exception (tl::to_string (tr ("Source cell does not reside in a layout"))); - } - db::LayerMapping lm; - lm.create_full (*layout, *source_cell.layout ()); - copy_shapes2 (cell, source_cell, lm); - } else { - for (db::Layout::layer_iterator l = layout->begin_layers (); l != layout->end_layers (); ++l) { - cell->shapes ((*l).first).insert (source_cell.shapes ((*l).first)); - } - } -} - -static void copy_instances (db::Cell *cell, const db::Cell &source_cell) -{ - if (cell == &source_cell) { - throw tl::Exception (tl::to_string (tr ("Cannot copy instances within the same cell"))); - } - if (cell->layout () != source_cell.layout ()) { - throw tl::Exception (tl::to_string (tr ("Cells do not reside in the same layout"))); - } - - for (db::Cell::const_iterator i = source_cell.begin (); ! i.at_end (); ++i) { - cell->insert (*i); - } -} - -static std::vector copy_tree (db::Cell *cell, const db::Cell &source_cell) -{ - if (cell == &source_cell) { - throw tl::Exception (tl::to_string (tr ("Cannot copy shapes within the same cell"))); - } - - db::Layout *target_layout = cell->layout (); - if (! target_layout) { - throw tl::Exception (tl::to_string (tr ("Cell does not reside in a layout"))); - } - const db::Layout *source_layout = source_cell.layout (); - if (! source_layout) { - throw tl::Exception (tl::to_string (tr ("Source cell does not reside in a layout"))); - } - - db::ICplxTrans trans (source_layout->dbu () / target_layout->dbu ()); - - db::CellMapping cm; - std::vector new_cells = cm.create_single_mapping_full (*target_layout, cell->cell_index (), *source_layout, source_cell.cell_index ()); - - db::LayerMapping lm; - lm.create_full (*target_layout, *source_cell.layout ()); - - std::vector source_cells; - source_cells.push_back (source_cell.cell_index ()); - db::copy_shapes (*target_layout, *source_layout, trans, source_cells, cm.table (), lm.table ()); - - return new_cells; + cell->copy_shapes (source_cell); } static void copy_tree_shapes2 (db::Cell *cell, const db::Cell &source_cell, const db::CellMapping &cm) { - if (cell == &source_cell) { - throw tl::Exception (tl::to_string (tr ("Cannot copy shapes within the same cell"))); - } - - db::Layout *target_layout = cell->layout (); - if (! target_layout) { - throw tl::Exception (tl::to_string (tr ("Cell does not reside in a layout"))); - } - const db::Layout *source_layout = source_cell.layout (); - if (! source_layout) { - throw tl::Exception (tl::to_string (tr ("Source cell does not reside in a layout"))); - } - - db::ICplxTrans trans (source_layout->dbu () / target_layout->dbu ()); - - db::LayerMapping lm; - lm.create_full (*target_layout, *source_cell.layout ()); - - std::vector source_cells; - source_cells.push_back (source_cell.cell_index ()); - db::copy_shapes (*target_layout, *source_layout, trans, source_cells, cm.table (), lm.table ()); + cell->copy_tree_shapes (source_cell, cm); } static void copy_tree_shapes3 (db::Cell *cell, const db::Cell &source_cell, const db::CellMapping &cm, const db::LayerMapping &lm) { - if (cell == &source_cell) { - throw tl::Exception (tl::to_string (tr ("Cannot copy shapes within the same cell"))); - } - - db::Layout *target_layout = cell->layout (); - if (! target_layout) { - throw tl::Exception (tl::to_string (tr ("Cell does not reside in a layout"))); - } - const db::Layout *source_layout = source_cell.layout (); - if (! source_layout) { - throw tl::Exception (tl::to_string (tr ("Source cell does not reside in a layout"))); - } - - db::ICplxTrans trans (source_layout->dbu () / target_layout->dbu ()); - - std::vector source_cells; - source_cells.push_back (source_cell.cell_index ()); - db::copy_shapes (*target_layout, *source_layout, trans, source_cells, cm.table (), lm.table ()); + cell->copy_tree_shapes (source_cell, cm, lm); } static void move_shapes2 (db::Cell *cell, db::Cell &source_cell, const db::LayerMapping &layer_mapping) { - if (cell == &source_cell) { - throw tl::Exception (tl::to_string (tr ("Cannot move shapes within the same cell"))); - } - - db::Layout *target_layout = cell->layout (); - if (! target_layout) { - throw tl::Exception (tl::to_string (tr ("Cell does not reside in a layout"))); - } - db::Layout *source_layout = source_cell.layout (); - if (! source_layout) { - throw tl::Exception (tl::to_string (tr ("Source cell does not reside in a layout"))); - } - - if (target_layout != source_layout) { - db::PropertyMapper pm (*target_layout, *source_layout); - db::ICplxTrans trans (source_layout->dbu () / target_layout->dbu ()); - for (std::map::const_iterator lm = layer_mapping.begin (); lm != layer_mapping.end (); ++lm) { - cell->shapes (lm->second).insert_transformed (source_cell.shapes (lm->first), trans, pm); - source_cell.shapes (lm->first).clear (); - } - } else { - for (std::map::const_iterator lm = layer_mapping.begin (); lm != layer_mapping.end (); ++lm) { - cell->shapes (lm->second).insert (source_cell.shapes (lm->first)); - source_cell.shapes (lm->first).clear (); - } - } + cell->move_shapes (source_cell, layer_mapping); } static void move_shapes1 (db::Cell *cell, db::Cell &source_cell) { - if (cell == &source_cell) { - throw tl::Exception (tl::to_string (tr ("Cannot move shapes within the same cell"))); - } - db::Layout *layout = cell->layout (); - if (! layout) { - throw tl::Exception (tl::to_string (tr ("Cell does not reside in a layout"))); - } - - if (layout != source_cell.layout ()) { - if (! source_cell.layout ()) { - throw tl::Exception (tl::to_string (tr ("Source cell does not reside in a layout"))); - } - db::LayerMapping lm; - lm.create_full (*layout, *source_cell.layout ()); - move_shapes2 (cell, source_cell, lm); - } else { - for (db::Layout::layer_iterator l = layout->begin_layers (); l != layout->end_layers (); ++l) { - cell->shapes ((*l).first).insert (source_cell.shapes ((*l).first)); - source_cell.shapes ((*l).first).clear (); - } - } -} - -static void move_instances (db::Cell *cell, db::Cell &source_cell) -{ - if (cell == &source_cell) { - throw tl::Exception (tl::to_string (tr ("Cannot move instances within the same cell"))); - } - if (cell->layout () != source_cell.layout ()) { - throw tl::Exception (tl::to_string (tr ("Cells do not reside in the same layout"))); - } - - for (db::Cell::const_iterator i = source_cell.begin (); ! i.at_end (); ++i) { - cell->insert (*i); - } - - source_cell.clear_insts (); -} - -static std::vector move_tree (db::Cell *cell, db::Cell &source_cell) -{ - if (cell == &source_cell) { - throw tl::Exception (tl::to_string (tr ("Cannot move shapes within the same cell"))); - } - - db::Layout *target_layout = cell->layout (); - if (! target_layout) { - throw tl::Exception (tl::to_string (tr ("Cell does not reside in a layout"))); - } - db::Layout *source_layout = source_cell.layout (); - if (! source_layout) { - throw tl::Exception (tl::to_string (tr ("Source cell does not reside in a layout"))); - } - - db::PropertyMapper pm (*target_layout, *source_layout); - db::ICplxTrans trans (source_layout->dbu () / target_layout->dbu ()); - - db::CellMapping cm; - std::vector new_cells = cm.create_single_mapping_full (*target_layout, cell->cell_index (), *source_layout, source_cell.cell_index ()); - - db::LayerMapping lm; - lm.create_full (*target_layout, *source_cell.layout ()); - - std::vector source_cells; - source_cells.push_back (source_cell.cell_index ()); - db::move_shapes (*target_layout, *source_layout, trans, source_cells, cm.table (), lm.table ()); - - source_layout->prune_subcells (source_cell.cell_index ()); - - return new_cells; + cell->move_shapes (source_cell); } static void move_tree_shapes2 (db::Cell *cell, db::Cell &source_cell, const db::CellMapping &cm) { - if (cell == &source_cell) { - throw tl::Exception (tl::to_string (tr ("Cannot move shapes within the same cell"))); - } - - db::Layout *target_layout = cell->layout (); - if (! target_layout) { - throw tl::Exception (tl::to_string (tr ("Cell does not reside in a layout"))); - } - db::Layout *source_layout = source_cell.layout (); - if (! source_layout) { - throw tl::Exception (tl::to_string (tr ("Source cell does not reside in a layout"))); - } - - db::PropertyMapper pm (*target_layout, *source_layout); - db::ICplxTrans trans (source_layout->dbu () / target_layout->dbu ()); - - db::LayerMapping lm; - lm.create_full (*target_layout, *source_cell.layout ()); - - std::vector source_cells; - source_cells.push_back (source_cell.cell_index ()); - db::move_shapes (*target_layout, *source_layout, trans, source_cells, cm.table (), lm.table ()); + cell->move_tree_shapes (source_cell, cm); } static void move_tree_shapes3 (db::Cell *cell, db::Cell &source_cell, const db::CellMapping &cm, const db::LayerMapping &lm) { - if (cell == &source_cell) { - throw tl::Exception (tl::to_string (tr ("Cannot move shapes within the same cell"))); - } - - db::Layout *target_layout = cell->layout (); - if (! target_layout) { - throw tl::Exception (tl::to_string (tr ("Cell does not reside in a layout"))); - } - db::Layout *source_layout = source_cell.layout (); - if (! source_layout) { - throw tl::Exception (tl::to_string (tr ("Source cell does not reside in a layout"))); - } - - db::PropertyMapper pm (*target_layout, *source_layout); - db::ICplxTrans trans (source_layout->dbu () / target_layout->dbu ()); - - std::vector source_cells; - source_cells.push_back (source_cell.cell_index ()); - db::move_shapes (*target_layout, *source_layout, trans, source_cells, cm.table (), lm.table ()); + cell->move_tree_shapes (source_cell, cm, lm); } static void @@ -1686,6 +1430,21 @@ static const db::Shapes *shapes_of_cell_const (const db::Cell *cell, unsigned in return &cell->shapes (layer); } +static db::Cell *dup_cell (const db::Cell *cell) +{ + if (! cell->layout ()) { + throw tl::Exception (tl::to_string (tr ("Cannot create a copy of a cell which is not part of a layout"))); + } + + db::Layout *layout = const_cast (cell->layout ()); + db::Cell *new_cell = &layout->cell (layout->add_cell (layout->cell_name (cell->cell_index ()))); + + new_cell->copy_shapes (*cell); + new_cell->copy_instances (*cell); + + return new_cell; +} + Class decl_Cell ("db", "Cell", gsi::method ("name", &db::Cell::get_basic_name, "@brief Gets the cell's name\n" @@ -1759,6 +1518,15 @@ Class decl_Cell ("db", "Cell", "\n" "This method has been introduced in version 0.23.\n" ) + + gsi::method_ext ("dup", &dup_cell, + "@brief Creates a copy of the cell\n" + "\n" + "This method will create a copy of the cell. The new cell will be member of the same layout the original cell " + "was member of. The copy will inherit all shapes and instances, but get " + "a different cell_index and a modified name as duplicate cell names are not allowed in the same layout.\n" + "\n" + "This method has been introduced in version 0.27.\n" + ) + gsi::method ("shapes", (db::Cell::shapes_type &(db::Cell::*) (unsigned int)) &db::Cell::shapes, gsi::arg ("layer_index"), "@brief Returns the shapes list of the given layer\n" "\n" @@ -2092,7 +1860,7 @@ Class decl_Cell ("db", "Cell", "\n" "This method has been added in version 0.23.\n" ) + - gsi::method_ext ("copy_instances", ©_instances, gsi::arg ("source_cell"), + gsi::method ("copy_instances", &db::Cell::copy_instances, gsi::arg ("source_cell"), "@brief Copies the instances of child cells in the source cell to this cell\n" "@param source_cell The cell where the instances are copied from\n" "The source cell must reside in the same layout than this cell. The instances of " @@ -2106,7 +1874,7 @@ Class decl_Cell ("db", "Cell", "\n" "This method has been added in version 0.23.\n" ) + - gsi::method_ext ("copy_tree", ©_tree, gsi::arg ("source_cell"), + gsi::method ("copy_tree", &db::Cell::copy_tree, gsi::arg ("source_cell"), "@brief Copies the cell tree of the given cell into this cell\n" "@param source_cell The cell from where to copy the cell tree\n" "@return A list of indexes of newly created cells\n" @@ -2196,7 +1964,7 @@ Class decl_Cell ("db", "Cell", "\n" "This method has been added in version 0.23.\n" ) + - gsi::method_ext ("move_instances", &move_instances, gsi::arg ("source_cell"), + gsi::method ("move_instances", &db::Cell::move_instances, gsi::arg ("source_cell"), "@brief Moves the instances of child cells in the source cell to this cell\n" "@param source_cell The cell where the instances are moved from\n" "The source cell must reside in the same layout than this cell. The instances of " @@ -2210,7 +1978,7 @@ Class decl_Cell ("db", "Cell", "\n" "This method has been added in version 0.23.\n" ) + - gsi::method_ext ("move_tree", &move_tree, gsi::arg ("source_cell"), + gsi::method ("move_tree", &db::Cell::move_tree, gsi::arg ("source_cell"), "@brief Moves the cell tree of the given cell into this cell\n" "@param source_cell The cell from where to move the cell tree\n" "@return A list of indexes of newly created cells\n" diff --git a/testdata/ruby/dbLayout.rb b/testdata/ruby/dbLayout.rb index ecb2efff1..e5ff45791 100644 --- a/testdata/ruby/dbLayout.rb +++ b/testdata/ruby/dbLayout.rb @@ -2143,6 +2143,45 @@ END end + def test_21 + + # dup cells + + l = RBA::Layout.new + l.insert_layer_at(0, RBA::LayerInfo.new(1, 0)) + l.insert_layer_at(1, RBA::LayerInfo.new(2, 0)) + c0 = l.cell(l.add_cell("c0")) + c1 = l.cell(l.add_cell("c1")) + c2 = l.cell(l.add_cell("c2")) + c3 = l.cell(l.add_cell("c3")) + + b = RBA::Box.new(0, 100, 1000, 1200) + c0.shapes(0).insert(b) + c1.shapes(0).insert(b) + c2.shapes(0).insert(b) + c3.shapes(0).insert(b) + b = RBA::Box.new(1, 101, 1001, 1201) + s = c0.shapes(1).insert(b) + s.set_property("p", 17) + + tt = RBA::Trans.new + s = c0.insert(RBA::CellInstArray.new(c1.cell_index, tt)) + s.set_property("p", 18) + c0.insert(RBA::CellInstArray.new(c2.cell_index, RBA::Trans.new(RBA::Point.new(100, -100)))) + c0.insert(RBA::CellInstArray.new(c3.cell_index, RBA::Trans.new(1))) + c2.insert(RBA::CellInstArray.new(c3.cell_index, RBA::Trans.new(RBA::Point.new(1100, 0)))) + + assert_equal(collect(c0.begin_shapes_rec(0), l), "[c0](0,100;1000,1200)/[c2](100,0;1100,1100)/[c3](1200,0;2200,1100)/[c3](-1200,0;-100,1000)/[c1](0,100;1000,1200)") + assert_equal(collect(c0.begin_shapes_rec(1), l), "[c0](1,101;1001,1201)") + + c9 = c0.dup + + assert_equal(c9.name, "c0$1") + assert_equal(collect(c9.begin_shapes_rec(0), l), "[c0$1](0,100;1000,1200)/[c2](100,0;1100,1100)/[c3](1200,0;2200,1100)/[c3](-1200,0;-100,1000)/[c1](0,100;1000,1200)") + assert_equal(collect(c9.begin_shapes_rec(1), l), "[c0$1](1,101;1001,1201)") + + end + # Iterating while flatten def test_issue200 From 9a4cd629fc2d9407cb51b3f7464e78f2c7ce3d0b Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sun, 30 Aug 2020 01:36:17 +0200 Subject: [PATCH 088/121] WIP: some little refactoring. --- src/db/db/dbLayout.cc | 57 +++++++++++++++++++++++++++++++++++++++++++ src/db/db/dbLayout.h | 30 +++++++++++++++++++++++ 2 files changed, 87 insertions(+) diff --git a/src/db/db/dbLayout.cc b/src/db/db/dbLayout.cc index b4e626d99..55c19ef78 100644 --- a/src/db/db/dbLayout.cc +++ b/src/db/db/dbLayout.cc @@ -35,6 +35,9 @@ #include "dbEdgePairs.h" #include "dbEdges.h" #include "dbTexts.h" +#include "dbCellMapping.h" +#include "dbLayerMapping.h" +#include "dbLayoutUtils.h" #include "tlTimer.h" #include "tlLog.h" #include "tlInternational.h" @@ -1171,6 +1174,60 @@ Layout::topological_sort () } +void +Layout::copy_tree_shapes (const db::Layout &source_layout, const db::CellMapping &cm) +{ + if (this == &source_layout) { + throw tl::Exception (tl::to_string (tr ("Cannot copy shapes within the same layout"))); + } + + db::ICplxTrans trans (source_layout.dbu () / dbu ()); + + db::LayerMapping lm; + lm.create_full (*this, source_layout); + + db::copy_shapes (*this, source_layout, trans, cm.source_cells (), cm.table (), lm.table ()); +} + +void +Layout::copy_tree_shapes (const db::Layout &source_layout, const db::CellMapping &cm, const db::LayerMapping &lm) +{ + if (this == &source_layout) { + throw tl::Exception (tl::to_string (tr ("Cannot copy shapes within the same layout"))); + } + + db::ICplxTrans trans (source_layout.dbu () / dbu ()); + + db::copy_shapes (*this, source_layout, trans, cm.source_cells (), cm.table (), lm.table ()); +} + +void +Layout::move_tree_shapes (db::Layout &source_layout, const db::CellMapping &cm) +{ + if (this == &source_layout) { + throw tl::Exception (tl::to_string (tr ("Cannot copy shapes within the same layout"))); + } + + db::ICplxTrans trans (source_layout.dbu () / dbu ()); + + db::LayerMapping lm; + lm.create_full (*this, source_layout); + + db::move_shapes (*this, source_layout, trans, cm.source_cells (), cm.table (), lm.table ()); +} + +void +Layout::move_tree_shapes (db::Layout &source_layout, const db::CellMapping &cm, const db::LayerMapping &lm) +{ + if (this == &source_layout) { + throw tl::Exception (tl::to_string (tr ("Cannot copy shapes within the same layout"))); + } + + db::ICplxTrans trans (source_layout.dbu () / dbu ()); + + db::move_shapes (*this, source_layout, trans, cm.source_cells (), cm.table (), lm.table ()); +} + bool Layout::is_valid_cell_index (cell_index_type ci) const { diff --git a/src/db/db/dbLayout.h b/src/db/db/dbLayout.h index 96aaf475e..827dee2b3 100644 --- a/src/db/db/dbLayout.h +++ b/src/db/db/dbLayout.h @@ -67,6 +67,8 @@ class Region; class Edges; class EdgePairs; class Texts; +class CellMapping; +class LayerMapping; template class generic_repository; typedef generic_repository GenericRepository; @@ -1257,6 +1259,34 @@ public: */ void delete_layer (unsigned int n); + /** + * @brief Copies the shapes of certain cells from the given source layout into this layout + * + * The affected cells are derived from the cell mapping object. + */ + void copy_tree_shapes (const db::Layout &source_layout, const db::CellMapping &cm); + + /** + * @brief Copies the shapes of certain cells from the given source layout into this layout using the given layer mapping + * + * The affected cells are derived from the cell mapping object. + */ + void copy_tree_shapes (const db::Layout &source_layout, const db::CellMapping &cm, const db::LayerMapping &lm); + + /** + * @brief Moves the shapes of certain cells from the given source layout into this layout + * + * The affected cells are derived from the cell mapping object. + */ + void move_tree_shapes (db::Layout &source_layout, const db::CellMapping &cm); + + /** + * @brief Moves the shapes of certain cells from the given source layout into this layout using the given layer mapping + * + * The affected cells are derived from the cell mapping object. + */ + void move_tree_shapes (db::Layout &source_layout, const db::CellMapping &cm, const db::LayerMapping &lm); + /** * @brief Return true, if the cell index is a valid one */ From a6e750b08858ee9b74a520eacf53b8f82d5063f6 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sun, 30 Aug 2020 01:37:14 +0200 Subject: [PATCH 089/121] Added a configuration option for providing macro substitution layouts (not through UI, only scripting so far) --- .../lefdef/db_plugin/dbLEFDEFImporter.cc | 35 +++++++++---------- .../lefdef/db_plugin/dbLEFDEFImporter.h | 29 +++++++++++++++ .../lefdef/db_plugin/dbLEFDEFPlugin.cc | 30 ++++++++++++++++ .../lefdef/db_plugin/gsiDeclDbLEFDEF.cc | 26 ++++++++++++-- 4 files changed, 100 insertions(+), 20 deletions(-) diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc index cc7a613f6..5186b8a15 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc @@ -517,6 +517,7 @@ LEFDEFReaderOptions &LEFDEFReaderOptions::operator= (const LEFDEFReaderOptions & m_macro_resolution_mode = d.m_macro_resolution_mode; m_lef_files = d.m_lef_files; m_read_lef_with_def = d.m_read_lef_with_def; + set_macro_layouts (d.macro_layouts ()); } return *this; } @@ -1358,6 +1359,20 @@ LEFDEFReaderState::macro_generator (const std::string &mn) } } +db::cell_index_type +LEFDEFReaderState::foreign_cell (Layout &layout, const std::string &name) +{ + std::map::const_iterator c = m_foreign_cells.find (name); + if (c != m_foreign_cells.end ()) { + return c->second; + } else { + db::cell_index_type ci = layout.add_cell (name.c_str ()); + layout.cell (ci).set_ghost_cell (true); + m_foreign_cells.insert (std::make_pair (name, ci)); + return ci; + } +} + std::pair LEFDEFReaderState::macro_cell (const std::string &mn, Layout &layout, const std::vector &maskshift_layers, const std::vector &masks, const MacroDesc ¯o_desc, const LEFDEFNumberOfMasks *nm) { @@ -1386,15 +1401,7 @@ LEFDEFReaderState::macro_cell (const std::string &mn, Layout &layout, const std: if (! macro_desc.foreign_name.empty ()) { - db::cell_index_type ci; - std::pair c = layout.cell_by_name (macro_desc.foreign_name.c_str ()); - if (c.first) { - ci = c.second; - } else { - ci = layout.add_cell (macro_desc.foreign_name.c_str ()); - layout.cell (ci).set_ghost_cell (true); - } - + db::cell_index_type ci = foreign_cell (layout, macro_desc.foreign_name); db::Cell *foreign_cell = &layout.cell (ci); if (macro_desc.foreign_name != mn) { @@ -1415,15 +1422,7 @@ LEFDEFReaderState::macro_cell (const std::string &mn, Layout &layout, const std: // create a ghost cell always - db::cell_index_type ci; - std::pair c = layout.cell_by_name (mn.c_str ()); - if (c.first) { - ci = c.second; - } else { - ci = layout.add_cell (mn.c_str ()); - layout.cell (ci).set_ghost_cell (true); - } - + db::cell_index_type ci = foreign_cell (layout, mn); cell = &layout.cell (ci); } else { diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h index cdffcdace..f29326547 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h @@ -791,6 +791,24 @@ public: m_macro_resolution_mode = m; } + void set_macro_layouts (const std::vector &layouts) + { + for (std::vector::const_iterator l = layouts.begin (); l != layouts.end (); ++l) { + m_macro_layouts.push_back (*l); + } + } + + std::vector macro_layouts () const + { + std::vector res; + for (tl::weak_collection::const_iterator m = m_macro_layouts.begin (); m != m_macro_layouts.end (); ++m) { + if (m.operator-> ()) { + res.push_back (const_cast (m.operator-> ())); + } + } + return res; + } + private: bool m_read_all_layers; db::LayerMap m_layer_map; @@ -847,6 +865,7 @@ private: unsigned int m_macro_resolution_mode; bool m_read_lef_with_def; std::vector m_lef_files; + tl::weak_collection m_macro_layouts; }; /** @@ -1088,6 +1107,14 @@ public: return mp_tech_comp; } + /** + * @brief Gets a map of foreign cells vs. name + */ + const std::map &foreign_cells () const + { + return m_foreign_cells; + } + private: /** * @brief A key for the via cache @@ -1171,9 +1198,11 @@ private: std::map m_via_generators; std::map > m_macro_cells; std::map m_macro_generators; + std::map m_foreign_cells; std::pair open_layer_uncached (db::Layout &layout, const std::string &name, LayerPurpose purpose, unsigned int mask); void map_layer_explicit (const std::string &n, LayerPurpose purpose, const LayerProperties &lp, unsigned int layer, unsigned int mask); + db::cell_index_type foreign_cell(Layout &layout, const std::string &name); }; /** diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc index 9b707373c..c874ab814 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc @@ -32,6 +32,7 @@ #include "dbLEFDEFImporter.h" #include "dbLayoutUtils.h" #include "dbTechnology.h" +#include "dbCellMapping.h" namespace db { @@ -192,6 +193,35 @@ private: tl::log << tl::to_string (tr ("Reading")) << " " << m_stream.source (); importer.read (m_stream, layout, state); + // Resolve unresolved COMPONENT cells + + std::map foreign_cells = state.foreign_cells (); + db::cell_index_type seen = std::numeric_limits::max (); + + std::vector macro_layouts = lefdef_options->macro_layouts (); + for (std::vector::const_iterator m = macro_layouts.begin (); m != macro_layouts.end (); ++m) { + + std::vector target_cells, source_cells; + + // collect the cells to pull in + for (std::map::iterator f = foreign_cells.begin (); f != foreign_cells.end (); ++f) { + if (f->second != seen) { + std::pair cp = (*m)->cell_by_name (f->first.c_str ()); + if (cp.first) { + target_cells.push_back (f->second); + source_cells.push_back (cp.second); + layout.cell (f->second).set_ghost_cell (false); + f->second = seen; + } + } + } + + db::CellMapping cm; + cm.create_multi_mapping_full (layout, target_cells, **m, source_cells); + layout.copy_tree_shapes (**m, cm); + + } + } state.finish (layout); diff --git a/src/plugins/streamers/lefdef/db_plugin/gsiDeclDbLEFDEF.cc b/src/plugins/streamers/lefdef/db_plugin/gsiDeclDbLEFDEF.cc index 4aacdb490..b86a4fd21 100644 --- a/src/plugins/streamers/lefdef/db_plugin/gsiDeclDbLEFDEF.cc +++ b/src/plugins/streamers/lefdef/db_plugin/gsiDeclDbLEFDEF.cc @@ -775,11 +775,14 @@ gsi::Class decl_lefdef_config ("db", "LEFDEFReaderConfi "are three modes available:\n" "\n" "@ul\n" - " @li 0: propduce LEF geometry unless a FOREIGN cell is specified (default) @/li\n" + " @li 0: produce LEF geometry unless a FOREIGN cell is specified (default) @/li\n" " @li 1: produce LEF geometry always and ignore FOREIGN @/li\n" - " @li 2: produce a placeholder cell always (even if FOREIGN isn't given) @/li\n" + " @li 2: Never produce LEF geometry @/li\n" "@/ul\n" "\n" + "If substitution layouts are specified with \\macro_layouts, these are used to provide " + "macro layouts in case no LEF geometry is taken.\n" + "\n" "This property has been added in version 0.27.\n" ) + gsi::method ("macro_resolution_mode=", &db::LEFDEFReaderOptions::set_macro_resolution_mode, gsi::arg ("mode"), @@ -788,6 +791,25 @@ gsi::Class decl_lefdef_config ("db", "LEFDEFReaderConfi "\n" "This property has been added in version 0.27.\n" ) + + gsi::method ("macro_layouts", &db::LEFDEFReaderOptions::macro_layouts, + "@brief Gets the layout objects used for resolving LEF macros in the DEF reader.\n" + "The DEF reader can either use LEF geometry or use a separate source of layouts for the " + "LEF macros. The \\macro_resolution_mode controls whether to use LEF geometry. If LEF geometry is not " + "used, the DEF reader will look up macro cells from the \\macro_layouts and pull cell layouts from there.\n" + "\n" + "The LEF cells are looked up by name from the macro layouts in the order these are given in this array.\n" + "\n" + "This property has been added in version 0.27.\n" + ) + + gsi::method ("macro_layouts=", &db::LEFDEFReaderOptions::set_macro_layouts, + "@brief Sets the layout objects used for resolving LEF macros in the DEF reader.\n" + "See \\macro_layouts for more details about this property.\n" + "\n" + "Layout objects specified in the array for this property are not owned by the \\LEFDEFReaderConfiguration object. " + "Be sure to keep some other reference to these Layout objects if you are storing away the LEF/DEF reader configuration object.\n" + "\n" + "This property has been added in version 0.27.\n" + ) + gsi::method ("lef_files", &db::LEFDEFReaderOptions::lef_files, "@brief Gets the list technology LEF files to additionally import\n" "Returns a list of path names for technology LEF files to read in addition to the primary file. " From b99cbb50e2f63732a605915545208a03d9786455 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sun, 30 Aug 2020 01:57:49 +0200 Subject: [PATCH 090/121] Provide better feedback on invalid layer and property specs in LEF/DEF reader options --- .../lay_plugin/layLEFDEFImportDialogs.cc | 83 ++++++++++++++++++- 1 file changed, 80 insertions(+), 3 deletions(-) diff --git a/src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImportDialogs.cc b/src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImportDialogs.cc index 7693f38c7..1b0e6d2c2 100644 --- a/src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImportDialogs.cc +++ b/src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImportDialogs.cc @@ -340,6 +340,26 @@ END_PROTECTED // ----------------------------------------------------------------------------------------------- // LEFDEF technology components editor +static void +indicate_error (QWidget *le, const tl::Exception *ex) +{ + // by the way, update the foreground color of the cell edit box as well (red, if not valid) + QPalette pl = le->palette (); + if (ex) { + pl.setColor (QPalette::Active, QPalette::Text, Qt::red); + pl.setColor (QPalette::Active, QPalette::Base, QColor (Qt::red).lighter (180)); + le->setToolTip (tl::to_qstring (ex->msg ())); + } else { + QWidget *pw = dynamic_cast (le->parent ()); + tl_assert (pw != 0); + pl.setColor (QPalette::Active, QPalette::Text, pw->palette ().color (QPalette::Text)); + pl.setColor (QPalette::Active, QPalette::Base, pw->palette ().color (QPalette::Base)); + le->setToolTip (QString ()); + } + le->setPalette (pl); +} + + LEFDEFReaderOptionsEditor::LEFDEFReaderOptionsEditor (QWidget *parent) : lay::StreamReaderOptionsPage (parent), mp_tech (0) { @@ -377,6 +397,8 @@ LEFDEFReaderOptionsEditor::commit (db::FormatSpecificReaderOptions *options, con return; } + bool has_error = false; + data->set_read_all_layers (read_all_cbx->isChecked ()); data->set_layer_map (layer_map->get_layer_map ()); data->set_produce_net_names (produce_net_names->isChecked ()); @@ -391,33 +413,88 @@ LEFDEFReaderOptionsEditor::commit (db::FormatSpecificReaderOptions *options, con data->set_dbu (dbu_value); // parse the net property name (may throw an exception) - { + try { std::string np = tl::to_string (net_prop_name->text ()); tl::Extractor ex (np.c_str ()); tl::Variant v; ex.read (v); ex.expect_end (); data->set_net_property_name (v); + indicate_error (net_prop_name, 0); + } catch (tl::Exception &ex) { + indicate_error (net_prop_name, &ex); + has_error = true; } // parse the inst property name (may throw an exception) - { + try { std::string np = tl::to_string (inst_prop_name->text ()); tl::Extractor ex (np.c_str ()); tl::Variant v; ex.read (v); ex.expect_end (); data->set_inst_property_name (v); + indicate_error (inst_prop_name, 0); + } catch (tl::Exception &ex) { + indicate_error (inst_prop_name, &ex); + has_error = true; } // parse the pin property name (may throw an exception) - { + try { std::string np = tl::to_string (pin_prop_name->text ()); tl::Extractor ex (np.c_str ()); tl::Variant v; ex.read (v); ex.expect_end (); data->set_pin_property_name (v); + indicate_error (pin_prop_name, 0); + } catch (tl::Exception &ex) { + indicate_error (pin_prop_name, &ex); + has_error = true; + } + + // check the outline layer spec + try { + db::LayerProperties lp; + std::string s = tl::to_string (outline_layer->text ()); + tl::Extractor ex (s.c_str ()); + lp.read (ex); + ex.expect_end (); + indicate_error (outline_layer, 0); + } catch (tl::Exception &ex) { + indicate_error (outline_layer, &ex); + has_error = true; + } + + // check the region layer spec + try { + db::LayerProperties lp; + std::string s = tl::to_string (region_layer->text ()); + tl::Extractor ex (s.c_str ()); + lp.read (ex); + ex.expect_end (); + indicate_error (region_layer, 0); + } catch (tl::Exception &ex) { + indicate_error (region_layer, &ex); + has_error = true; + } + + // check the blockage layer spec + try { + db::LayerProperties lp; + std::string s = tl::to_string (placement_blockage_layer->text ()); + tl::Extractor ex (s.c_str ()); + lp.read (ex); + ex.expect_end (); + indicate_error (placement_blockage_layer, 0); + } catch (tl::Exception &ex) { + indicate_error (placement_blockage_layer, &ex); + has_error = true; + } + + if (has_error) { + throw tl::Exception (tl::to_string (tr ("Some values are not correct - see highlighted entry fields"))); } data->set_produce_cell_outlines (produce_outlines->isChecked ()); From 28cf0853b1b1b2cf4a8e3df29e1496fc9fc49afb Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sun, 30 Aug 2020 02:15:30 +0200 Subject: [PATCH 091/121] Restored previous behavior for FOREIGN cell resolution. --- .../lefdef/db_plugin/dbLEFDEFImporter.cc | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc index 5186b8a15..c4628b38c 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc @@ -1365,12 +1365,20 @@ LEFDEFReaderState::foreign_cell (Layout &layout, const std::string &name) std::map::const_iterator c = m_foreign_cells.find (name); if (c != m_foreign_cells.end ()) { return c->second; - } else { - db::cell_index_type ci = layout.add_cell (name.c_str ()); - layout.cell (ci).set_ghost_cell (true); - m_foreign_cells.insert (std::make_pair (name, ci)); - return ci; } + + std::pair cc = layout.cell_by_name (name.c_str ()); + + db::cell_index_type ci; + if (cc.first) { + ci = cc.second; + } else { + ci = layout.add_cell (name.c_str ()); + layout.cell (ci).set_ghost_cell (true); + } + + m_foreign_cells.insert (std::make_pair (name, ci)); + return ci; } std::pair From be6a351385f168b14863a26c64416df7a1cdd4b1 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sun, 30 Aug 2020 23:29:44 +0200 Subject: [PATCH 092/121] Updated testdata after unused vias do no longer show up in imported DEF files. --- .../streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc index 3c4fb1003..93921cac8 100644 --- a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc +++ b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc @@ -296,9 +296,9 @@ TEST(18) { db::LEFDEFReaderOptions options = default_options (); options.set_separate_groups (true); - run_test (_this, "def9", "lef:tech.lef+lef:cells_modified.lef+def:in.def", "au.oas.gz", options); + run_test (_this, "def9", "lef:tech.lef+lef:cells_modified.lef+def:in.def", "au-new.oas.gz", options); - run_test (_this, "def9", "lef:tech.lef+lef:cells_modified.lef+def:in.def", "au_nogroups.oas.gz", default_options ()); + run_test (_this, "def9", "lef:tech.lef+lef:cells_modified.lef+def:in.def", "au_nogroups-new.oas.gz", default_options ()); } TEST(19) @@ -319,7 +319,7 @@ TEST(21) { db::LEFDEFReaderOptions opt = default_options (); opt.set_cell_outline_layer ("OUTLINE (20/0)"); - run_test (_this, "def12", "lef:test.lef+def:test.def", "au.oas.gz", opt); + run_test (_this, "def12", "lef:test.lef+def:test.def", "au-new.oas.gz", opt); } TEST(22) From 77a92532734cad05360cbf76052b52a6a2e2d5f0 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sun, 30 Aug 2020 17:08:39 +0200 Subject: [PATCH 093/121] WIP: Provide a generic include file expansion mechanism, basic class. --- src/lym/lym/lym.pro | 2 + src/lym/lym/lymInclude.cpp | 189 ++++++++++++++++++++++++++ src/lym/lym/lymInclude.h | 99 ++++++++++++++ src/lym/unit_tests/lymBasicTests.cc | 33 ----- src/lym/unit_tests/lymIncludeTests.cc | 104 ++++++++++++++ src/lym/unit_tests/unit_tests.pro | 2 +- src/tl/tl/tlStream.cc | 1 + testdata/lym/.inc1.txt.swp | Bin 0 -> 12288 bytes testdata/lym/.x_inc3_ip.txt.swp | Bin 0 -> 12288 bytes testdata/lym/inc1.txt | 1 + testdata/lym/inc2.txt | 2 + testdata/lym/inc3.txt | 3 + testdata/lym/x.txt | 2 + testdata/lym/x_inc1.txt | 3 + testdata/lym/x_inc3.txt | 3 + testdata/lym/x_inc3_ip.txt | 3 + 16 files changed, 413 insertions(+), 34 deletions(-) create mode 100644 src/lym/lym/lymInclude.cpp create mode 100644 src/lym/lym/lymInclude.h delete mode 100644 src/lym/unit_tests/lymBasicTests.cc create mode 100644 src/lym/unit_tests/lymIncludeTests.cc create mode 100644 testdata/lym/.inc1.txt.swp create mode 100644 testdata/lym/.x_inc3_ip.txt.swp create mode 100644 testdata/lym/inc1.txt create mode 100644 testdata/lym/inc2.txt create mode 100644 testdata/lym/inc3.txt create mode 100644 testdata/lym/x.txt create mode 100644 testdata/lym/x_inc1.txt create mode 100644 testdata/lym/x_inc3.txt create mode 100644 testdata/lym/x_inc3_ip.txt diff --git a/src/lym/lym/lym.pro b/src/lym/lym/lym.pro index 24a21587b..ea352c597 100644 --- a/src/lym/lym/lym.pro +++ b/src/lym/lym/lym.pro @@ -8,11 +8,13 @@ DEFINES += MAKE_LYM_LIBRARY SOURCES = \ gsiDeclLymMacro.cc \ + lymInclude.cpp \ lymMacroInterpreter.cc \ lymMacro.cc \ HEADERS = \ lymCommon.h \ + lymInclude.h \ lymMacroInterpreter.h \ lymMacro.h \ diff --git a/src/lym/lym/lymInclude.cpp b/src/lym/lym/lymInclude.cpp new file mode 100644 index 000000000..b48de2c56 --- /dev/null +++ b/src/lym/lym/lymInclude.cpp @@ -0,0 +1,189 @@ + +/* + + KLayout Layout Viewer + Copyright (C) 2006-2020 Matthias Koefferlein + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +*/ + +#include "lymInclude.h" + +#include "tlAssert.h" +#include "tlString.h" +#include "tlFileUtils.h" +#include "tlStream.h" +#include "tlExpression.h" +#include "tlUri.h" + +namespace lym +{ + +static const char *valid_fn_chars = "@_:,.\\/-+"; + +IncludeExpander::IncludeExpander () +{ + // .. nothing yet .. +} + +IncludeExpander +IncludeExpander::expand (const std::string &path, std::string &expanded_text) +{ + IncludeExpander ie; + int lc = 1; + read (path, expanded_text, ie, lc); + return ie; +} + +void +IncludeExpander::read (const std::string &path, std::string &expanded_text, IncludeExpander &ie, int &line_counter) +{ + ie.m_sections [line_counter] = std::make_pair (path, 1 - line_counter); + + tl::InputStream is (path); + tl::TextInputStream text (is); + + int lnum = 0; + bool emit_section = false; + + while (! text.at_end ()) { + + std::string l = text.get_line (); + ++lnum; + + tl::Extractor ex (l.c_str ()); + if (ex.test ("#") && ex.test ("%include")) { + + std::string include_path = tl::trim (ex.skip ()); + + // allow some customization by employing expression interpolation + include_path = tl::Eval ().interpolate (include_path); + + // NOTE: by using URI's we can basically read from HTTP etc. + tl::URI current_uri (path); + tl::URI new_uri (include_path); + if (current_uri.scheme ().empty () && new_uri.scheme ().empty ()) { + if (! tl::is_absolute (include_path)) { + include_path = tl::combine_path (tl::dirname (path), include_path); + } + } else { + include_path = current_uri.resolved (new_uri).to_string (); + } + + read (include_path, expanded_text, ie, line_counter); + + emit_section = true; + + } else { + + if (emit_section) { + emit_section = false; + ie.m_sections [line_counter] = std::make_pair (path, lnum - line_counter); + } + + expanded_text += l; + expanded_text += "\n"; + ++line_counter; + + } + + } +} + +std::string +IncludeExpander::to_string () const +{ + if (m_sections.empty ()) { + + return std::string (); + + } else if (m_sections.size () == 1) { + + tl_assert (m_sections.begin ()->first == 1); + tl_assert (m_sections.begin ()->second.second == 0); + + std::string fn = m_sections.begin ()->second.first; + return tl::to_word_or_quoted_string (fn, valid_fn_chars); + + } else { + + // "@" indicates a mapping table + std::string res ("@"); + + for (std::map >::const_iterator m = m_sections.begin (); m != m_sections.end (); ++m) { + res += tl::to_string (m->first); + res += ":"; + res += tl::to_word_or_quoted_string (m->second.first, valid_fn_chars); + res += "*"; + res += tl::to_string (m->second.second); + res += ";"; + } + + return res; + + } +} + +IncludeExpander +IncludeExpander::from_string (const std::string &s) +{ + IncludeExpander ie; + + tl::Extractor ex (s.c_str ()); + + if (ex.test ("@")) { + + while (! ex.at_end ()) { + + int ln = 0; + ex.read (ln); + + std::pair &si = ie.m_sections [ln]; + + ex.expect (":"); + ex.read_word_or_quoted (si.first, valid_fn_chars); + ex.expect ("*"); + ex.read (si.second); + + ex.test (";"); + + } + + } else { + + ex.read_word_or_quoted (ie.m_sections [1].first, valid_fn_chars); + ex.expect_end (); + + } + + return ie; +} + +std::pair +IncludeExpander::translate_to_original (int line_number) +{ + std::map >::const_iterator m = m_sections.lower_bound (line_number); + if (m != m_sections.begin () && (m == m_sections.end () || m->first > line_number)) { + --m; + } + if (m == m_sections.end ()) { + return std::make_pair (std::string (), 0); + } else { + return std::make_pair (m->second.first, line_number + m->second.second); + } +} + +} diff --git a/src/lym/lym/lymInclude.h b/src/lym/lym/lymInclude.h new file mode 100644 index 000000000..5e92e70bb --- /dev/null +++ b/src/lym/lym/lymInclude.h @@ -0,0 +1,99 @@ + +/* + + KLayout Layout Viewer + Copyright (C) 2006-2020 Matthias Koefferlein + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +*/ + + +#ifndef HDR_lymInclude +#define HDR_lymInclude + +#include "lymCommon.h" + +#include +#include + +namespace lym +{ + +/** + * @brief Provide the basic include expansion and file/line mapping mechanism + * + * The Expander object performs the file expansion and also stores the information + * required for translating back file names and line numbers. + * + * Include expansion happens through a pseudo-comment "# %include ..." which + * takes a file path as the argument. File paths are always resolved relative to + * the original file. + * The file path is expression-interpolated, hence can access environment variables + * through $(env("HOME")) for example. + */ +class LYM_PUBLIC IncludeExpander +{ +public: + /** + * @brief The default constructor + */ + IncludeExpander (); + + /** + * @brief Provides include expansion + * + * This method will deliver the expanded text and the include expander object. + */ + static IncludeExpander expand (const std::string &path, std::string &expanded_text); + + /** + * @brief Serializes the include expander information into a string + * + * If no include expansion happened, the serialized string will be the original file path. + * Otherwise it's a "@"-prefixed string. + */ + std::string to_string () const; + + /** + * @brief Deserializes the include expander information from a string + */ + static IncludeExpander from_string (const std::string &s); + + /** + * @brief Provides translation of the expanded text's line number to filename/line number for the original file + */ + std::pair translate_to_original (int line_number); + + /** + * @brief Provides translation of original file name/line number to included file name/line number + */ + static std::pair translate_to_original (const std::string &file, int line_number) + { + IncludeExpander ie; + ie.from_string (file); + return ie.translate_to_original (line_number); + } + +public: + std::map > m_sections; + + static void read (const std::string &path, std::string &expanded_text, IncludeExpander &ie, int &line_counter); +}; + +} + +#endif + diff --git a/src/lym/unit_tests/lymBasicTests.cc b/src/lym/unit_tests/lymBasicTests.cc deleted file mode 100644 index 171a15e0d..000000000 --- a/src/lym/unit_tests/lymBasicTests.cc +++ /dev/null @@ -1,33 +0,0 @@ - -/* - - KLayout Layout Viewer - Copyright (C) 2006-2020 Matthias Koefferlein - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -*/ - - -#include "tlUnitTest.h" - -TEST(1) -{ - EXPECT_EQ (1, 1); // avoids a compiler warning because of unreferenced _this - - // TODO: add tests for lym specific things - throw tl::CancelException (); // skip this test to indicate that there is nothing yet -} - diff --git a/src/lym/unit_tests/lymIncludeTests.cc b/src/lym/unit_tests/lymIncludeTests.cc new file mode 100644 index 000000000..8ee13fdff --- /dev/null +++ b/src/lym/unit_tests/lymIncludeTests.cc @@ -0,0 +1,104 @@ + +/* + + KLayout Layout Viewer + Copyright (C) 2006-2020 Matthias Koefferlein + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +*/ + + +#include "tlUnitTest.h" +#include "tlFileUtils.h" +#include "lymInclude.h" + +TEST(1_simple) +{ + std::string fn = tl::testsrc () + "/testdata/lym/x.txt"; + + std::string et; + lym::IncludeExpander ie = lym::IncludeExpander::expand (fn, et); + EXPECT_EQ (et, "A line\nAnother line\n"); + EXPECT_EQ (ie.to_string (), fn); + EXPECT_EQ (lym::IncludeExpander::from_string (ie.to_string ()).to_string (), ie.to_string ()); + + EXPECT_EQ (ie.translate_to_original (2).first, fn); + EXPECT_EQ (ie.translate_to_original (2).second, 2); +} + +TEST(2_single_include) +{ + std::string fn = tl::testsrc () + "/testdata/lym/x_inc1.txt"; + + std::string et; + lym::IncludeExpander ie = lym::IncludeExpander::expand (fn, et); + EXPECT_EQ (et, "A line\nincluded.1\nAnother line\n"); + + EXPECT_EQ (ie.to_string (), "@1:" + tl::testsrc () + "/testdata/lym/x_inc1.txt*0;2:" + tl::testsrc () + "/testdata/lym/inc1.txt*-1;3:" + tl::testsrc () + "/testdata/lym/x_inc1.txt*0;"); + EXPECT_EQ (lym::IncludeExpander::from_string (ie.to_string ()).to_string (), ie.to_string ()); + + EXPECT_EQ (ie.translate_to_original (1).first, fn); + EXPECT_EQ (ie.translate_to_original (1).second, 1); + EXPECT_EQ (ie.translate_to_original (2).first, tl::testsrc () + "/testdata/lym/inc1.txt"); + EXPECT_EQ (ie.translate_to_original (2).second, 1); + EXPECT_EQ (ie.translate_to_original (3).first, fn); + EXPECT_EQ (ie.translate_to_original (3).second, 3); +} + +TEST(3_multi_include) +{ + std::string fn = tl::testsrc () + "/testdata/lym/x_inc3.txt"; + + std::string et; + lym::IncludeExpander ie = lym::IncludeExpander::expand (fn, et); + EXPECT_EQ (et, "A line\ninclude.3a\nincluded.2a\nincluded.2b\ninclude.3b\nAnother line\n"); + + EXPECT_EQ (lym::IncludeExpander::from_string (ie.to_string ()).to_string (), ie.to_string ()); + + EXPECT_EQ (ie.translate_to_original (1).first, fn); + EXPECT_EQ (ie.translate_to_original (1).second, 1); + EXPECT_EQ (ie.translate_to_original (2).first, tl::testsrc () + "/testdata/lym/inc3.txt"); + EXPECT_EQ (ie.translate_to_original (2).second, 1); + EXPECT_EQ (ie.translate_to_original (3).first, tl::testsrc () + "/testdata/lym/inc2.txt"); + EXPECT_EQ (ie.translate_to_original (3).second, 1); + EXPECT_EQ (ie.translate_to_original (5).first, tl::testsrc () + "/testdata/lym/inc3.txt"); + EXPECT_EQ (ie.translate_to_original (5).second, 3); + EXPECT_EQ (ie.translate_to_original (6).first, fn); + EXPECT_EQ (ie.translate_to_original (6).second, 3); +} + +TEST(4_multi_include_interpolate) +{ + std::string fn = tl::testsrc () + "/testdata/lym/x_inc3_ip.txt"; + + std::string et; + lym::IncludeExpander ie = lym::IncludeExpander::expand (fn, et); + EXPECT_EQ (et, "A line\ninclude.3a\nincluded.2a\nincluded.2b\ninclude.3b\nAnother line\n"); + + EXPECT_EQ (lym::IncludeExpander::from_string (ie.to_string ()).to_string (), ie.to_string ()); + + EXPECT_EQ (ie.translate_to_original (1).first, fn); + EXPECT_EQ (ie.translate_to_original (1).second, 1); + EXPECT_EQ (ie.translate_to_original (2).first, tl::testsrc () + "/testdata/lym/inc3.txt"); + EXPECT_EQ (ie.translate_to_original (2).second, 1); + EXPECT_EQ (ie.translate_to_original (3).first, tl::testsrc () + "/testdata/lym/inc2.txt"); + EXPECT_EQ (ie.translate_to_original (3).second, 1); + EXPECT_EQ (ie.translate_to_original (5).first, tl::testsrc () + "/testdata/lym/inc3.txt"); + EXPECT_EQ (ie.translate_to_original (5).second, 3); + EXPECT_EQ (ie.translate_to_original (6).first, fn); + EXPECT_EQ (ie.translate_to_original (6).second, 3); +} + diff --git a/src/lym/unit_tests/unit_tests.pro b/src/lym/unit_tests/unit_tests.pro index 9c62e03a9..af122a402 100644 --- a/src/lym/unit_tests/unit_tests.pro +++ b/src/lym/unit_tests/unit_tests.pro @@ -7,7 +7,7 @@ TARGET = lym_tests include($$PWD/../../lib_ut.pri) SOURCES = \ - lymBasicTests.cc \ + lymIncludeTests.cc INCLUDEPATH += $$LYM_INC $$TL_INC $$GSI_INC DEPENDPATH += $$LYM_INC $$TL_INC $$GSI_INC diff --git a/src/tl/tl/tlStream.cc b/src/tl/tl/tlStream.cc index 83271e5d7..3d77ff3d4 100644 --- a/src/tl/tl/tlStream.cc +++ b/src/tl/tl/tlStream.cc @@ -475,6 +475,7 @@ TextInputStream::get_char () return 0; } else if (*c != '\r' && *c) { if (*c == '\n') { + peek_char (); // sets at_end if there is no more character ++m_next_line; } return *c; diff --git a/testdata/lym/.inc1.txt.swp b/testdata/lym/.inc1.txt.swp new file mode 100644 index 0000000000000000000000000000000000000000..7854dba15fdca94399bfff8facd477628bfdef60 GIT binary patch literal 12288 zcmeI&F>3-b6u|L!-Nn+b4r-?k8c!Yk3L+hKDwNo}qIjo=_YQQ?59a6S=Wx-z3DmLb zdi4JwgybcG_uE1;?M#Mm^+7un7mp&ZhtWr`_8#<)BB@oK&28>e*J75n5}WBNySB*X zc9#RqBC*?5p(eGt#%rT-u8~!1l5J|{%g?Z_8@+KDX#^0sU!c&h)}SK2ZrJggUYd>i z^V9hL{j5X)0R#|0009ILKmdW#3uqR|-c|ANTS@RoU;08R009ILKmY**5I_I{1Q0*~ zfqyJuBa!c_$k{dj{(rgu`|-)o5eOiF00IagfB*srAb>Li5IL=wy|+81aS{dWZa3I7H0AMihL zcJrd?;!r!Pd>@3z<-I$&&vx8hbuUiG?y%#FjV+Ofr?X(Nd+7|`L^7iqCuUlgmPK5) zQ&VbDE^D&2yTyXuZEEI4rCw&H8cjTnrWzVGUOLabS&-z{{U9kjI@2Fkq>KOpD+yG3 z(;jX}zvp-B{?`7UyR&`1(o~udKmY**5I_I{1Q0;re+X#l$i3alTC<(?COhA9GbAB^ z00IagfB*srAb Date: Sun, 30 Aug 2020 19:56:51 +0200 Subject: [PATCH 094/121] WIP: allow breakpoints for files with includes and inside includes --- src/lay/lay/layMacroEditorDialog.cc | 73 +++++++++++++++++- src/lay/lay/layMacroEditorDialog.h | 5 ++ src/lym/lym/gsiDeclLymMacro.cc | 31 +++++++- src/lym/lym/lym.pro | 1 - src/lym/lym/lymMacro.cc | 11 ++- src/lym/lym/lymMacroInterpreter.cc | 29 ++++++- src/lym/lym/lymMacroInterpreter.h | 12 +++ src/lym/unit_tests/lymBasicTests.cc | 31 ++++++++ src/lym/unit_tests/unit_tests.pro | 2 +- src/tl/tl/tl.pro | 2 + .../lym/lymInclude.cpp => tl/tl/tlInclude.cc} | 28 +++++-- .../lym/lymInclude.h => tl/tl/tlInclude.h} | 28 ++++--- src/tl/tl/tlScriptError.cc | 57 ++++++++++++-- src/tl/tl/tlScriptError.h | 17 ++-- .../unit_tests/tlIncludeTests.cc} | 43 ++++++----- src/tl/unit_tests/unit_tests.pro | 1 + testdata/lym/.x_inc3_ip.txt.swp | Bin 12288 -> 0 bytes testdata/{lym => tl}/.inc1.txt.swp | Bin testdata/{lym => tl}/inc1.txt | 0 testdata/{lym => tl}/inc2.txt | 0 testdata/{lym => tl}/inc3.txt | 0 testdata/{lym => tl}/x.txt | 0 testdata/{lym => tl}/x_inc1.txt | 0 testdata/{lym => tl}/x_inc3.txt | 0 testdata/{lym => tl}/x_inc3_ip.txt | 0 25 files changed, 311 insertions(+), 60 deletions(-) create mode 100644 src/lym/unit_tests/lymBasicTests.cc rename src/{lym/lym/lymInclude.cpp => tl/tl/tlInclude.cc} (86%) rename src/{lym/lym/lymInclude.h => tl/tl/tlInclude.h} (79%) rename src/{lym/unit_tests/lymIncludeTests.cc => tl/unit_tests/tlIncludeTests.cc} (68%) delete mode 100644 testdata/lym/.x_inc3_ip.txt.swp rename testdata/{lym => tl}/.inc1.txt.swp (100%) rename testdata/{lym => tl}/inc1.txt (100%) rename testdata/{lym => tl}/inc2.txt (100%) rename testdata/{lym => tl}/inc3.txt (100%) rename testdata/{lym => tl}/x.txt (100%) rename testdata/{lym => tl}/x_inc1.txt (100%) rename testdata/{lym => tl}/x_inc3.txt (100%) rename testdata/{lym => tl}/x_inc3_ip.txt (100%) diff --git a/src/lay/lay/layMacroEditorDialog.cc b/src/lay/lay/layMacroEditorDialog.cc index 1b33d9429..c9e1e2dce 100644 --- a/src/lay/lay/layMacroEditorDialog.cc +++ b/src/lay/lay/layMacroEditorDialog.cc @@ -44,6 +44,7 @@ #include "tlClassRegistry.h" #include "tlExceptions.h" #include "tlFileUtils.h" +#include "tlInclude.h" #include #include @@ -2781,6 +2782,9 @@ MacroEditorDialog::start_exec (gsi::Interpreter *ec) } m_file_to_widget.clear (); + m_include_expanders.clear (); + m_include_paths_to_ids.clear (); + m_include_file_id_cache.clear (); m_last_process_events = tl::Clock::current (); @@ -2825,6 +2829,7 @@ MacroEditorDialog::end_exec (gsi::Interpreter *ec) do_update_ui_to_run_mode (); } +const size_t pseudo_file_offset = std::numeric_limits::max () / 2; size_t MacroEditorDialog::id_for_path (gsi::Interpreter *, const std::string &path) @@ -2840,8 +2845,66 @@ MacroEditorDialog::id_for_path (gsi::Interpreter *, const std::string &path) if (macro) { m_file_to_widget.push_back (std::make_pair (macro, (MacroEditorPage *) 0)); return m_file_to_widget.size (); - } else { - return 0; + } + + if (! path.empty () && path[0] == '@') { + m_include_expanders.push_back (tl::IncludeExpander::from_string (path)); + return pseudo_file_offset + m_include_expanders.size () - 1; + } + + return 0; +} + +void +MacroEditorDialog::translate_pseudo_id (size_t &file_id, int &line) +{ + if (file_id >= pseudo_file_offset) { + + file_id -= pseudo_file_offset; + + std::pair ck (file_id, line); + + std::map, std::pair >::iterator ic = m_include_file_id_cache.find (ck); + if (ic != m_include_file_id_cache.end ()) { + + file_id = ic->second.first; + line = ic->second.second; + + } else { + + if (file_id < m_include_expanders.size ()) { + + std::pair fp = m_include_expanders [file_id].translate_to_original (line); + line = fp.second; + + std::map::const_iterator i = m_include_paths_to_ids.find (fp.first); + if (i == m_include_paths_to_ids.end ()) { + + size_t new_id = id_for_path (0, fp.first); + if (new_id < pseudo_file_offset) { + file_id = new_id; + } else { + file_id = 0; + } + + m_include_paths_to_ids.insert (std::make_pair (fp.first, file_id)); + + } else { + file_id = i->second; + } + + } else { + + // give up. + file_id = 0; + line = 0; + + } + + m_include_file_id_cache.insert (std::make_pair (ck, std::make_pair (file_id, line))); + + } + } } @@ -2862,6 +2925,9 @@ MacroEditorDialog::exception_thrown (gsi::Interpreter *interpreter, size_t file_ return; } + // translate the pseudo file ID and line to the real one (include file processing) + translate_pseudo_id (file_id, line); + try { // If the exception is thrown in code that is inside a file managed by the macro collection, @@ -2958,6 +3024,9 @@ MacroEditorDialog::trace (gsi::Interpreter *interpreter, size_t file_id, int lin m_current_stack_depth = stack_trace_provider->stack_depth (); } + // translate the pseudo file ID and line to the real one (include file processing) + translate_pseudo_id (file_id, line); + // Note: only scripts running in the context of the execution controller (the one who called start_exec) // can be interrupted and single-stepped, but breakpoints can make the debugger stop in other interpreters. if (file_id > 0 && ((interpreter == mp_exec_controller && m_stop_stack_depth >= 0 && stack_trace_provider->stack_depth () <= m_stop_stack_depth) || diff --git a/src/lay/lay/layMacroEditorDialog.h b/src/lay/lay/layMacroEditorDialog.h index 161d130f9..1bb2ebb34 100644 --- a/src/lay/lay/layMacroEditorDialog.h +++ b/src/lay/lay/layMacroEditorDialog.h @@ -35,6 +35,7 @@ #include "tlFileSystemWatcher.h" #include "tlDeferredExecution.h" #include "tlScriptError.h" +#include "tlInclude.h" #include "lymMacro.h" #include "gsiInterpreter.h" @@ -290,6 +291,7 @@ private: void select_trace (size_t index); bool configure (const std::string &name, const std::string &value); void config_finalize (); + void translate_pseudo_id (size_t &file_id, int &line); lay::Dispatcher *mp_plugin_root; lym::MacroCollection *mp_root; @@ -312,6 +314,9 @@ private: QTextCharFormat m_stderr_format; MacroEditorHighlighters m_highlighters; std::vector > m_file_to_widget; + std::vector m_include_expanders; + std::map m_include_paths_to_ids; + std::map, std::pair > m_include_file_id_cache; std::vector m_macro_trees; bool m_in_exec, m_in_breakpoint; gsi::Interpreter *mp_exec_controller, *mp_current_interpreter; diff --git a/src/lym/lym/gsiDeclLymMacro.cc b/src/lym/lym/gsiDeclLymMacro.cc index b2a23070d..a08d2c7f5 100644 --- a/src/lym/lym/gsiDeclLymMacro.cc +++ b/src/lym/lym/gsiDeclLymMacro.cc @@ -30,6 +30,7 @@ #include "tlClassRegistry.h" #include "tlFileUtils.h" +#include "tlInclude.h" #include @@ -101,7 +102,7 @@ class MacroInterpreter public: MacroInterpreter () : lym::MacroInterpreter (), - mp_registration (0) + mp_registration (0), m_supports_include_expansion (true) { m_suffix = lym::MacroInterpreter::suffix (); m_description = lym::MacroInterpreter::description (); @@ -120,6 +121,15 @@ public: m_templates.clear (); } + std::pair include_expansion (const lym::Macro *macro) + { + if (m_supports_include_expansion) { + return MacroInterpreter::include_expansion (macro); + } else { + return std::pair (macro->path (), macro->text ()); + } + } + void register_gsi (const char *name) { // makes the object owned by the C++ side @@ -139,6 +149,16 @@ public: } } + void set_supports_include_expansion (bool f) + { + m_supports_include_expansion = f; + } + + virtual bool supports_include_expansion () const + { + return m_supports_include_expansion; + } + void set_storage_scheme (int scheme) { m_storage_scheme = lym::Macro::Format (scheme); @@ -231,6 +251,7 @@ private: lym::Macro::Interpreter m_debugger_scheme; std::string m_suffix; std::string m_description; + bool m_supports_include_expansion; }; int const_PlainTextFormat () @@ -294,6 +315,14 @@ Class decl_MacroInterpreter ("lay", "MacroInterpreter", "\n" "This method must be called after \\register has called.\n" ) + + gsi::method ("supports_include_expansion=", &MacroInterpreter::set_supports_include_expansion, gsi::arg ("flag"), + "@brief Sets a value indicating whether this interpreter supports the default include file expansion scheme.\n" + "If this value is set to true (the default), lines like '# %include ...' will be substituted by the " + "content of the file following the '%include' keyword.\n" + "Set this value to false if you don't want to support this feature.\n" + "\n" + "This attribute has been introduced in version 0.27.\n" + ) + gsi::method ("syntax_scheme=", &gsi::MacroInterpreter::set_syntax_scheme, gsi::arg ("scheme"), "@brief Sets a string indicating the syntax highlighter scheme\n" "\n" diff --git a/src/lym/lym/lym.pro b/src/lym/lym/lym.pro index ea352c597..18dff3666 100644 --- a/src/lym/lym/lym.pro +++ b/src/lym/lym/lym.pro @@ -8,7 +8,6 @@ DEFINES += MAKE_LYM_LIBRARY SOURCES = \ gsiDeclLymMacro.cc \ - lymInclude.cpp \ lymMacroInterpreter.cc \ lymMacro.cc \ diff --git a/src/lym/lym/lymMacro.cc b/src/lym/lym/lymMacro.cc index 0c00c2847..888bc7445 100644 --- a/src/lym/lym/lymMacro.cc +++ b/src/lym/lym/lymMacro.cc @@ -33,6 +33,7 @@ #include "tlLog.h" #include "tlXMLParser.h" #include "tlGlobPattern.h" +#include "tlInclude.h" #include "rba.h" #include "pya.h" @@ -1020,20 +1021,28 @@ int Macro::run () const } try { + gsi::Interpreter *ip = script_interpreter (interpreter ()); if (ip) { + if (! prolog ().empty ()) { ip->eval_string (prolog ().c_str ()); } - ip->eval_string (text ().c_str (), path ().c_str (), 1); + + std::string expanded_text; + tl::IncludeExpander ie = tl::IncludeExpander::expand (path (), text (), expanded_text); + ip->eval_string (expanded_text.c_str (), ie.to_string ().c_str (), 1); + if (! epilog ().empty ()) { ip->eval_string (epilog ().c_str ()); } + } else if (interpreter () == lym::Macro::DSLInterpreter) { lym::MacroInterpreter::execute_macro (this); } else { throw tl::Exception (tl::to_string (tr ("Can't run macro (no interpreter): ")) + path ()); } + } catch (tl::ExitException &ex) { return ex.status (); } diff --git a/src/lym/lym/lymMacroInterpreter.cc b/src/lym/lym/lymMacroInterpreter.cc index c26c04ac7..3e778bf0c 100644 --- a/src/lym/lym/lymMacroInterpreter.cc +++ b/src/lym/lym/lymMacroInterpreter.cc @@ -27,6 +27,7 @@ #include "tlInternational.h" #include "tlException.h" #include "tlClassRegistry.h" +#include "tlInclude.h" namespace lym { @@ -48,13 +49,39 @@ MacroInterpreter::can_run (const lym::Macro *macro) return false; } +std::pair +MacroInterpreter::include_expansion (const lym::Macro *macro) +{ + std::pair res; + res.first = tl::IncludeExpander::expand (macro->path (), macro->text (), res.second).to_string (); + return res; +} + void MacroInterpreter::execute_macro (const lym::Macro *macro) { for (tl::Registrar::iterator cls = tl::Registrar::begin (); cls != tl::Registrar::end (); ++cls) { + if (cls.current_name () == macro->dsl_interpreter ()) { - cls->execute (macro); + + std::pair et = cls->include_expansion (macro); + if (et.first.empty () || et.first == macro->path ()) { + + cls->execute (macro); + + } else { + + // provide a copy which takes the include-expanded version + lym::Macro tmp_macro; + tmp_macro.assign (*macro); + tmp_macro.set_text (et.second); + tmp_macro.set_file_path (et.first); + cls->execute (&tmp_macro); + + } + return; + } } diff --git a/src/lym/lym/lymMacroInterpreter.h b/src/lym/lym/lymMacroInterpreter.h index 8c1720c2e..98799df41 100644 --- a/src/lym/lym/lymMacroInterpreter.h +++ b/src/lym/lym/lymMacroInterpreter.h @@ -138,6 +138,18 @@ public: // .. nothing yet .. } + /** + * @brief Provides generic include file expansion + * + * This method takes a given macro and substitutes include statements of the form '# %include ...' by the + * content of the respective file. Recursive include is supported. + * The return value of this method is a two-element array with two strings: the first one is a path string which + * holds the encoded information for translating back path/line number information into the original paths and + * line numbers. This first string needs to be passed to the actual script interpreter as the 'file path'. The + * second component of the returned array is the text of the macro with the include files substituted. + */ + virtual std::pair include_expansion (const lym::Macro *macro); + /** * @brief Runs the script for the DSL interpreter with the given name * diff --git a/src/lym/unit_tests/lymBasicTests.cc b/src/lym/unit_tests/lymBasicTests.cc new file mode 100644 index 000000000..e027ccbd5 --- /dev/null +++ b/src/lym/unit_tests/lymBasicTests.cc @@ -0,0 +1,31 @@ + +/* + + KLayout Layout Viewer + Copyright (C) 2006-2018 Matthias Koefferlein + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +*/ + + +#include "tlUnitTest.h" + +TEST(1) +{ + // TODO: add tests for lym specific things + throw tl::CancelException (); // skip this test to indicate that there is nothing yet +} + diff --git a/src/lym/unit_tests/unit_tests.pro b/src/lym/unit_tests/unit_tests.pro index af122a402..2bc16943b 100644 --- a/src/lym/unit_tests/unit_tests.pro +++ b/src/lym/unit_tests/unit_tests.pro @@ -7,7 +7,7 @@ TARGET = lym_tests include($$PWD/../../lib_ut.pri) SOURCES = \ - lymIncludeTests.cc + lymBasicTests.cc INCLUDEPATH += $$LYM_INC $$TL_INC $$GSI_INC DEPENDPATH += $$LYM_INC $$TL_INC $$GSI_INC diff --git a/src/tl/tl/tl.pro b/src/tl/tl/tl.pro index 7ab83679f..fde7e7494 100644 --- a/src/tl/tl/tl.pro +++ b/src/tl/tl/tl.pro @@ -20,6 +20,7 @@ SOURCES = \ tlGlobPattern.cc \ tlHeap.cc \ tlHttpStream.cc \ + tlInclude.cc \ tlInternational.cc \ tlLog.cc \ tlObject.cc \ @@ -63,6 +64,7 @@ HEADERS = \ tlGlobPattern.h \ tlHeap.h \ tlHttpStream.h \ + tlInclude.h \ tlInternational.h \ tlIntervalMap.h \ tlIntervalSet.h \ diff --git a/src/lym/lym/lymInclude.cpp b/src/tl/tl/tlInclude.cc similarity index 86% rename from src/lym/lym/lymInclude.cpp rename to src/tl/tl/tlInclude.cc index b48de2c56..4ed1b7508 100644 --- a/src/lym/lym/lymInclude.cpp +++ b/src/tl/tl/tlInclude.cc @@ -20,7 +20,7 @@ */ -#include "lymInclude.h" +#include "tlInclude.h" #include "tlAssert.h" #include "tlString.h" @@ -29,7 +29,7 @@ #include "tlExpression.h" #include "tlUri.h" -namespace lym +namespace tl { static const char *valid_fn_chars = "@_:,.\\/-+"; @@ -44,16 +44,27 @@ IncludeExpander::expand (const std::string &path, std::string &expanded_text) { IncludeExpander ie; int lc = 1; - read (path, expanded_text, ie, lc); + tl::InputStream is (path); + ie.read (path, is, expanded_text, ie, lc); + return ie; +} + +IncludeExpander +IncludeExpander::expand (const std::string &path, const std::string &original_text, std::string &expanded_text) +{ + IncludeExpander ie; + int lc = 1; + tl::InputMemoryStream ms (original_text.c_str (), original_text.size ()); + tl::InputStream is (ms); + ie.read (path, is, expanded_text, ie, lc); return ie; } void -IncludeExpander::read (const std::string &path, std::string &expanded_text, IncludeExpander &ie, int &line_counter) +IncludeExpander::read (const std::string &path, tl::InputStream &is, std::string &expanded_text, IncludeExpander &ie, int &line_counter) { ie.m_sections [line_counter] = std::make_pair (path, 1 - line_counter); - tl::InputStream is (path); tl::TextInputStream text (is); int lnum = 0; @@ -83,7 +94,8 @@ IncludeExpander::read (const std::string &path, std::string &expanded_text, Incl include_path = current_uri.resolved (new_uri).to_string (); } - read (include_path, expanded_text, ie, line_counter); + tl::InputStream is (include_path); + read (include_path, is, expanded_text, ie, line_counter); emit_section = true; @@ -125,7 +137,7 @@ IncludeExpander::to_string () const for (std::map >::const_iterator m = m_sections.begin (); m != m_sections.end (); ++m) { res += tl::to_string (m->first); - res += ":"; + res += "*"; res += tl::to_word_or_quoted_string (m->second.first, valid_fn_chars); res += "*"; res += tl::to_string (m->second.second); @@ -153,7 +165,7 @@ IncludeExpander::from_string (const std::string &s) std::pair &si = ie.m_sections [ln]; - ex.expect (":"); + ex.expect ("*"); ex.read_word_or_quoted (si.first, valid_fn_chars); ex.expect ("*"); ex.read (si.second); diff --git a/src/lym/lym/lymInclude.h b/src/tl/tl/tlInclude.h similarity index 79% rename from src/lym/lym/lymInclude.h rename to src/tl/tl/tlInclude.h index 5e92e70bb..eda812459 100644 --- a/src/lym/lym/lymInclude.h +++ b/src/tl/tl/tlInclude.h @@ -21,17 +21,19 @@ */ -#ifndef HDR_lymInclude -#define HDR_lymInclude +#ifndef HDR_tlInclude +#define HDR_tlInclude -#include "lymCommon.h" +#include "tlCommon.h" #include #include -namespace lym +namespace tl { +class InputStream; + /** * @brief Provide the basic include expansion and file/line mapping mechanism * @@ -44,7 +46,7 @@ namespace lym * The file path is expression-interpolated, hence can access environment variables * through $(env("HOME")) for example. */ -class LYM_PUBLIC IncludeExpander +class TL_PUBLIC IncludeExpander { public: /** @@ -59,6 +61,14 @@ public: */ static IncludeExpander expand (const std::string &path, std::string &expanded_text); + /** + * @brief Provides include expansion + * + * This method will deliver the expanded text and the include expander object. + * This version also takes the actual text of the original file. + */ + static IncludeExpander expand (const std::string &path, const std::string &original_text, std::string &expanded_text); + /** * @brief Serializes the include expander information into a string * @@ -82,15 +92,13 @@ public: */ static std::pair translate_to_original (const std::string &file, int line_number) { - IncludeExpander ie; - ie.from_string (file); - return ie.translate_to_original (line_number); + return IncludeExpander::from_string (file).translate_to_original (line_number); } -public: +private: std::map > m_sections; - static void read (const std::string &path, std::string &expanded_text, IncludeExpander &ie, int &line_counter); + void read (const std::string &path, tl::InputStream &is, std::string &expanded_text, IncludeExpander &ie, int &line_counter); }; } diff --git a/src/tl/tl/tlScriptError.cc b/src/tl/tl/tlScriptError.cc index c7dd9d8dd..5d454fbb0 100644 --- a/src/tl/tl/tlScriptError.cc +++ b/src/tl/tl/tlScriptError.cc @@ -22,6 +22,7 @@ #include "tlScriptError.h" #include "tlString.h" +#include "tlInclude.h" namespace tl { @@ -32,13 +33,13 @@ namespace tl BacktraceElement::BacktraceElement (const std::string &_file, int _line) : file (_file), line (_line) { - // .. nothing yet .. + translate_includes (); } BacktraceElement::BacktraceElement (const std::string &_file, int _line, const std::string _more_info) : file (_file), line (_line), more_info (_more_info) { - // .. nothing yet .. + translate_includes (); } BacktraceElement::BacktraceElement () @@ -47,6 +48,20 @@ BacktraceElement::BacktraceElement () // .. nothing yet .. } +void +BacktraceElement::translate_includes () +{ + if (line < 1) { + return; + } + + std::pair fl = tl::IncludeExpander::translate_to_original (file, line); + if (fl.second > 0) { + file = fl.first; + line = fl.second; + } +} + std::string BacktraceElement::to_string() const { @@ -64,20 +79,38 @@ BacktraceElement::to_string() const // ------------------------------------------------------------------- // ScriptError implementation +ScriptError::ScriptError (const char *msg, const char *cls, const std::vector &backtrace) + : tl::Exception (msg), m_line (-1), m_cls (cls), m_backtrace (backtrace) +{ + // .. nothing yet .. +} + +ScriptError::ScriptError (const char *msg, const char *sourcefile, int line, const char *cls, const std::vector &backtrace) + : tl::Exception (msg), m_sourcefile (sourcefile), m_line (line), m_cls (cls), m_backtrace (backtrace) +{ + translate_includes (); +} + +ScriptError::ScriptError (const ScriptError &d) + : tl::Exception (d), m_sourcefile (d.m_sourcefile), m_line (d.m_line), m_cls (d.m_cls), m_context (d.m_context), m_backtrace (d.m_backtrace) +{ + // .. nothing yet .. +} + std::string ScriptError::basic_msg () const { return tl::Exception::msg (); } -std::string +std::string ScriptError::msg () const { std::string m = basic_msg (); if (! m_context.empty ()) { - m += tl::to_string (tr (" in ")) + m_context; - } + m += tl::to_string (tr (" in ")) + m_context; + } for (std::vector::const_iterator bt = backtrace ().begin (); bt != backtrace ().end (); ++bt) { m += "\n "; @@ -87,6 +120,20 @@ ScriptError::msg () const return m; } +void +ScriptError::translate_includes () +{ + if (m_line < 1) { + return; + } + + std::pair fl = tl::IncludeExpander::translate_to_original (m_sourcefile, m_line); + if (fl.second > 0) { + m_sourcefile = fl.first; + m_line = fl.second; + } +} + } diff --git a/src/tl/tl/tlScriptError.h b/src/tl/tl/tlScriptError.h index 0720e2f44..bf613fe22 100644 --- a/src/tl/tl/tlScriptError.h +++ b/src/tl/tl/tlScriptError.h @@ -60,6 +60,9 @@ struct TL_PUBLIC BacktraceElement std::string file; int line; std::string more_info; + +private: + void translate_includes (); }; /** @@ -69,17 +72,11 @@ class TL_PUBLIC ScriptError : public tl::Exception { public: - ScriptError (const char *msg, const char *cls, const std::vector &backtrace) - : tl::Exception (msg), m_line (-1), m_cls (cls), m_backtrace (backtrace) - { } + ScriptError (const char *msg, const char *cls, const std::vector &backtrace); - ScriptError (const char *msg, const char *sourcefile, int line, const char *cls, const std::vector &backtrace) - : tl::Exception (msg), m_sourcefile (sourcefile), m_line (line), m_cls (cls), m_backtrace (backtrace) - { } + ScriptError (const char *msg, const char *sourcefile, int line, const char *cls, const std::vector &backtrace); - ScriptError (const ScriptError &d) - : tl::Exception (d), m_sourcefile (d.m_sourcefile), m_line (d.m_line), m_cls (d.m_cls), m_context (d.m_context), m_backtrace (d.m_backtrace) - { } + ScriptError (const ScriptError &d); virtual ~ScriptError () { } @@ -139,6 +136,8 @@ private: std::string m_cls; std::string m_context; std::vector m_backtrace; + + void translate_includes (); }; /** diff --git a/src/lym/unit_tests/lymIncludeTests.cc b/src/tl/unit_tests/tlIncludeTests.cc similarity index 68% rename from src/lym/unit_tests/lymIncludeTests.cc rename to src/tl/unit_tests/tlIncludeTests.cc index 8ee13fdff..bbb56dc66 100644 --- a/src/lym/unit_tests/lymIncludeTests.cc +++ b/src/tl/unit_tests/tlIncludeTests.cc @@ -23,17 +23,18 @@ #include "tlUnitTest.h" #include "tlFileUtils.h" -#include "lymInclude.h" +#include "tlStream.h" +#include "tlInclude.h" TEST(1_simple) { - std::string fn = tl::testsrc () + "/testdata/lym/x.txt"; + std::string fn = tl::testsrc () + "/testdata/tl/x.txt"; std::string et; - lym::IncludeExpander ie = lym::IncludeExpander::expand (fn, et); + tl::IncludeExpander ie = tl::IncludeExpander::expand (fn, et); EXPECT_EQ (et, "A line\nAnother line\n"); EXPECT_EQ (ie.to_string (), fn); - EXPECT_EQ (lym::IncludeExpander::from_string (ie.to_string ()).to_string (), ie.to_string ()); + EXPECT_EQ (tl::IncludeExpander::from_string (ie.to_string ()).to_string (), ie.to_string ()); EXPECT_EQ (ie.translate_to_original (2).first, fn); EXPECT_EQ (ie.translate_to_original (2).second, 2); @@ -41,18 +42,18 @@ TEST(1_simple) TEST(2_single_include) { - std::string fn = tl::testsrc () + "/testdata/lym/x_inc1.txt"; + std::string fn = tl::testsrc () + "/testdata/tl/x_inc1.txt"; std::string et; - lym::IncludeExpander ie = lym::IncludeExpander::expand (fn, et); + tl::IncludeExpander ie = tl::IncludeExpander::expand (fn, tl::InputStream (fn).read_all (), et); EXPECT_EQ (et, "A line\nincluded.1\nAnother line\n"); - EXPECT_EQ (ie.to_string (), "@1:" + tl::testsrc () + "/testdata/lym/x_inc1.txt*0;2:" + tl::testsrc () + "/testdata/lym/inc1.txt*-1;3:" + tl::testsrc () + "/testdata/lym/x_inc1.txt*0;"); - EXPECT_EQ (lym::IncludeExpander::from_string (ie.to_string ()).to_string (), ie.to_string ()); + EXPECT_EQ (ie.to_string (), "@1*" + tl::testsrc () + "/testdata/tl/x_inc1.txt*0;2*" + tl::testsrc () + "/testdata/tl/inc1.txt*-1;3*" + tl::testsrc () + "/testdata/tl/x_inc1.txt*0;"); + EXPECT_EQ (tl::IncludeExpander::from_string (ie.to_string ()).to_string (), ie.to_string ()); EXPECT_EQ (ie.translate_to_original (1).first, fn); EXPECT_EQ (ie.translate_to_original (1).second, 1); - EXPECT_EQ (ie.translate_to_original (2).first, tl::testsrc () + "/testdata/lym/inc1.txt"); + EXPECT_EQ (ie.translate_to_original (2).first, tl::testsrc () + "/testdata/tl/inc1.txt"); EXPECT_EQ (ie.translate_to_original (2).second, 1); EXPECT_EQ (ie.translate_to_original (3).first, fn); EXPECT_EQ (ie.translate_to_original (3).second, 3); @@ -60,21 +61,21 @@ TEST(2_single_include) TEST(3_multi_include) { - std::string fn = tl::testsrc () + "/testdata/lym/x_inc3.txt"; + std::string fn = tl::testsrc () + "/testdata/tl/x_inc3.txt"; std::string et; - lym::IncludeExpander ie = lym::IncludeExpander::expand (fn, et); + tl::IncludeExpander ie = tl::IncludeExpander::expand (fn, et); EXPECT_EQ (et, "A line\ninclude.3a\nincluded.2a\nincluded.2b\ninclude.3b\nAnother line\n"); - EXPECT_EQ (lym::IncludeExpander::from_string (ie.to_string ()).to_string (), ie.to_string ()); + EXPECT_EQ (tl::IncludeExpander::from_string (ie.to_string ()).to_string (), ie.to_string ()); EXPECT_EQ (ie.translate_to_original (1).first, fn); EXPECT_EQ (ie.translate_to_original (1).second, 1); - EXPECT_EQ (ie.translate_to_original (2).first, tl::testsrc () + "/testdata/lym/inc3.txt"); + EXPECT_EQ (ie.translate_to_original (2).first, tl::testsrc () + "/testdata/tl/inc3.txt"); EXPECT_EQ (ie.translate_to_original (2).second, 1); - EXPECT_EQ (ie.translate_to_original (3).first, tl::testsrc () + "/testdata/lym/inc2.txt"); + EXPECT_EQ (ie.translate_to_original (3).first, tl::testsrc () + "/testdata/tl/inc2.txt"); EXPECT_EQ (ie.translate_to_original (3).second, 1); - EXPECT_EQ (ie.translate_to_original (5).first, tl::testsrc () + "/testdata/lym/inc3.txt"); + EXPECT_EQ (ie.translate_to_original (5).first, tl::testsrc () + "/testdata/tl/inc3.txt"); EXPECT_EQ (ie.translate_to_original (5).second, 3); EXPECT_EQ (ie.translate_to_original (6).first, fn); EXPECT_EQ (ie.translate_to_original (6).second, 3); @@ -82,21 +83,21 @@ TEST(3_multi_include) TEST(4_multi_include_interpolate) { - std::string fn = tl::testsrc () + "/testdata/lym/x_inc3_ip.txt"; + std::string fn = tl::testsrc () + "/testdata/tl/x_inc3_ip.txt"; std::string et; - lym::IncludeExpander ie = lym::IncludeExpander::expand (fn, et); + tl::IncludeExpander ie = tl::IncludeExpander::expand (fn, et); EXPECT_EQ (et, "A line\ninclude.3a\nincluded.2a\nincluded.2b\ninclude.3b\nAnother line\n"); - EXPECT_EQ (lym::IncludeExpander::from_string (ie.to_string ()).to_string (), ie.to_string ()); + EXPECT_EQ (tl::IncludeExpander::from_string (ie.to_string ()).to_string (), ie.to_string ()); EXPECT_EQ (ie.translate_to_original (1).first, fn); EXPECT_EQ (ie.translate_to_original (1).second, 1); - EXPECT_EQ (ie.translate_to_original (2).first, tl::testsrc () + "/testdata/lym/inc3.txt"); + EXPECT_EQ (ie.translate_to_original (2).first, tl::testsrc () + "/testdata/tl/inc3.txt"); EXPECT_EQ (ie.translate_to_original (2).second, 1); - EXPECT_EQ (ie.translate_to_original (3).first, tl::testsrc () + "/testdata/lym/inc2.txt"); + EXPECT_EQ (ie.translate_to_original (3).first, tl::testsrc () + "/testdata/tl/inc2.txt"); EXPECT_EQ (ie.translate_to_original (3).second, 1); - EXPECT_EQ (ie.translate_to_original (5).first, tl::testsrc () + "/testdata/lym/inc3.txt"); + EXPECT_EQ (ie.translate_to_original (5).first, tl::testsrc () + "/testdata/tl/inc3.txt"); EXPECT_EQ (ie.translate_to_original (5).second, 3); EXPECT_EQ (ie.translate_to_original (6).first, fn); EXPECT_EQ (ie.translate_to_original (6).second, 3); diff --git a/src/tl/unit_tests/unit_tests.pro b/src/tl/unit_tests/unit_tests.pro index ac708a150..51ba34af4 100644 --- a/src/tl/unit_tests/unit_tests.pro +++ b/src/tl/unit_tests/unit_tests.pro @@ -15,6 +15,7 @@ SOURCES = \ tlEvents.cc \ tlExpression.cc \ tlFileUtils.cc \ + tlIncludeTests.cc \ tlIntervalMap.cc \ tlIntervalSet.cc \ tlKDTree.cc \ diff --git a/testdata/lym/.x_inc3_ip.txt.swp b/testdata/lym/.x_inc3_ip.txt.swp deleted file mode 100644 index 8e615652c5bfa7399b67178ef1c45d2705c75499..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI&ze~eF6u|Kpokh{rAzB4R+B9v4t{p`>>Li5IL=wy|+81aS{dWZa3I7H0AMihL zcJrd?;!r!Pd>@3z<-I$&&vx8hbuUiG?y%#FjV+Ofr?X(Nd+7|`L^7iqCuUlgmPK5) zQ&VbDE^D&2yTyXuZEEI4rCw&H8cjTnrWzVGUOLabS&-z{{U9kjI@2Fkq>KOpD+yG3 z(;jX}zvp-B{?`7UyR&`1(o~udKmY**5I_I{1Q0;re+X#l$i3alTC<(?COhA9GbAB^ z00IagfB*srAb Date: Sun, 30 Aug 2020 19:57:31 +0200 Subject: [PATCH 095/121] WIP: removed a temp file. --- testdata/tl/.inc1.txt.swp | Bin 12288 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 testdata/tl/.inc1.txt.swp diff --git a/testdata/tl/.inc1.txt.swp b/testdata/tl/.inc1.txt.swp deleted file mode 100644 index 7854dba15fdca94399bfff8facd477628bfdef60..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI&F>3-b6u|L!-Nn+b4r-?k8c!Yk3L+hKDwNo}qIjo=_YQQ?59a6S=Wx-z3DmLb zdi4JwgybcG_uE1;?M#Mm^+7un7mp&ZhtWr`_8#<)BB@oK&28>e*J75n5}WBNySB*X zc9#RqBC*?5p(eGt#%rT-u8~!1l5J|{%g?Z_8@+KDX#^0sU!c&h)}SK2ZrJggUYd>i z^V9hL{j5X)0R#|0009ILKmdW#3uqR|-c|ANTS@RoU;08R009ILKmY**5I_I{1Q0*~ zfqyJuBa!c_$k{dj{(rgu`|-)o5eOiF00IagfB*srAb Date: Sun, 30 Aug 2020 21:34:38 +0200 Subject: [PATCH 096/121] Auto-substitution of __FILE__/__LINE__ for include-infested files. --- src/lym/lym/gsiDeclLymMacro.cc | 58 ++++++++++++++++++++++++++++++ src/lym/lym/lymMacro.cc | 7 ++-- src/lym/lym/lymMacroInterpreter.cc | 26 ++++++++++++++ src/rba/rba/rbaUtils.cc | 1 + 4 files changed, 89 insertions(+), 3 deletions(-) diff --git a/src/lym/lym/gsiDeclLymMacro.cc b/src/lym/lym/gsiDeclLymMacro.cc index a08d2c7f5..617a337a7 100644 --- a/src/lym/lym/gsiDeclLymMacro.cc +++ b/src/lym/lym/gsiDeclLymMacro.cc @@ -455,6 +455,24 @@ static lym::Macro *macro_by_path (const std::string &path) return lym::MacroCollection::root ().find_macro (path); } +static std::string real_path (const std::string &path, int line) +{ + if (! path.empty () && path[0] == '@') { + return tl::IncludeExpander::from_string (path).translate_to_original (line).first; + } else { + return path; + } +} + +static int real_line (const std::string &path, int line) +{ + if (! path.empty () && path[0] == '@') { + return tl::IncludeExpander::from_string (path).translate_to_original (line).second; + } else { + return line; + } +} + Class decl_Macro ("lay", "Macro", gsi::method ("path", &lym::Macro::path, "@brief Gets the path of the macro\n" @@ -551,6 +569,46 @@ Class decl_Macro ("lay", "Macro", gsi::method ("menu_path=", &lym::Macro::set_menu_path, gsi::arg ("string"), "@brief Sets the menu path\n" "See \\menu_path for details.\n" + ) + + gsi::method ("real_path", &real_path, + "@brief Gets the real path for an include-encoded path and line number\n" + "\n" + "When using KLayout's include scheme based on '# %include ...', __FILE__ and __LINE__ (Ruby) or __file__ and __line__ (Python) will " + "not have the proper values but encoded file names. This method allows retrieving the real file by using\n" + "\n" + "@code\n" + "# Ruby\n" + "real_file = RBA::Macro::real_path(__FILE__, __LINE__)\n" + "\n" + "# Python\n" + "real_file = pya::Macro::real_path(__file__, __line__)\n" + "@/code\n" + "\n" + "This substitution is not required for top-level macros as KLayout's interpreter will automatically use this " + "function instead of __FILE__ or __file__. Call this function when you need __FILE__ or __file__ from files " + "included through the languages mechanisms such as 'import', 'require' or 'load' where this substitution does not happen.\n" + "\n" + "This feature has been introduced in version 0.27." + ) + + gsi::method ("real_line", &real_line, + "@brief Gets the real line number for an include-encoded path and line number\n" + "\n" + "When using KLayout's include scheme based on '# %include ...', __FILE__ and __LINE__ (Ruby) or __file__ and __line__ (Python) will " + "not have the proper values but encoded file names. This method allows retrieving the real line number by using\n" + "\n" + "@code\n" + "# Ruby\n" + "real_line = RBA::Macro::real_line(__FILE__, __LINE__)\n" + "\n" + "# Python\n" + "real_line = pya::Macro::real_line(__file__, __line__)\n" + "@/code\n" + "\n" + "This substitution is not required for top-level macros as KLayout's interpreter will automatically use this " + "function instead of __LINE__ or __line__. Call this function when you need __LINE__ or __line__ from files " + "included through the languages mechanisms such as 'import', 'require' or 'load' where this substitution does not happen.\n" + "\n" + "This feature has been introduced in version 0.27." ), "@brief A macro class\n" "\n" diff --git a/src/lym/lym/lymMacro.cc b/src/lym/lym/lymMacro.cc index 888bc7445..b7a30f726 100644 --- a/src/lym/lym/lymMacro.cc +++ b/src/lym/lym/lymMacro.cc @@ -1025,13 +1025,14 @@ int Macro::run () const gsi::Interpreter *ip = script_interpreter (interpreter ()); if (ip) { + static lym::MacroInterpreter def_interpreter; + if (! prolog ().empty ()) { ip->eval_string (prolog ().c_str ()); } - std::string expanded_text; - tl::IncludeExpander ie = tl::IncludeExpander::expand (path (), text (), expanded_text); - ip->eval_string (expanded_text.c_str (), ie.to_string ().c_str (), 1); + std::pair ep = def_interpreter.include_expansion (this); + ip->eval_string (ep.second.c_str (), ep.first.c_str (), 1); if (! epilog ().empty ()) { ip->eval_string (epilog ().c_str ()); diff --git a/src/lym/lym/lymMacroInterpreter.cc b/src/lym/lym/lymMacroInterpreter.cc index 3e778bf0c..995eaa0a1 100644 --- a/src/lym/lym/lymMacroInterpreter.cc +++ b/src/lym/lym/lymMacroInterpreter.cc @@ -54,6 +54,32 @@ MacroInterpreter::include_expansion (const lym::Macro *macro) { std::pair res; res.first = tl::IncludeExpander::expand (macro->path (), macro->text (), res.second).to_string (); + + if (res.first != macro->path ()) { + + // Fix the macro's text such that include expansion does not spoil __FILE__ or __LINE__ variables + // NOTE: this will modify the column for syntax errors. Let's hope this tiny error is acceptable. + // TODO: this substitution may be somewhat naive ... + + Macro::Interpreter ip = macro->interpreter (); + if (macro->interpreter () == Macro::DSLInterpreter) { + if (syntax_scheme () == "ruby") { + ip = Macro::Ruby; + } else if (syntax_scheme () == "python") { + ip = Macro::Python; + } + } + + if (ip == Macro::Ruby) { + res.second = tl::replaced (res.second, "__FILE__", "RBA::Macro::real_path(__FILE__, __LINE__)"); + res.second = tl::replaced (res.second, "__LINE__", "RBA::Macro::real_line(__FILE__, __LINE__)"); + } else if (ip == Macro::Python) { + res.second = tl::replaced (res.second, "__file__", "pya.Macro.real_path(__file__, __line__)"); + res.second = tl::replaced (res.second, "__line__", "pya.Macro.real_line(__file__, __line__)"); + } + + } + return res; } diff --git a/src/rba/rba/rbaUtils.cc b/src/rba/rba/rbaUtils.cc index 5bdc35432..29f63d63e 100644 --- a/src/rba/rba/rbaUtils.cc +++ b/src/rba/rba/rbaUtils.cc @@ -26,6 +26,7 @@ #include "rba.h" #include "rbaUtils.h" #include "rbaInternal.h" +#include "tlInclude.h" #if HAVE_RUBY_VERSION_CODE >= 20200 # include From a01eb7089173eefe11707f65e986702823c84651 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sun, 30 Aug 2020 22:48:59 +0200 Subject: [PATCH 097/121] Added tests for include feature, some bug fixes and enhancements. --- src/lym/lym/gsiDeclLymMacro.cc | 33 ++++-- src/lym/lym/lymMacroInterpreter.cc | 24 +++- src/lym/unit_tests/lymBasicTests.cc | 176 +++++++++++++++++++++++++++- src/lym/unit_tests/unit_tests.pro | 6 +- src/tl/tl/tlInclude.cc | 8 +- testdata/lym/a_inc.drc | 9 ++ testdata/lym/a_inc.py | 6 + testdata/lym/a_inc.rb | 5 + testdata/lym/m1.drc | 22 ++++ testdata/lym/m1.py | 2 + testdata/lym/m1.rb | 2 + testdata/lym/m2.drc | 14 +++ testdata/lym/m2.py | 15 +++ testdata/lym/m2.rb | 9 ++ 14 files changed, 309 insertions(+), 22 deletions(-) create mode 100644 testdata/lym/a_inc.drc create mode 100644 testdata/lym/a_inc.py create mode 100644 testdata/lym/a_inc.rb create mode 100644 testdata/lym/m1.drc create mode 100644 testdata/lym/m1.py create mode 100644 testdata/lym/m1.rb create mode 100644 testdata/lym/m2.drc create mode 100644 testdata/lym/m2.py create mode 100644 testdata/lym/m2.rb diff --git a/src/lym/lym/gsiDeclLymMacro.cc b/src/lym/lym/gsiDeclLymMacro.cc index 617a337a7..d3e2028d9 100644 --- a/src/lym/lym/gsiDeclLymMacro.cc +++ b/src/lym/lym/gsiDeclLymMacro.cc @@ -124,7 +124,7 @@ public: std::pair include_expansion (const lym::Macro *macro) { if (m_supports_include_expansion) { - return MacroInterpreter::include_expansion (macro); + return lym::MacroInterpreter::include_expansion (macro); } else { return std::pair (macro->path (), macro->text ()); } @@ -573,27 +573,32 @@ Class decl_Macro ("lay", "Macro", gsi::method ("real_path", &real_path, "@brief Gets the real path for an include-encoded path and line number\n" "\n" - "When using KLayout's include scheme based on '# %include ...', __FILE__ and __LINE__ (Ruby) or __file__ and __line__ (Python) will " + "When using KLayout's include scheme based on '# %include ...', __FILE__ and __LINE__ (Ruby) will " "not have the proper values but encoded file names. This method allows retrieving the real file by using\n" "\n" "@code\n" "# Ruby\n" "real_file = RBA::Macro::real_path(__FILE__, __LINE__)\n" - "\n" - "# Python\n" - "real_file = pya::Macro::real_path(__file__, __line__)\n" "@/code\n" "\n" "This substitution is not required for top-level macros as KLayout's interpreter will automatically use this " - "function instead of __FILE__ or __file__. Call this function when you need __FILE__ or __file__ from files " - "included through the languages mechanisms such as 'import', 'require' or 'load' where this substitution does not happen.\n" + "function instead of __FILE__. Call this function when you need __FILE__ from files " + "included through the languages mechanisms such as 'require' or 'load' where this substitution does not happen.\n" + "\n" + "For Python there is no equivalent for __LINE__, so you always have to use:\n" + "\n" + "@code\n" + "# Python" + "import inspect\n" + "real_file = pya.Macro.real_path(__file__, inspect.currentframe().f_back.f_lineno)\n" + "@/code\n" "\n" "This feature has been introduced in version 0.27." ) + gsi::method ("real_line", &real_line, "@brief Gets the real line number for an include-encoded path and line number\n" "\n" - "When using KLayout's include scheme based on '# %include ...', __FILE__ and __LINE__ (Ruby) or __file__ and __line__ (Python) will " + "When using KLayout's include scheme based on '# %include ...', __FILE__ and __LINE__ (Ruby) will " "not have the proper values but encoded file names. This method allows retrieving the real line number by using\n" "\n" "@code\n" @@ -605,8 +610,16 @@ Class decl_Macro ("lay", "Macro", "@/code\n" "\n" "This substitution is not required for top-level macros as KLayout's interpreter will automatically use this " - "function instead of __LINE__ or __line__. Call this function when you need __LINE__ or __line__ from files " - "included through the languages mechanisms such as 'import', 'require' or 'load' where this substitution does not happen.\n" + "function instead of __FILE__. Call this function when you need __FILE__ from files " + "included through the languages mechanisms such as 'require' or 'load' where this substitution does not happen.\n" + "\n" + "For Python there is no equivalent for __LINE__, so you always have to use:\n" + "\n" + "@code\n" + "# Python" + "import inspect\n" + "real_line = pya.Macro.real_line(__file__, inspect.currentframe().f_back.f_lineno)\n" + "@/code\n" "\n" "This feature has been introduced in version 0.27." ), diff --git a/src/lym/lym/lymMacroInterpreter.cc b/src/lym/lym/lymMacroInterpreter.cc index 995eaa0a1..90d41e863 100644 --- a/src/lym/lym/lymMacroInterpreter.cc +++ b/src/lym/lym/lymMacroInterpreter.cc @@ -71,11 +71,25 @@ MacroInterpreter::include_expansion (const lym::Macro *macro) } if (ip == Macro::Ruby) { - res.second = tl::replaced (res.second, "__FILE__", "RBA::Macro::real_path(__FILE__, __LINE__)"); - res.second = tl::replaced (res.second, "__LINE__", "RBA::Macro::real_line(__FILE__, __LINE__)"); - } else if (ip == Macro::Python) { - res.second = tl::replaced (res.second, "__file__", "pya.Macro.real_path(__file__, __line__)"); - res.second = tl::replaced (res.second, "__line__", "pya.Macro.real_line(__file__, __line__)"); + + std::string subst; + const std::string file_const ("__FILE__"); + const std::string line_const ("__LINE__"); + + for (const char *cp = res.second.c_str (); *cp; ) { + if (strncmp (cp, file_const.c_str (), file_const.size ()) == 0 && !isalnum (cp[file_const.size ()]) && cp[file_const.size ()] != '_') { + subst += "RBA::Macro::real_path(__FILE__, __LINE__)"; + cp += file_const.size (); + } else if (strncmp (cp, line_const.c_str (), line_const.size ()) == 0 && !isalnum (cp[line_const.size ()]) && cp[line_const.size ()] != '_') { + subst += "RBA::Macro::real_line(__FILE__, __LINE__)"; + cp += line_const.size (); + } else { + subst += *cp++; + } + } + + res.second = subst; + } } diff --git a/src/lym/unit_tests/lymBasicTests.cc b/src/lym/unit_tests/lymBasicTests.cc index e027ccbd5..c8914718d 100644 --- a/src/lym/unit_tests/lymBasicTests.cc +++ b/src/lym/unit_tests/lymBasicTests.cc @@ -23,9 +23,179 @@ #include "tlUnitTest.h" -TEST(1) +#include "lymMacro.h" +#include "lymMacroInterpreter.h" +#include "gsiInterpreter.h" +#include "rba.h" +#include "pya.h" + +class TestCollectorConsole + : public gsi::Console { - // TODO: add tests for lym specific things - throw tl::CancelException (); // skip this test to indicate that there is nothing yet +public: + TestCollectorConsole () { } + ~TestCollectorConsole () { } + + virtual void write_str (const char *text, output_stream) + { + m_text += text; + } + + virtual void flush () { } + virtual bool is_tty () { return false; } + virtual int columns () { return 80; } + virtual int rows () { return 50; } + + const std::string &text () const { return m_text; } + +private: + std::string m_text; +}; + +#if defined(HAVE_RUBY) + +TEST(1_BasicRuby) +{ + tl_assert (rba::RubyInterpreter::instance () != 0); + + lym::Macro macro; + + macro.set_file_path (tl::testsrc () + "/testdata/lym/m1.rb"); + macro.set_interpreter (lym::Macro::Ruby); + macro.load (); + + TestCollectorConsole console; + rba::RubyInterpreter::instance ()->push_console (&console); + try { + EXPECT_EQ (macro.run (), 0); + rba::RubyInterpreter::instance ()->remove_console (&console); + } catch (...) { + rba::RubyInterpreter::instance ()->remove_console (&console); + throw; + } + + EXPECT_EQ (console.text (), "Hello, world!\n"); } +TEST(2_RubyInclude) +{ + tl_assert (rba::RubyInterpreter::instance () != 0); + + lym::Macro macro; + + macro.set_file_path (tl::testsrc () + "/testdata/lym/m2.rb"); + macro.set_interpreter (lym::Macro::Ruby); + macro.load (); + + TestCollectorConsole console; + rba::RubyInterpreter::instance ()->push_console (&console); + try { + EXPECT_EQ (macro.run (), 0); + rba::RubyInterpreter::instance ()->remove_console (&console); + } catch (...) { + rba::RubyInterpreter::instance ()->remove_console (&console); + throw; + } + + EXPECT_EQ (console.text (), "Stop 1: m2.rb:2\nf: a_inc.rb:3\nStop 2: m2.rb:8\n"); +} + +TEST(11_DRCBasic) +{ + tl_assert (rba::RubyInterpreter::instance () != 0); + + lym::Macro macro; + + macro.set_file_path (tl::testsrc () + "/testdata/lym/m1.drc"); + macro.set_interpreter (lym::Macro::DSLInterpreter); + macro.set_dsl_interpreter ("drc"); + macro.load (); + + TestCollectorConsole console; + rba::RubyInterpreter::instance ()->push_console (&console); + try { + EXPECT_EQ (macro.run (), 0); + rba::RubyInterpreter::instance ()->remove_console (&console); + } catch (...) { + rba::RubyInterpreter::instance ()->remove_console (&console); + throw; + } + + EXPECT_EQ (console.text (), "Result: (500,500;500,2000;1000,2000;1000,500) in m1.drc:20\n"); +} + +TEST(12_DRCBasic) +{ + tl_assert (rba::RubyInterpreter::instance () != 0); + + lym::Macro macro; + + macro.set_file_path (tl::testsrc () + "/testdata/lym/m2.drc"); + macro.set_interpreter (lym::Macro::DSLInterpreter); + macro.set_dsl_interpreter ("drc"); + macro.load (); + + TestCollectorConsole console; + rba::RubyInterpreter::instance ()->push_console (&console); + try { + EXPECT_EQ (macro.run (), 0); + rba::RubyInterpreter::instance ()->remove_console (&console); + } catch (...) { + rba::RubyInterpreter::instance ()->remove_console (&console); + throw; + } + + EXPECT_EQ (console.text (), "Result: (500,500;500,2000;1000,2000;1000,500) in m2.drc:14\n"); +} + +#endif + +#if defined(HAVE_PYTHON) + +TEST(101_BasicPython) +{ + tl_assert (pya::PythonInterpreter::instance () != 0); + + lym::Macro macro; + + macro.set_file_path (tl::testsrc () + "/testdata/lym/m1.py"); + macro.set_interpreter (lym::Macro::Python); + macro.load (); + + TestCollectorConsole console; + pya::PythonInterpreter::instance ()->push_console (&console); + try { + EXPECT_EQ (macro.run (), 0); + pya::PythonInterpreter::instance ()->remove_console (&console); + } catch (...) { + pya::PythonInterpreter::instance ()->remove_console (&console); + throw; + } + + EXPECT_EQ (console.text (), "Hello, world!\n"); +} + +TEST(102_PythonInclude) +{ + tl_assert (pya::PythonInterpreter::instance () != 0); + + lym::Macro macro; + + macro.set_file_path (tl::testsrc () + "/testdata/lym/m2.py"); + macro.set_interpreter (lym::Macro::Python); + macro.load (); + + TestCollectorConsole console; + pya::PythonInterpreter::instance ()->push_console (&console); + try { + EXPECT_EQ (macro.run (), 0); + pya::PythonInterpreter::instance ()->remove_console (&console); + } catch (...) { + pya::PythonInterpreter::instance ()->remove_console (&console); + throw; + } + + EXPECT_EQ (console.text (), "Stop 1: m2.py:8\nf: a_inc.py:5\nStop 2: m2.py:14\n"); +} + +#endif diff --git a/src/lym/unit_tests/unit_tests.pro b/src/lym/unit_tests/unit_tests.pro index 2bc16943b..8aec7683c 100644 --- a/src/lym/unit_tests/unit_tests.pro +++ b/src/lym/unit_tests/unit_tests.pro @@ -9,8 +9,8 @@ include($$PWD/../../lib_ut.pri) SOURCES = \ lymBasicTests.cc -INCLUDEPATH += $$LYM_INC $$TL_INC $$GSI_INC -DEPENDPATH += $$LYM_INC $$TL_INC $$GSI_INC +INCLUDEPATH += $$RBA_INC $$PYA_INC $$LYM_INC $$TL_INC $$GSI_INC +DEPENDPATH += $$RBA_INC $$PYA_INC $$LYM_INC $$TL_INC $$GSI_INC -LIBS += -L$$DESTDIR_UT -lklayout_lym -lklayout_tl -lklayout_gsi +LIBS += -L$$DESTDIR_UT -lklayout_rba -lklayout_pya -lklayout_lym -lklayout_tl -lklayout_gsi diff --git a/src/tl/tl/tlInclude.cc b/src/tl/tl/tlInclude.cc index 4ed1b7508..76a067521 100644 --- a/src/tl/tl/tlInclude.cc +++ b/src/tl/tl/tlInclude.cc @@ -78,7 +78,13 @@ IncludeExpander::read (const std::string &path, tl::InputStream &is, std::string tl::Extractor ex (l.c_str ()); if (ex.test ("#") && ex.test ("%include")) { - std::string include_path = tl::trim (ex.skip ()); + std::string include_path; + if (*ex.skip () == '"' || *ex.skip () == '\'') { + ex.read_quoted (include_path); + ex.expect_end (); + } else { + include_path = tl::trim (ex.skip ()); + } // allow some customization by employing expression interpolation include_path = tl::Eval ().interpolate (include_path); diff --git a/testdata/lym/a_inc.drc b/testdata/lym/a_inc.drc new file mode 100644 index 000000000..7d1ed315f --- /dev/null +++ b/testdata/lym/a_inc.drc @@ -0,0 +1,9 @@ + +# some prep steps +ly = RBA::Layout::new +ly.create_cell("TOP") +l1 = ly.layer(1, 0) +ly.top_cell.shapes(l1).insert(RBA::Box::new(0, 0, 1000, 2000)) +l2 = ly.layer(2, 0) +ly.top_cell.shapes(l2).insert(RBA::Box::new(500, 500, 1500, 2500)) + diff --git a/testdata/lym/a_inc.py b/testdata/lym/a_inc.py new file mode 100644 index 000000000..fe6b5645c --- /dev/null +++ b/testdata/lym/a_inc.py @@ -0,0 +1,6 @@ + +import os + +def f(): + return("f: " + os.path.basename(pya.Macro.real_path(__file__, lineno())) + ":" + str(pya.Macro.real_line(__file__, lineno()))) + diff --git a/testdata/lym/a_inc.rb b/testdata/lym/a_inc.rb new file mode 100644 index 000000000..6973a7793 --- /dev/null +++ b/testdata/lym/a_inc.rb @@ -0,0 +1,5 @@ + +def f + return "f: " + File.basename(__FILE__) + ":" + __LINE__.to_s +end + diff --git a/testdata/lym/m1.drc b/testdata/lym/m1.drc new file mode 100644 index 000000000..ee51e7fdf --- /dev/null +++ b/testdata/lym/m1.drc @@ -0,0 +1,22 @@ + +# some prep steps +ly = RBA::Layout::new +ly.create_cell("TOP") +l1 = ly.layer(1, 0) +ly.top_cell.shapes(l1).insert(RBA::Box::new(0, 0, 1000, 2000)) +l2 = ly.layer(2, 0) +ly.top_cell.shapes(l2).insert(RBA::Box::new(500, 500, 1500, 2500)) + +# actual "DRC" + +source(ly.top_cell) + +l1_drc = input(1, 0) +l2_drc = input(2, 0) +(l1_drc & l2_drc).output(100, 0) + +l100 = ly.layer(100, 0) + +puts "Result: " + RBA::Region::new(ly.top_cell.begin_shapes_rec(l100)).to_s + " in " + File.basename(__FILE__) + ":" + __LINE__.to_s + + diff --git a/testdata/lym/m1.py b/testdata/lym/m1.py new file mode 100644 index 000000000..5d09ce2d5 --- /dev/null +++ b/testdata/lym/m1.py @@ -0,0 +1,2 @@ + +print("Hello, world!") diff --git a/testdata/lym/m1.rb b/testdata/lym/m1.rb new file mode 100644 index 000000000..53588161e --- /dev/null +++ b/testdata/lym/m1.rb @@ -0,0 +1,2 @@ + +puts "Hello, world!" diff --git a/testdata/lym/m2.drc b/testdata/lym/m2.drc new file mode 100644 index 000000000..eec335e80 --- /dev/null +++ b/testdata/lym/m2.drc @@ -0,0 +1,14 @@ + +# %include "a_inc.drc" + +# actual "DRC" + +source(ly.top_cell) + +l1_drc = input(1, 0) +l2_drc = input(2, 0) +(l1_drc & l2_drc).output(100, 0) + +l100 = ly.layer(100, 0) + +puts "Result: " + RBA::Region::new(ly.top_cell.begin_shapes_rec(l100)).to_s + " in " + File.basename(__FILE__) + ":" + __LINE__.to_s diff --git a/testdata/lym/m2.py b/testdata/lym/m2.py new file mode 100644 index 000000000..401d57365 --- /dev/null +++ b/testdata/lym/m2.py @@ -0,0 +1,15 @@ + +import os +import inspect + +def lineno(): + return inspect.currentframe().f_back.f_lineno + +print("Stop 1: " + os.path.basename(pya.Macro.real_path(__file__, lineno())) + ":" + str(pya.Macro.real_line(__file__, lineno()))) + +# %include a_inc.py + +print(f()) + +print("Stop 2: " + os.path.basename(pya.Macro.real_path(__file__, lineno())) + ":" + str(pya.Macro.real_line(__file__, lineno()))) + diff --git a/testdata/lym/m2.rb b/testdata/lym/m2.rb new file mode 100644 index 000000000..e4c9031fd --- /dev/null +++ b/testdata/lym/m2.rb @@ -0,0 +1,9 @@ + +puts "Stop 1: " + File.basename(__FILE__) + ":" + __LINE__.to_s + +# %include a_inc.rb + +puts f + +puts "Stop 2: " + File.basename(__FILE__) + ":" + __LINE__.to_s + From 77799de043d315350a4abba2920bee0873655fbc Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Mon, 31 Aug 2020 20:57:06 +0200 Subject: [PATCH 098/121] Added doc for include feature to DRC. --- src/lay/lay/doc/manual/drc_runsets.xml | 54 ++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/src/lay/lay/doc/manual/drc_runsets.xml b/src/lay/lay/doc/manual/drc_runsets.xml index cf1afed49..4af5bbddd 100644 --- a/src/lay/lay/doc/manual/drc_runsets.xml +++ b/src/lay/lay/doc/manual/drc_runsets.xml @@ -69,6 +69,60 @@

+

Including other files

+ +

+ The DRC script language is based on Ruby which delivers many native language + features. Basically, inside a script you can include another script through + "load". This will read a file and execute the content of this file in the + context of the script it is loaded into. +

+ +

+ Unfortunately, "load" creates a local context for variables. Hence it's not + possible for example to use "load" to read a file that defines variables for further + use in the DRC script. +

+ +

+ To overcome this problem, KLayout offers a specific extension which embeds + another file into the source by employing some kind of preprocessing. + This way, a file can be included into another one like it was pasted at + this place. +

+ +

+ The notation is this: +

+ + 
+# %include to_include.drc
+
+ +

+ which will include "include.drc". If no absolute path is given, this file is looked + up relative to the file it is included in. +

+ +

+ The file name can be put in quotes as well. Expression interpolation is supported + (for the notation see ). Hence it is + possible to access environment variables for example like this: +

+ + 
+# %include $(env("HOME"))/to_include.drc
+
+ +

+ Because Ruby does not see the original files, some internals (e.g. + introspection) will report wrong file names and line numbers. In most + cases - for example when using "__FILE__" or "__LINE__" or when receiving stack + traces and errors - the file names and line numbers will correctly refer + to the source files before include file processing. +

+ +

Input and output

From 560832789945320e06881d8277709275044d9539 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Mon, 31 Aug 2020 23:44:02 +0200 Subject: [PATCH 099/121] Another cool one: void as C++ return value is translated to returning self for Ruby. --- src/db/db/dbLayoutToNetlist.cc | 4 ++-- src/db/db/dbLayoutToNetlist.h | 10 ++++----- src/db/db/gsiDeclDbLayoutToNetlist.cc | 4 ++-- src/lay/lay/doc/programming/ruby_binding.xml | 23 ++++++++++++++++++++ src/rba/rba/rba.cc | 16 ++++++++++++++ testdata/ruby/dbPolygonTest.rb | 13 +++++++++++ 6 files changed, 61 insertions(+), 9 deletions(-) diff --git a/src/db/db/dbLayoutToNetlist.cc b/src/db/db/dbLayoutToNetlist.cc index 9232b78ea..15d0d5c12 100644 --- a/src/db/db/dbLayoutToNetlist.cc +++ b/src/db/db/dbLayoutToNetlist.cc @@ -284,7 +284,7 @@ void LayoutToNetlist::connect_impl (const db::ShapeCollection &a, const db::Shap m_conn.connect (dla.layer (), dlb.layer ()); } -void LayoutToNetlist::connect_global_impl (const db::ShapeCollection &l, const std::string &gn) +size_t LayoutToNetlist::connect_global_impl (const db::ShapeCollection &l, const std::string &gn) { if (m_netlist_extracted) { throw tl::Exception (tl::to_string (tr ("The netlist has already been extracted"))); @@ -297,7 +297,7 @@ void LayoutToNetlist::connect_global_impl (const db::ShapeCollection &l, const s db::DeepLayer dl = deep_layer_of (l); m_dlrefs.insert (dl); - m_conn.connect_global (dl.layer (), gn); + return m_conn.connect_global (dl.layer (), gn); } const std::string &LayoutToNetlist::global_net_name (size_t id) const diff --git a/src/db/db/dbLayoutToNetlist.h b/src/db/db/dbLayoutToNetlist.h index 4d103e66e..a7875863c 100644 --- a/src/db/db/dbLayoutToNetlist.h +++ b/src/db/db/dbLayoutToNetlist.h @@ -398,18 +398,18 @@ public: * @brief Connects the given layer with a global net with the given name * Returns the global net ID */ - void connect_global (const db::Region &l, const std::string &gn) + size_t connect_global (const db::Region &l, const std::string &gn) { - connect_global_impl (l, gn); + return connect_global_impl (l, gn); } /** * @brief Connects the given text layer with a global net with the given name * Returns the global net ID */ - void connect_global (const db::Texts &l, const std::string &gn) + size_t connect_global (const db::Texts &l, const std::string &gn) { - connect_global_impl (l, gn); + return connect_global_impl (l, gn); } /** @@ -872,7 +872,7 @@ private: db::properties_id_type make_netname_propid (db::Layout &ly, const tl::Variant &netname_prop, const db::Net &net) const; db::CellMapping make_cell_mapping_into (db::Layout &layout, db::Cell &cell, const std::vector *nets, bool with_device_cells); void connect_impl (const db::ShapeCollection &a, const db::ShapeCollection &b); - void connect_global_impl (const db::ShapeCollection &l, const std::string &gn); + size_t connect_global_impl (const db::ShapeCollection &l, const std::string &gn); // implementation of NetlistManipulationCallbacks virtual size_t link_net_to_parent_circuit (const Net *subcircuit_net, Circuit *parent_circuit, const DCplxTrans &trans); diff --git a/src/db/db/gsiDeclDbLayoutToNetlist.cc b/src/db/db/gsiDeclDbLayoutToNetlist.cc index cedc464ab..1f46e9139 100644 --- a/src/db/db/gsiDeclDbLayoutToNetlist.cc +++ b/src/db/db/gsiDeclDbLayoutToNetlist.cc @@ -357,12 +357,12 @@ Class decl_dbLayoutToNetlist ("db", "LayoutToNetlist", "\n" "This variant has been introduced in version 0.27.\n" ) + - gsi::method ("connect_global", (void (db::LayoutToNetlist::*) (const db::Region &, const std::string &)) &db::LayoutToNetlist::connect_global, gsi::arg ("l"), gsi::arg ("global_net_name"), + gsi::method ("connect_global", (size_t (db::LayoutToNetlist::*) (const db::Region &, const std::string &)) &db::LayoutToNetlist::connect_global, gsi::arg ("l"), gsi::arg ("global_net_name"), "@brief Defines a connection of the given layer with a global net.\n" "This method returns the ID of the global net. Use \\global_net_name to get " "the name back from the ID." ) + - gsi::method ("connect_global", (void (db::LayoutToNetlist::*) (const db::Texts &, const std::string &)) &db::LayoutToNetlist::connect_global, gsi::arg ("l"), gsi::arg ("global_net_name"), + gsi::method ("connect_global", (size_t (db::LayoutToNetlist::*) (const db::Texts &, const std::string &)) &db::LayoutToNetlist::connect_global, gsi::arg ("l"), gsi::arg ("global_net_name"), "@brief Defines a connection of the given text layer with a global net.\n" "This method returns the ID of the global net. Use \\global_net_name to get " "the name back from the ID." diff --git a/src/lay/lay/doc/programming/ruby_binding.xml b/src/lay/lay/doc/programming/ruby_binding.xml index b79241c2a..7449de54a 100644 --- a/src/lay/lay/doc/programming/ruby_binding.xml +++ b/src/lay/lay/doc/programming/ruby_binding.xml @@ -278,6 +278,29 @@ event._manage and pointers/references and also supports "out" parameters.

+

"void" as return value

+ +

+ While a "void" return value indicates "no return value" in C++, this concept is not + common in Ruby. Ruby methods will always return the last value generated in + a method. +

+ +

+ For consistency, KLayout's Ruby binding returns "self" from methods in this + case. This allows chaining of methods in many cases and fosters compact code: +

+ + 
// C++
+class A {
+public:
+  virtual void f() { ... }
+  virtual void g() { ... }
+};
+
+# Ruby
+a = A::new.f.g
+

References and pointers to simple types (FixNum, Float, String)

diff --git a/src/rba/rba/rba.cc b/src/rba/rba/rba.cc index d7e9a1091..3ee9dd964 100644 --- a/src/rba/rba/rba.cc +++ b/src/rba/rba/rba.cc @@ -887,6 +887,15 @@ method_name_from_id (int mid, VALUE self) return cls_decl->name () + "::" + mt->name (mid); } +static gsi::ArgType create_void_type () +{ + gsi::ArgType at; + at.init (); + return at; +} + +static gsi::ArgType s_void_type = create_void_type (); + VALUE method_adaptor (int mid, int argc, VALUE *argv, VALUE self, bool ctor) { @@ -1077,8 +1086,15 @@ method_adaptor (int mid, int argc, VALUE *argv, VALUE self, bool ctor) } + } else if (meth->ret_type () == s_void_type) { + + // simple, yet magical :) + return self; + } else { + ret = pop_arg (meth->ret_type (), p, retlist, heap); + } } diff --git a/testdata/ruby/dbPolygonTest.rb b/testdata/ruby/dbPolygonTest.rb index 73c592830..02602f61c 100644 --- a/testdata/ruby/dbPolygonTest.rb +++ b/testdata/ruby/dbPolygonTest.rb @@ -777,6 +777,19 @@ class DBPolygon_TestClass < TestBase end + def test_voidMethodsReturnSelf + + hull = [ RBA::Point::new(0, 0), RBA::Point::new(6000, 0), + RBA::Point::new(6000, 3000), RBA::Point::new(0, 3000) ] + hole1 = [ RBA::Point::new(1000, 1000), RBA::Point::new(2000, 1000), + RBA::Point::new(2000, 2000), RBA::Point::new(1000, 2000) ] + hole2 = [ RBA::Point::new(3000, 1000), RBA::Point::new(4000, 1000), + RBA::Point::new(4000, 2000), RBA::Point::new(3000, 2000) ] + poly = RBA::Polygon::new(hull).insert_hole(hole1).insert_hole(hole2) + assert_equal(poly.to_s, "(0,0;0,3000;6000,3000;6000,0/1000,1000;2000,1000;2000,2000;1000,2000/3000,1000;4000,1000;4000,2000;3000,2000)") + + end + end load("test_epilogue.rb") From a20f0d58919ff8f3cb7d9b9df906f18be7536ee6 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Mon, 31 Aug 2020 23:55:26 +0200 Subject: [PATCH 100/121] Also provide 'void to self' return values for Python. --- src/pya/pya/pyaModule.cc | 15 +++++++++++++++ testdata/python/dbPolygonTest.py | 11 +++++++++++ 2 files changed, 26 insertions(+) diff --git a/src/pya/pya/pyaModule.cc b/src/pya/pya/pyaModule.cc index 31d3961d3..5c16ce6e3 100644 --- a/src/pya/pya/pyaModule.cc +++ b/src/pya/pya/pyaModule.cc @@ -686,6 +686,15 @@ property_name_from_id (int mid, PyObject *self) return cls_decl->name () + "." + mt->property_name (mid); } +static gsi::ArgType create_void_type () +{ + gsi::ArgType at; + at.init (); + return at; +} + +static gsi::ArgType s_void_type = create_void_type (); + static PyObject * get_return_value (PYAObjectBase *self, gsi::SerialArgs &retlist, const gsi::MethodBase *meth, tl::Heap &heap) { @@ -696,6 +705,12 @@ get_return_value (PYAObjectBase *self, gsi::SerialArgs &retlist, const gsi::Meth gsi::IterAdaptorAbstractBase *iter = (gsi::IterAdaptorAbstractBase *) retlist.read (heap); ret = (PyObject *) PYAIteratorObject::create (self ? self->py_object () : 0, iter, &meth->ret_type ()); + } else if (meth->ret_type () == s_void_type && self != 0) { + + // simple, yet magical :) + ret = self->py_object (); + Py_INCREF (ret); + } else { ret = pop_arg (meth->ret_type (), retlist, self, heap).release (); diff --git a/testdata/python/dbPolygonTest.py b/testdata/python/dbPolygonTest.py index f98597d07..64cf8e471 100644 --- a/testdata/python/dbPolygonTest.py +++ b/testdata/python/dbPolygonTest.py @@ -728,6 +728,17 @@ class DBPolygonTests(unittest.TestCase): self.assertEqual(str(p1), "(21,42;21,62;41,62;41,42)") self.assertEqual(str(pp), "(21,42;21,62;41,62;41,42)") + def test_voidMethodsReturnSelf(self): + + hull = [ pya.Point(0, 0), pya.Point(6000, 0), + pya.Point(6000, 3000), pya.Point(0, 3000) ] + hole1 = [ pya.Point(1000, 1000), pya.Point(2000, 1000), + pya.Point(2000, 2000), pya.Point(1000, 2000) ] + hole2 = [ pya.Point(3000, 1000), pya.Point(4000, 1000), + pya.Point(4000, 2000), pya.Point(3000, 2000) ] + poly = pya.Polygon(hull).insert_hole(hole1).insert_hole(hole2) + self.assertEqual(str(poly), "(0,0;0,3000;6000,3000;6000,0/1000,1000;2000,1000;2000,2000;1000,2000/3000,1000;4000,1000;4000,2000;3000,2000)") + # run unit tests if __name__ == '__main__': suite = unittest.TestLoader().loadTestsFromTestCase(DBPolygonTests) From ad6809a084987056793c7f69473071651a56d832 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Tue, 1 Sep 2020 19:57:27 +0200 Subject: [PATCH 101/121] Fixed a few issues with the include implementation. --- src/lym/unit_tests/lymBasicTests.cc | 23 +++++++++++++++++++++++ src/tl/tl/tlInclude.cc | 9 ++++++--- src/tl/tl/tlStream.cc | 11 ++++++++--- 3 files changed, 37 insertions(+), 6 deletions(-) diff --git a/src/lym/unit_tests/lymBasicTests.cc b/src/lym/unit_tests/lymBasicTests.cc index c8914718d..10a6a7362 100644 --- a/src/lym/unit_tests/lymBasicTests.cc +++ b/src/lym/unit_tests/lymBasicTests.cc @@ -100,6 +100,29 @@ TEST(2_RubyInclude) EXPECT_EQ (console.text (), "Stop 1: m2.rb:2\nf: a_inc.rb:3\nStop 2: m2.rb:8\n"); } +TEST(3_RubyInclude) +{ + tl_assert (rba::RubyInterpreter::instance () != 0); + + lym::Macro macro; + + macro.set_file_path (tl::testsrc () + "/testdata/lym/m3.rb"); + macro.set_interpreter (lym::Macro::Ruby); + macro.load (); + + TestCollectorConsole console; + rba::RubyInterpreter::instance ()->push_console (&console); + try { + EXPECT_EQ (macro.run (), 0); + rba::RubyInterpreter::instance ()->remove_console (&console); + } catch (...) { + rba::RubyInterpreter::instance ()->remove_console (&console); + throw; + } + + EXPECT_EQ (console.text (), "An error in " + tl::testsrc () + "/testdata/lym/b_inc.rb:3\n"); +} + TEST(11_DRCBasic) { tl_assert (rba::RubyInterpreter::instance () != 0); diff --git a/src/tl/tl/tlInclude.cc b/src/tl/tl/tlInclude.cc index 76a067521..a7c686f9f 100644 --- a/src/tl/tl/tlInclude.cc +++ b/src/tl/tl/tlInclude.cc @@ -162,7 +162,11 @@ IncludeExpander::from_string (const std::string &s) tl::Extractor ex (s.c_str ()); - if (ex.test ("@")) { + if (*ex == '"' || *ex == '\'') { + + ex.read_quoted (ie.m_sections [1].first); + + } else if (ex.test ("@")) { while (! ex.at_end ()) { @@ -182,8 +186,7 @@ IncludeExpander::from_string (const std::string &s) } else { - ex.read_word_or_quoted (ie.m_sections [1].first, valid_fn_chars); - ex.expect_end (); + ie.m_sections [1].first = s; } diff --git a/src/tl/tl/tlStream.cc b/src/tl/tl/tlStream.cc index 3d77ff3d4..4d44fbb4b 100644 --- a/src/tl/tl/tlStream.cc +++ b/src/tl/tl/tlStream.cc @@ -454,7 +454,14 @@ TextInputStream::get_line () while (! at_end ()) { char c = get_char (); - if (c == '\n' || c == 0) { + if (c == '\n') { + // set at_end if there is nothing after this terminal LF -> this will avoid + // emitting an empty dummy line as the last one + if (peek_char () == 0) { + m_at_end = true; + } + break; + } else if (c == 0) { break; } else { m_line_buffer += c; @@ -475,7 +482,6 @@ TextInputStream::get_char () return 0; } else if (*c != '\r' && *c) { if (*c == '\n') { - peek_char (); // sets at_end if there is no more character ++m_next_line; } return *c; @@ -490,7 +496,6 @@ TextInputStream::peek_char () m_line = m_next_line; const char *c = m_stream.get (1); if (c == 0) { - m_at_end = true; return 0; } else if (*c != '\r' && *c) { char cc = *c; From 0cc41f43c4460562a0b6b12f53496d2c916af2f8 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Tue, 1 Sep 2020 22:02:47 +0200 Subject: [PATCH 102/121] Fixed one more issue with the include implementation. --- src/tl/tl/tlStream.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/tl/tl/tlStream.cc b/src/tl/tl/tlStream.cc index 4d44fbb4b..753e5e16b 100644 --- a/src/tl/tl/tlStream.cc +++ b/src/tl/tl/tlStream.cc @@ -449,7 +449,7 @@ TextInputStream::read_all (size_t max_count) const std::string & TextInputStream::get_line () { - m_line = m_next_line; + int line = m_next_line; m_line_buffer.clear (); while (! at_end ()) { @@ -468,6 +468,7 @@ TextInputStream::get_line () } } + m_line = line; return m_line_buffer; } From b5ff4dabe4a1937261c86d3963de7a3339964893 Mon Sep 17 00:00:00 2001 From: joaquin Date: Fri, 4 Sep 2020 11:27:16 -0700 Subject: [PATCH 103/121] building wheel for python3.8 --- .travis.yml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/.travis.yml b/.travis.yml index a04464a80..01c77aeb3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,36 @@ branches: matrix: include: # python manylinux packages + - name: "cp38-cp38m-manylinux1_x86_64.whl" + os: linux + sudo: true + language: python + python: '3.8' + services: + - docker + env: + - DOCKER_IMAGE="quay.io/pypa/manylinux1_x86_64" + - PY_VERSION="cp38-cp38m" + - DOCKER_BUILD=true + - TEST_IN_HOST=true + - MATRIX_EVAL="" + cache: + directories: + - ccache + + - name: "cp38-cp38m-manylinux1_i686.whl" + os: linux + sudo: true + services: + - docker + env: + - DOCKER_IMAGE="quay.io/pypa/manylinux1_i686" + - PY_VERSION="cp38-cp38m" + - DOCKER_BUILD=true + - MATRIX_EVAL="" + cache: + directories: + - ccache - name: "cp37-cp37m-manylinux1_x86_64.whl" os: linux From 5caa9a79fb57bcd27ac19b9b1f3dc729d93a0955 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Tue, 8 Sep 2020 22:15:23 +0200 Subject: [PATCH 104/121] Had to change the Travis definition to use the right Python path for 3.8 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 01c77aeb3..1ed2b518f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,7 @@ matrix: - docker env: - DOCKER_IMAGE="quay.io/pypa/manylinux1_x86_64" - - PY_VERSION="cp38-cp38m" + - PY_VERSION="cp38-cp38" - DOCKER_BUILD=true - TEST_IN_HOST=true - MATRIX_EVAL="" @@ -31,7 +31,7 @@ matrix: - docker env: - DOCKER_IMAGE="quay.io/pypa/manylinux1_i686" - - PY_VERSION="cp38-cp38m" + - PY_VERSION="cp38-cp38" - DOCKER_BUILD=true - MATRIX_EVAL="" cache: From db7e440a8bdfb789cff8f1d03e688d1ffc06b91e Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Tue, 8 Sep 2020 22:26:00 +0200 Subject: [PATCH 105/121] Updated azure pipeline for Python 3.8 --- azure-pipelines.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 8ca89537b..55921a370 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -25,6 +25,9 @@ jobs: cp37-cp37m-win_amd64.whl: python.version: '3.7' python.architecture: 'x64' + cp38-cp38-win_amd64.whl: + python.version: '3.8' + python.architecture: 'x64' cp35-cp35m-win32.whl: python.version: '3.5' python.architecture: 'x86' @@ -34,6 +37,9 @@ jobs: cp37-cp37m-win32.whl: python.version: '3.7' python.architecture: 'x86' + cp38-cp38-win32.whl: + python.version: '3.8' + python.architecture: 'x86' maxParallel: 6 steps: @@ -117,6 +123,11 @@ jobs: vmImage: 'vs2017-win2016' # other options: 'macOS-10.13', 'ubuntu-16.04' steps: - checkout: none #skip checking out the default repository resource + - task: DownloadBuildArtifacts@0 + displayName: 'Download Build Artifacts wheel-3.8.x64' + inputs: + artifactName: 'wheel-3.8.x64' + downloadPath: '$(System.DefaultWorkingDirectory)' - task: DownloadBuildArtifacts@0 displayName: 'Download Build Artifacts wheel-3.7.x64' inputs: @@ -132,6 +143,11 @@ jobs: inputs: artifactName: 'wheel-3.5.x64' downloadPath: '$(System.DefaultWorkingDirectory)' + - task: DownloadBuildArtifacts@0 + displayName: 'Download Build Artifacts wheel-3.8.x86' + inputs: + artifactName: 'wheel-3.8.x86' + downloadPath: '$(System.DefaultWorkingDirectory)' - task: DownloadBuildArtifacts@0 displayName: 'Download Build Artifacts wheel-3.7.x86' inputs: From 14e560349918ad751afac76aaae01617dcf5b609 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Wed, 9 Sep 2020 23:36:26 +0200 Subject: [PATCH 106/121] Another test - maybe a fix --- setup.py | 1 - 1 file changed, 1 deletion(-) diff --git a/setup.py b/setup.py index da2a9f8dd..dbef7ca6e 100644 --- a/setup.py +++ b/setup.py @@ -336,7 +336,6 @@ class Config(object): rm = re.search(r"KLAYOUT_PYPI_VERSION\s*=\s*\"(.*?)\".*", version_txt) if rm: version_string = rm.group(1) - print("KLAYOUT_PYPI_VERSION = " + version_string) return version_string raise RuntimeError("Unable to obtain version string from version.sh") From b814175a1c67a7d884ccbbf625320145dda21f4e Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Wed, 9 Sep 2020 23:45:54 +0200 Subject: [PATCH 107/121] Attempt to include source package. --- .travis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1ed2b518f..7305afafd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -517,7 +517,8 @@ script: docker run --rm -e DOCKER_IMAGE -e PY_VERSION -v `pwd`:/io $DOCKER_IMAGE $PRE_CMD "/io/ci-scripts/docker/docker_build.sh"; klayout_version=$(python -c 'import setup; print(setup.Config().version())'); mkdir -p deploy/dist-pymod/$klayout_version; - cp -a wheelhouse/klayout-*manylinux1*.whl deploy/dist-pymod/$klayout_version; + python setup.py sdist --formats=gztar,zip --dist-dir=deploy/dist-pymod/$klayout_version; + cp -a wheelhouse/{klayout-*manylinux1*.whl,*.tar.gz,*.zip} deploy/dist-pymod/$klayout_version; if [ "$TEST_IN_HOST" = true ]; then pip install klayout --no-index -f ./wheelhouse; python testdata/pymod/import_db.py; @@ -531,6 +532,7 @@ script: python setup.py build; python setup.py bdist_wheel; python setup.py install; + python setup.py sdist --formats=gztar,zip; python testdata/pymod/import_db.py; python testdata/pymod/import_rdb.py; python testdata/pymod/import_tl.py; @@ -538,7 +540,7 @@ script: python testdata/pymod/pya_tests.py; klayout_version=$(python -c 'import setup; print(setup.Config().version())'); mkdir -p deploy/dist-pymod/$klayout_version; - cp -a dist/*.whl deploy/dist-pymod/$klayout_version; + cp -a dist/{*.whl,*.tar.gz,*.zip} deploy/dist-pymod/$klayout_version; python -c 'import klayout.db as db; print(dir(db))'; python -c 'import klayout.rdb as rdb; print(dir(rdb))'; python -c 'import klayout.tl as tl; print(dir(tl))'; From 0a444f53b2f00063b402438af399cadf04a77f30 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Wed, 9 Sep 2020 23:53:40 +0200 Subject: [PATCH 108/121] Another attempt to include the source package. --- ci-scripts/docker/docker_build.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ci-scripts/docker/docker_build.sh b/ci-scripts/docker/docker_build.sh index 747acb867..d5c39cd35 100755 --- a/ci-scripts/docker/docker_build.sh +++ b/ci-scripts/docker/docker_build.sh @@ -50,9 +50,10 @@ $AUDITWHEEL_PYTHON -m pip install . echo "Cache stats:" ccache -s -# Compile wheel +# Compile wheel and build source distribution cd /io "/opt/python/$PY_VERSION/bin/python" setup.py bdist_wheel -d /io/wheelhouse/ || exit 1 +"/opt/python/$PY_VERSION/bin/python" python setup.py sdist --formats=gztar,zip --dist-dir=/io/wheelhouse || exit 1 # Show ccache stats echo "Cache stats:" @@ -60,7 +61,7 @@ ccache -s # Bundle external shared libraries into the wheels via auditwheel for whl in /io/wheelhouse/*linux_*.whl; do - auditwheel -v repair "$whl" -w /io/wheelhouse/ || exit 1 + auditwheel repair "$whl" -w /io/wheelhouse/ || exit 1 done # Install packages and test From f761ae50cbb02104107da20830da682ade45fc22 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Thu, 10 Sep 2020 00:01:04 +0200 Subject: [PATCH 109/121] Fixed a script bug. --- .travis.yml | 1 - ci-scripts/docker/docker_build.sh | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7305afafd..482e09c71 100644 --- a/.travis.yml +++ b/.travis.yml @@ -517,7 +517,6 @@ script: docker run --rm -e DOCKER_IMAGE -e PY_VERSION -v `pwd`:/io $DOCKER_IMAGE $PRE_CMD "/io/ci-scripts/docker/docker_build.sh"; klayout_version=$(python -c 'import setup; print(setup.Config().version())'); mkdir -p deploy/dist-pymod/$klayout_version; - python setup.py sdist --formats=gztar,zip --dist-dir=deploy/dist-pymod/$klayout_version; cp -a wheelhouse/{klayout-*manylinux1*.whl,*.tar.gz,*.zip} deploy/dist-pymod/$klayout_version; if [ "$TEST_IN_HOST" = true ]; then pip install klayout --no-index -f ./wheelhouse; diff --git a/ci-scripts/docker/docker_build.sh b/ci-scripts/docker/docker_build.sh index d5c39cd35..fa143f8f2 100755 --- a/ci-scripts/docker/docker_build.sh +++ b/ci-scripts/docker/docker_build.sh @@ -53,7 +53,7 @@ ccache -s # Compile wheel and build source distribution cd /io "/opt/python/$PY_VERSION/bin/python" setup.py bdist_wheel -d /io/wheelhouse/ || exit 1 -"/opt/python/$PY_VERSION/bin/python" python setup.py sdist --formats=gztar,zip --dist-dir=/io/wheelhouse || exit 1 +"/opt/python/$PY_VERSION/bin/python" setup.py sdist --formats=gztar,zip -d /io/wheelhouse || exit 1 # Show ccache stats echo "Cache stats:" From 4327e8ec5ee28ee590ebc56525dfdb2467fdc59d Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Thu, 10 Sep 2020 00:06:58 +0200 Subject: [PATCH 110/121] Can only provide one source dist for PyPI. --- .travis.yml | 4 ++-- ci-scripts/docker/docker_build.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 482e09c71..22ffde955 100644 --- a/.travis.yml +++ b/.travis.yml @@ -517,7 +517,7 @@ script: docker run --rm -e DOCKER_IMAGE -e PY_VERSION -v `pwd`:/io $DOCKER_IMAGE $PRE_CMD "/io/ci-scripts/docker/docker_build.sh"; klayout_version=$(python -c 'import setup; print(setup.Config().version())'); mkdir -p deploy/dist-pymod/$klayout_version; - cp -a wheelhouse/{klayout-*manylinux1*.whl,*.tar.gz,*.zip} deploy/dist-pymod/$klayout_version; + cp -a wheelhouse/{klayout-*manylinux1*.whl,*.zip} deploy/dist-pymod/$klayout_version; if [ "$TEST_IN_HOST" = true ]; then pip install klayout --no-index -f ./wheelhouse; python testdata/pymod/import_db.py; @@ -539,7 +539,7 @@ script: python testdata/pymod/pya_tests.py; klayout_version=$(python -c 'import setup; print(setup.Config().version())'); mkdir -p deploy/dist-pymod/$klayout_version; - cp -a dist/{*.whl,*.tar.gz,*.zip} deploy/dist-pymod/$klayout_version; + cp -a dist/{*.whl,*.zip} deploy/dist-pymod/$klayout_version; python -c 'import klayout.db as db; print(dir(db))'; python -c 'import klayout.rdb as rdb; print(dir(rdb))'; python -c 'import klayout.tl as tl; print(dir(tl))'; diff --git a/ci-scripts/docker/docker_build.sh b/ci-scripts/docker/docker_build.sh index fa143f8f2..e8db4b331 100755 --- a/ci-scripts/docker/docker_build.sh +++ b/ci-scripts/docker/docker_build.sh @@ -53,7 +53,7 @@ ccache -s # Compile wheel and build source distribution cd /io "/opt/python/$PY_VERSION/bin/python" setup.py bdist_wheel -d /io/wheelhouse/ || exit 1 -"/opt/python/$PY_VERSION/bin/python" setup.py sdist --formats=gztar,zip -d /io/wheelhouse || exit 1 +"/opt/python/$PY_VERSION/bin/python" setup.py sdist --formats=zip -d /io/wheelhouse || exit 1 # Show ccache stats echo "Cache stats:" From 7f04ace8650a6544c9ce992bf9ce9969becf6a71 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Thu, 10 Sep 2020 00:07:59 +0200 Subject: [PATCH 111/121] Can only provide one source dist for PyPI. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 22ffde955..5917ff4cb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -531,7 +531,7 @@ script: python setup.py build; python setup.py bdist_wheel; python setup.py install; - python setup.py sdist --formats=gztar,zip; + python setup.py sdist --formats=zip; python testdata/pymod/import_db.py; python testdata/pymod/import_rdb.py; python testdata/pymod/import_tl.py; From e8c9ae4012cfe09d639e3bf8d016afd1d801bff6 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sun, 13 Sep 2020 23:29:15 +0200 Subject: [PATCH 112/121] Added missing file. --- testdata/lym/b_inc.rb | 5 +++++ testdata/lym/m3.rb | 12 ++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 testdata/lym/b_inc.rb create mode 100644 testdata/lym/m3.rb diff --git a/testdata/lym/b_inc.rb b/testdata/lym/b_inc.rb new file mode 100644 index 000000000..b794b896c --- /dev/null +++ b/testdata/lym/b_inc.rb @@ -0,0 +1,5 @@ + +def f + raise("An error") +end + diff --git a/testdata/lym/m3.rb b/testdata/lym/m3.rb new file mode 100644 index 000000000..f1521ed3c --- /dev/null +++ b/testdata/lym/m3.rb @@ -0,0 +1,12 @@ + +# %include b_inc.rb + +begin + puts f +rescue => ex + ln = ex.backtrace[0].split(":") + # NOTE: as the backtrace is a native Ruby feature, include file translation + # does not happen. We need to do this explicitly here: + puts ex.to_s + " in " + RBA::Macro::real_path(ln[0], ln[1].to_i) + ":" + RBA::Macro::real_line(ln[0], ln[1].to_i).to_s +end + From 7d3abce2010b3c4ae1fd474c33dd9d1ea88c3bbe Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sat, 29 Aug 2020 10:07:17 +0200 Subject: [PATCH 113/121] Added multi-cell mapping for transferring multiple cells from one layout to another while including their hierarchy without duplicating cells. --- src/db/db/dbCellMapping.cc | 30 +++++++++--- src/db/db/dbCellMapping.h | 65 ++++++++++++++++++++++--- src/db/db/dbDeepShapeStore.cc | 2 +- src/db/db/gsiDeclDbCellMapping.cc | 54 +++++++++++++++++++- src/db/unit_tests/dbCellMappingTests.cc | 37 ++++++++++++++ testdata/ruby/dbCellMapping.rb | 35 +++++++++++++ 6 files changed, 205 insertions(+), 18 deletions(-) diff --git a/src/db/db/dbCellMapping.cc b/src/db/db/dbCellMapping.cc index f441e893d..5c65eb914 100644 --- a/src/db/db/dbCellMapping.cc +++ b/src/db/db/dbCellMapping.cc @@ -276,7 +276,19 @@ CellMapping::create_single_mapping (const db::Layout & /*layout_a*/, db::cell_in map (cell_index_b, cell_index_a); } -void +void +CellMapping::create_multi_mapping (const db::Layout & /*layout_a*/, const std::vector &cell_index_a, const db::Layout & /*layout_b*/, const std::vector &cell_index_b) +{ + clear (); + if (cell_index_a.size () != cell_index_b.size ()) { + throw tl::Exception (tl::to_string (tr ("cell index arrays for A and B cells must have same length in 'create_multi_mapping'"))); + } + for (std::vector::const_iterator ia = cell_index_a.begin (), ib = cell_index_b.begin (); ia != cell_index_a.end (); ++ia, ++ib) { + map (*ib, *ia); + } +} + +void CellMapping::create_from_names (const db::Layout &layout_a, db::cell_index_type cell_index_a, const db::Layout &layout_b, db::cell_index_type cell_index_b) { clear (); @@ -295,31 +307,33 @@ CellMapping::create_from_names (const db::Layout &layout_a, db::cell_index_type } std::vector -CellMapping::create_missing_mapping (db::Layout &layout_a, db::cell_index_type cell_index_a, const db::Layout &layout_b, db::cell_index_type cell_index_b, const std::set *exclude_cells, const std::set *include_cells) +CellMapping::create_missing_mapping (db::Layout &layout_a, const db::Layout &layout_b, const std::vector &cell_index_b, const std::set *exclude_cells, const std::set *include_cells) { std::vector new_cells; - do_create_missing_mapping (layout_a, cell_index_a, layout_b, cell_index_b, exclude_cells, include_cells, &new_cells, 0); + do_create_missing_mapping (layout_a, layout_b, cell_index_b, exclude_cells, include_cells, &new_cells, 0); return new_cells; } std::vector > -CellMapping::create_missing_mapping2 (db::Layout &layout_a, db::cell_index_type cell_index_a, const db::Layout &layout_b, db::cell_index_type cell_index_b, const std::set *exclude_cells, const std::set *include_cells) +CellMapping::create_missing_mapping2 (db::Layout &layout_a, const db::Layout &layout_b, const std::vector &cell_index_b, const std::set *exclude_cells, const std::set *include_cells) { std::vector > cell_pairs; - do_create_missing_mapping (layout_a, cell_index_a, layout_b, cell_index_b, exclude_cells, include_cells, 0, &cell_pairs); + do_create_missing_mapping (layout_a, layout_b, cell_index_b, exclude_cells, include_cells, 0, &cell_pairs); return cell_pairs; } void -CellMapping::do_create_missing_mapping (db::Layout &layout_a, db::cell_index_type /*cell_index_a*/, const db::Layout &layout_b, db::cell_index_type cell_index_b, const std::set *exclude_cells, const std::set *include_cells, std::vector *new_cells_ptr, std::vector > *mapped_pairs) +CellMapping::do_create_missing_mapping (db::Layout &layout_a, const db::Layout &layout_b, const std::vector &cell_index_b, const std::set *exclude_cells, const std::set *include_cells, std::vector *new_cells_ptr, std::vector > *mapped_pairs) { std::vector new_cells_int; std::vector &new_cells = *(new_cells_ptr ? new_cells_ptr : &new_cells_int); std::vector new_cells_b; std::set called_b; - layout_b.cell (cell_index_b).collect_called_cells (called_b); - called_b.insert (cell_index_b); + for (std::vector::const_iterator i = cell_index_b.begin (); i != cell_index_b.end (); ++i) { + layout_b.cell (*i).collect_called_cells (called_b); + called_b.insert (*i); + } for (std::set::const_iterator b = called_b.begin (); b != called_b.end (); ++b) { if (m_b2a_mapping.find (*b) == m_b2a_mapping.end () diff --git a/src/db/db/dbCellMapping.h b/src/db/db/dbCellMapping.h index ae776286e..8857ad5c8 100644 --- a/src/db/db/dbCellMapping.h +++ b/src/db/db/dbCellMapping.h @@ -81,7 +81,30 @@ public: std::vector create_single_mapping_full (db::Layout &layout_a, db::cell_index_type cell_index_a, const db::Layout &layout_b, db::cell_index_type cell_index_b) { create_single_mapping (layout_a, cell_index_a, layout_b, cell_index_b); - return create_missing_mapping (layout_a, cell_index_a, layout_b, cell_index_b); + return create_missing_mapping (layout_a, layout_b, cell_index_b); + } + + /** + * @brief Create a multi-cell mapping + * + * The mapping created by this function will map the cells of cell_indexes_b to cell_indexes_a. Both arrays need to have + * the same length. + * This cell mapping will not map the child cells. When used for hierarchical copy this will basically + * flatten the cells on copy. + */ + void create_multi_mapping (const db::Layout &layout_a, const std::vector &cell_indexes_a, const db::Layout &layout_b, const std::vector &cell_indexes_b); + + /** + * @brief Create a single cell full mapping + * + * The mapping created by this function will map the cells of cell_indexes_a to cell_indexes_b. Both arrays need to have + * the same length. In addition, new cells for the child cells of all cell_indexes_b cells are created in layout_a and + * included in the mapping. + */ + std::vector create_multi_mapping_full (db::Layout &layout_a, const std::vector &cell_indexes_a, const db::Layout &layout_b, const std::vector &cell_indexes_b) + { + create_multi_mapping (layout_a, cell_indexes_a, layout_b, cell_indexes_b); + return create_missing_mapping (layout_a, layout_b, cell_indexes_b); } /** @@ -100,7 +123,7 @@ public: std::vector create_from_geometry_full (db::Layout &layout_a, db::cell_index_type cell_index_a, const db::Layout &layout_b, db::cell_index_type cell_index_b) { create_from_geometry (layout_a, cell_index_a, layout_b, cell_index_b); - return create_missing_mapping (layout_a, cell_index_a, layout_b, cell_index_b); + return create_missing_mapping (layout_a, layout_b, cell_index_b); } /** @@ -119,7 +142,7 @@ public: std::vector create_from_names_full (db::Layout &layout_a, db::cell_index_type cell_index_a, const db::Layout &layout_b, db::cell_index_type cell_index_b) { create_from_names (layout_a, cell_index_a, layout_b, cell_index_b); - return create_missing_mapping (layout_a, cell_index_a, layout_b, cell_index_b); + return create_missing_mapping (layout_a, layout_b, cell_index_b); } /** @@ -184,8 +207,9 @@ public: /** * @brief Creates mappings for all cells not mapped yet * - * When constructing a cell mapping by explicit mapping (map (a, b)), some cells may be - * left unmapped. This method allows creating mappings for these missing cells by adding + * When constructing a cell mapping by explicit mapping (map (a, b)), some child cells of the + * mapped other cells may be left unmapped. + * This method allows creating mappings for these missing cells by adding * new cells and the corresponding instances into the target layout_a. * * If given, "exclude_cells" can specify a list of cells not to map. @@ -195,7 +219,18 @@ public: * * The returned vector lists the new cells. */ - std::vector create_missing_mapping (db::Layout &layout_a, db::cell_index_type cell_index_a, const db::Layout &layout_b, db::cell_index_type cell_index_b, const std::set *exclude_cells = 0, const std::set *include_cells = 0); + std::vector create_missing_mapping (db::Layout &layout_a, const db::Layout &layout_b, const std::vector &cell_index_b, const std::set *exclude_cells = 0, const std::set *include_cells = 0); + + /** + * @brief A convenience version of create_missing_mappings which takes a single cell for cell_index_a and cell_index_b. + */ + std::vector create_missing_mapping (db::Layout &layout_a, const db::Layout &layout_b, db::cell_index_type cell_index_b, const std::set *exclude_cells = 0, const std::set *include_cells = 0) + { + std::vector cib; + cib.reserve (1); + cib.push_back (cell_index_b); + return create_missing_mapping (layout_a, layout_b, cib, exclude_cells, include_cells); + } /** * @brief Like create_missing_mapping, but returns the newly mapped pairs @@ -203,7 +238,21 @@ public: * The first cell index of the pair is the old cell in layout_a, the second cell index * is the new cell in layout_b. */ - std::vector > create_missing_mapping2 (db::Layout &layout_a, db::cell_index_type cell_index_a, const db::Layout &layout_b, db::cell_index_type cell_index_b, const std::set *exclude_cells = 0, const std::set *include_cells = 0); + std::vector > create_missing_mapping2 (db::Layout &layout_a, const db::Layout &layout_b, const std::vector &cell_index_b, const std::set *exclude_cells = 0, const std::set *include_cells = 0); + + /** + * @brief Like create_missing_mapping, but returns the newly mapped pairs (single-cell version) + * + * The first cell index of the pair is the old cell in layout_a, the second cell index + * is the new cell in layout_b. + */ + std::vector > create_missing_mapping2 (db::Layout &layout_a, const db::Layout &layout_b, db::cell_index_type cell_index_b, const std::set *exclude_cells = 0, const std::set *include_cells = 0) + { + std::vector cib; + cib.reserve (1); + cib.push_back (cell_index_b); + return create_missing_mapping2 (layout_a, layout_b, cib, exclude_cells, include_cells); + } private: void extract_unique (std::map >::const_iterator cand, @@ -213,7 +262,7 @@ private: void dump_mapping (const std::map > &candidates, const db::Layout &layout_a, const db::Layout &layout_b); - void do_create_missing_mapping (db::Layout &layout_a, db::cell_index_type cell_index_a, const db::Layout &layout_b, db::cell_index_type cell_index_b, const std::set *exclude_cells, const std::set *include_cells, std::vector *new_cells, std::vector > *mapped_pairs); + void do_create_missing_mapping (db::Layout &layout_a, const db::Layout &layout_b, const std::vector &cell_index_b, const std::set *exclude_cells, const std::set *include_cells, std::vector *new_cells, std::vector > *mapped_pairs); std::map m_b2a_mapping; }; diff --git a/src/db/db/dbDeepShapeStore.cc b/src/db/db/dbDeepShapeStore.cc index a2e11a840..f95667da2 100644 --- a/src/db/db/dbDeepShapeStore.cc +++ b/src/db/db/dbDeepShapeStore.cc @@ -977,7 +977,7 @@ DeepShapeStore::cell_mapping_to_original (unsigned int layout_index, db::Layout // Add new cells for the variants and (possible) devices which are cells added during the device // extraction process - std::vector > new_pairs = cm->second.create_missing_mapping2 (*into_layout, into_cell, *source_layout, source_top, excluded_cells, included_cells); + std::vector > new_pairs = cm->second.create_missing_mapping2 (*into_layout, *source_layout, source_top, excluded_cells, included_cells); // the variant's originals we are going to delete std::set cells_to_delete; diff --git a/src/db/db/gsiDeclDbCellMapping.cc b/src/db/db/gsiDeclDbCellMapping.cc index 3c92720da..14690fac9 100644 --- a/src/db/db/gsiDeclDbCellMapping.cc +++ b/src/db/db/gsiDeclDbCellMapping.cc @@ -76,10 +76,42 @@ Class decl_CellMapping ("db", "CellMapping", "The cell mapping is created for cell_b to cell_a in the respective layouts. " "This method clears the mapping and creates one for the single cell pair. " "In addition and in contrast to \\for_single_cell, this method completes the mapping by adding all the child cells " - "of cell_b to layout_a and creating the proper instances. " + "of cell_b to layout_a and creating the proper instances.\n" "\n" "This method has been introduced in version 0.23." ) + + gsi::method ("for_multi_cells", &db::CellMapping::create_multi_mapping, gsi::arg ("layout_a"), gsi::arg ("cell_indexes_a"), gsi::arg ("layout_b"), gsi::arg ("cell_indexes_b"), + "@brief Initializes the cell mapping for top-level identity\n" + "\n" + "@param layout_a The target layout.\n" + "@param cell_indexes_a A list of cell indexes for the target cells.\n" + "@param layout_b The source layout.\n" + "@param cell_indexes_b A list of cell indexes for the source cells (same number of indexes than \\cell_indexes_a).\n" + "\n" + "The cell mapping is created for cells from cell_indexes_b to cell from cell_indexes_a in the respective layouts. " + "This method clears the mapping and creates one for each cell pair from cell_indexes_b vs. cell_indexes_a. " + "If used for \\Layout#copy_tree or \\Layout#move_tree, this cell mapping will essentially " + "flatten the source cells in the target layout.\n" + "\n" + "This method is equivalent to \\clear, followed by \\map(cell_index_a, cell_index_b) for each cell pair.\n" + "\n" + "This method has been introduced in version 0.27." + ) + + gsi::method ("for_multi_cells_full", &db::CellMapping::create_multi_mapping_full, gsi::arg ("layout_a"), gsi::arg ("cell_indexes_a"), gsi::arg ("layout_b"), gsi::arg ("cell_indexes_b"), + "@brief Initializes the cell mapping for top-level identity\n" + "\n" + "@param layout_a The target layout.\n" + "@param cell_indexes_a A list of cell indexes for the target cells.\n" + "@param layout_b The source layout.\n" + "@param cell_indexes_b A list of cell indexes for the source cells (same number of indexes than \\cell_indexes_a).\n" + "\n" + "The cell mapping is created for cells from cell_indexes_b to cell from cell_indexes_a in the respective layouts. " + "This method clears the mapping and creates one for each cell pair from cell_indexes_b vs. cell_indexes_a. " + "In addition and in contrast to \\for_multi_cells, this method completes the mapping by adding all the child cells " + "of all cells in cell_indexes_b to layout_a and creating the proper instances.\n" + "\n" + "This method has been introduced in version 0.27." + ) + gsi::method ("from_geometry_full", &db::CellMapping::create_from_geometry_full, gsi::arg ("layout_a"), gsi::arg ("cell_index_a"), gsi::arg ("layout_b"), gsi::arg ("cell_index_b"), "@brief Initializes the cell mapping using the geometrical identity in full mapping mode\n" "\n" @@ -234,6 +266,26 @@ Class decl_CellMapping ("db", "CellMapping", "\n" "CellMapping objects play a role mainly in the hierarchical copy or move operations of \\Layout. " "However, use is not restricted to these applications.\n" + "\n" + "Here is one example for using \\CellMapping. It extracts cells 'A', 'B' and 'C' from one layout " + "and copies them to another. It will also copy all shapes and all child cells. Child cells which are " + "shared between the three initial cells will be shared in the target layout too.\n" + "\n" + "@code\n" + "cell_names = [ \"A\", \"B\", \"C\" ]\n" + "\n" + "source = RBA::Layout::new\n" + "source.read(\"input.gds\")\n" + "\n" + "target = RBA::Layout::new\n" + "\n" + "source_cells = cell_names.collect { |n| source.cell_by_name(n).cell_index }\n" + "target_cells = cell_names.collect { |n| target.create_cell(n).cell_index }\n" + "\n" + "cm = RBA::CellMapping::new\n" + "cm.for_multi_cells_full(source, source_cells, target, target_cells)\n" + "target.copy_tree_shapes(source, cm)\n" + "@/code\n" ); } diff --git a/src/db/unit_tests/dbCellMappingTests.cc b/src/db/unit_tests/dbCellMappingTests.cc index 8392d5e25..5559abbe0 100644 --- a/src/db/unit_tests/dbCellMappingTests.cc +++ b/src/db/unit_tests/dbCellMappingTests.cc @@ -453,3 +453,40 @@ TEST(6) EXPECT_EQ (l2s (h), "a0top#0:cell_index=1 r90 0,0 array=(0,10,10,0 5x2),cell_index=2 r90 0,0 array=(0,10,10,0 5x2);a4#1:;a5#2:"); } +// Multi-mapping +TEST(7) +{ + std::auto_ptr g (new db::Layout ()); + db::Cell &a0 (g->cell (g->add_cell ("a0"))); + db::Cell &a1 (g->cell (g->add_cell ("a1"))); + db::Cell &a2 (g->cell (g->add_cell ("a2"))); + db::Cell &a3 (g->cell (g->add_cell ("a3"))); + db::Cell &a4 = g->cell (g->add_cell ("a4")); + db::Cell &a5 = g->cell (g->add_cell ("a5")); + + a3.insert (db::CellInstArray (db::CellInst (a4.cell_index ()), db::Trans ())); + a3.insert (db::CellInstArray (db::CellInst (a5.cell_index ()), db::Trans ())); + + a1.insert (db::CellInstArray (db::CellInst (a4.cell_index ()), db::Trans ())); + a1.insert (db::CellInstArray (db::CellInst (a3.cell_index ()), db::Trans ())); + a2.insert (db::CellInstArray (db::CellInst (a4.cell_index ()), db::Trans ())); + + db::Layout h; + db::Cell &b0 (h.cell (h.add_cell ("b0"))); + db::Cell &b1 (h.cell (h.add_cell ("b1"))); + db::Cell &b2 (h.cell (h.add_cell ("b2"))); + + db::CellMapping cm; + std::vector cib, cia; + cia.push_back (a0.cell_index ()); + cia.push_back (a1.cell_index ()); + cia.push_back (a2.cell_index ()); + cib.push_back (b0.cell_index ()); + cib.push_back (b1.cell_index ()); + cib.push_back (b2.cell_index ()); + cm.create_multi_mapping_full (h, cib, *g, cia); + EXPECT_EQ (m2s (cm, *g, h), "a0->b0;a1->b1;a2->b2;a3->a3;a4->a4;a5->a5"); + + EXPECT_EQ (l2s (h), "b0#0:;b1#1:cell_index=3 r0 0,0,cell_index=4 r0 0,0;b2#2:cell_index=4 r0 0,0;a3#3:cell_index=4 r0 0,0,cell_index=5 r0 0,0;a4#4:;a5#5:"); +} + diff --git a/testdata/ruby/dbCellMapping.rb b/testdata/ruby/dbCellMapping.rb index b15a25ba3..e7ef1496b 100644 --- a/testdata/ruby/dbCellMapping.rb +++ b/testdata/ruby/dbCellMapping.rb @@ -205,6 +205,41 @@ class DBCellMapping_TestClass < TestBase end + def test_2 + + ly = RBA::Layout::new + + a0 = ly.create_cell("a0") + a1 = ly.create_cell("a1") + a2 = ly.create_cell("a2") + a3 = ly.create_cell("a3") + a4 = ly.create_cell("a4") + a5 = ly.create_cell("a5") + + a3.insert(RBA::CellInstArray::new(a4.cell_index, RBA::Trans::new)) + a3.insert(RBA::CellInstArray::new(a5.cell_index, RBA::Trans::new)) + + a1.insert(RBA::CellInstArray::new(a4.cell_index, RBA::Trans::new)) + a1.insert(RBA::CellInstArray::new(a3.cell_index, RBA::Trans::new)) + a2.insert(RBA::CellInstArray::new(a4.cell_index, RBA::Trans::new)) + + ly_target = RBA::Layout::new + b0 = ly_target.create_cell("b0") + b1 = ly_target.create_cell("b1") + b2 = ly_target.create_cell("b2") + + cm = RBA::CellMapping::new + cm.for_multi_cells(ly_target, [ b0, b1, b2 ].collect { |c| c.cell_index }, ly, [ a0, a1, a2 ].collect { |c| c.cell_index }) + + assert_equal(mapping_to_s(ly_target, ly, cm), "b0=>a0;b1=>a1;b2=>a2") + + cm = RBA::CellMapping::new + cm.for_multi_cells_full(ly_target, [ b0, b1, b2 ].collect { |c| c.cell_index }, ly, [ a0, a1, a2 ].collect { |c| c.cell_index }) + + assert_equal(mapping_to_s(ly_target, ly, cm), "b0=>a0;b1=>a1;b2=>a2;a3=>a3;a4=>a4;a5=>a5") + + end + end load("test_epilogue.rb") From 5280c762e479bd88b1ff99a894938567a3d139cf Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sat, 29 Aug 2020 22:49:38 +0200 Subject: [PATCH 114/121] Provide multi-cell copy/move of shapes (GSI binding) --- src/db/db/dbCellMapping.cc | 11 +++ src/db/db/dbCellMapping.h | 5 ++ src/db/db/gsiDeclDbLayout.cc | 95 ++++++++++++++++++++++ testdata/ruby/dbLayout.rb | 149 +++++++++++++++++++++++++++++++++++ 4 files changed, 260 insertions(+) diff --git a/src/db/db/dbCellMapping.cc b/src/db/db/dbCellMapping.cc index 5c65eb914..19c4fee39 100644 --- a/src/db/db/dbCellMapping.cc +++ b/src/db/db/dbCellMapping.cc @@ -269,6 +269,17 @@ void CellMapping::clear () m_b2a_mapping.clear (); } +std::vector CellMapping::source_cells () const +{ + std::vector s; + s.reserve (m_b2a_mapping.size ()); + for (iterator m = begin (); m != end (); ++m) { + s.push_back (m->first); + } + return s; +} + + void CellMapping::create_single_mapping (const db::Layout & /*layout_a*/, db::cell_index_type cell_index_a, const db::Layout & /*layout_b*/, db::cell_index_type cell_index_b) { diff --git a/src/db/db/dbCellMapping.h b/src/db/db/dbCellMapping.h index 8857ad5c8..761ff31b5 100644 --- a/src/db/db/dbCellMapping.h +++ b/src/db/db/dbCellMapping.h @@ -196,6 +196,11 @@ public: return m_b2a_mapping.end (); } + /** + * @brief Gets the source cells + */ + std::vector source_cells () const; + /** * @brief Access to the mapping table */ diff --git a/src/db/db/gsiDeclDbLayout.cc b/src/db/db/gsiDeclDbLayout.cc index d6d5c9975..e2e358a4c 100644 --- a/src/db/db/gsiDeclDbLayout.cc +++ b/src/db/db/gsiDeclDbLayout.cc @@ -37,6 +37,8 @@ #include "dbEdgePairs.h" #include "dbTexts.h" #include "dbLayoutUtils.h" +#include "dbLayerMapping.h" +#include "dbCellMapping.h" #include "tlStream.h" namespace gsi @@ -822,6 +824,56 @@ static void scale_and_snap2 (db::Layout *layout, db::cell_index_type ci, db::Coo scale_and_snap (*layout, layout->cell (ci), g, m, d); } +static void copy_tree_shapes2 (db::Layout *layout, const db::Layout &source_layout, const db::CellMapping &cm) +{ + if (layout == &source_layout) { + throw tl::Exception (tl::to_string (tr ("Cannot copy shapes within the same layout"))); + } + + db::ICplxTrans trans (source_layout.dbu () / layout->dbu ()); + + db::LayerMapping lm; + lm.create_full (*layout, source_layout); + + db::copy_shapes (*layout, source_layout, trans, cm.source_cells (), cm.table (), lm.table ()); +} + +static void copy_tree_shapes3 (db::Layout *layout, const db::Layout &source_layout, const db::CellMapping &cm, const db::LayerMapping &lm) +{ + if (layout == &source_layout) { + throw tl::Exception (tl::to_string (tr ("Cannot copy shapes within the same layout"))); + } + + db::ICplxTrans trans (source_layout.dbu () / layout->dbu ()); + + db::copy_shapes (*layout, source_layout, trans, cm.source_cells (), cm.table (), lm.table ()); +} + +static void move_tree_shapes2 (db::Layout *layout, db::Layout &source_layout, const db::CellMapping &cm) +{ + if (layout == &source_layout) { + throw tl::Exception (tl::to_string (tr ("Cannot copy shapes within the same layout"))); + } + + db::ICplxTrans trans (source_layout.dbu () / layout->dbu ()); + + db::LayerMapping lm; + lm.create_full (*layout, source_layout); + + db::move_shapes (*layout, source_layout, trans, cm.source_cells (), cm.table (), lm.table ()); +} + +static void move_tree_shapes3 (db::Layout *layout, db::Layout &source_layout, const db::CellMapping &cm, const db::LayerMapping &lm) +{ + if (layout == &source_layout) { + throw tl::Exception (tl::to_string (tr ("Cannot copy shapes within the same layout"))); + } + + db::ICplxTrans trans (source_layout.dbu () / layout->dbu ()); + + db::move_shapes (*layout, source_layout, trans, cm.source_cells (), cm.table (), lm.table ()); +} + Class decl_LayoutMetaInfo ("db", "LayoutMetaInfo", gsi::constructor ("new", &layout_meta_info_ctor, gsi::arg ("name"), gsi::arg ("value"), gsi::arg ("description", std::string ()), "@brief Creates a layout meta info object\n" @@ -1529,6 +1581,49 @@ Class decl_Layout ("db", "Layout", "an index in the range of 0 to layers-1 needs to be a valid layer. These layers can be either valid, " "special or unused. Use \\is_valid_layer? and \\is_special_layer? to test for the first two states.\n" ) + + gsi::method_ext ("copy_tree_shapes", ©_tree_shapes2, gsi::arg ("source_layout"), gsi::arg ("cell_mapping"), + "@brief Copies the shapes for all given mappings in the \\CellMapping object\n" + "@param source_layout The layout where to take the shapes from\n" + "@param cell_mapping The cell mapping object that determines how cells are identified between source and target layout\n" + "\n" + "Provide a \\CellMapping object to specify pairs of cells which are mapped from the source layout to this " + "layout. When constructing such a cell mapping object for example with \\CellMapping#for_multi_cell_full, use self " + "as the target layout. During the cell mapping construction, the cell mapper will usually create a suitable target " + "hierarchy already. After having completed the cell mapping, use \\copy_tree_shapes to copy over the shapes from " + "the source to the target layout.\n" + "\n" + "This method has been added in version 0.27.\n" + ) + + gsi::method_ext ("copy_tree_shapes", ©_tree_shapes3, gsi::arg ("source_layout"), gsi::arg ("cell_mapping"), gsi::arg ("layer_mapping"), + "@brief Copies the shapes for all given mappings in the \\CellMapping object using the given layer mapping\n" + "@param source_layout The layout where to take the shapes from\n" + "@param cell_mapping The cell mapping object that determines how cells are identified between source and target layout\n" + "@param layer_mapping Specifies which layers are copied from the source layout to the target layout\n" + "\n" + "Provide a \\CellMapping object to specify pairs of cells which are mapped from the source layout to this " + "layout. When constructing such a cell mapping object for example with \\CellMapping#for_multi_cell_full, use self " + "as the target layout. During the cell mapping construction, the cell mapper will usually create a suitable target " + "hierarchy already. After having completed the cell mapping, use \\copy_tree_shapes to copy over the shapes from " + "the source to the target layout.\n" + "\n" + "This method has been added in version 0.27.\n" + ) + + gsi::method_ext ("move_tree_shapes", &move_tree_shapes2, gsi::arg ("source_layout"), gsi::arg ("cell_mapping"), + "@brief Moves the shapes for all given mappings in the \\CellMapping object\n" + "\n" + "This method acts like the corresponding \\copy_tree_shapes method, but removes the shapes from the source layout " + "after they have been copied.\n" + "\n" + "This method has been added in version 0.27.\n" + ) + + gsi::method_ext ("move_tree_shapes", &move_tree_shapes3, gsi::arg ("source_layout"), gsi::arg ("cell_mapping"), gsi::arg ("layer_mapping"), + "@brief Moves the shapes for all given mappings in the \\CellMapping object using the given layer mapping\n" + "\n" + "This method acts like the corresponding \\copy_tree_shapes method, but removes the shapes from the source layout " + "after they have been copied.\n" + "\n" + "This method has been added in version 0.27.\n" + ) + gsi::method_ext ("scale_and_snap", &scale_and_snap1, gsi::arg ("cell"), gsi::arg ("grid"), gsi::arg ("mult"), gsi::arg ("div"), "@brief Scales and snaps the layout below a given cell by the given rational factor and snaps to the given grid\n" "\n" diff --git a/testdata/ruby/dbLayout.rb b/testdata/ruby/dbLayout.rb index cdefe938b..ecb2efff1 100644 --- a/testdata/ruby/dbLayout.rb +++ b/testdata/ruby/dbLayout.rb @@ -1994,6 +1994,155 @@ END end + def test_20 + + # copy shapes between cell trees starting from multiple cells + + l = RBA::Layout.new + l.insert_layer_at(0, RBA::LayerInfo.new(1, 0)) + l.insert_layer_at(1, RBA::LayerInfo.new(2, 0)) + c0 = l.cell(l.add_cell("c0")) + c9 = l.cell(l.add_cell("c9")) + c1 = l.cell(l.add_cell("c1")) + c2 = l.cell(l.add_cell("c2")) + c3 = l.cell(l.add_cell("c3")) + + b = RBA::Box.new(0, 100, 1000, 1200) + c0.shapes(0).insert(b) + c1.shapes(0).insert(b) + c2.shapes(0).insert(b) + c3.shapes(0).insert(b) + b = RBA::Box.new(1, 101, 1001, 1201) + s = c0.shapes(1).insert(b) + s.set_property("p", 17) + + tt = RBA::Trans.new + s = c0.insert(RBA::CellInstArray.new(c1.cell_index, tt)) + s.set_property("p", 18) + c0.insert(RBA::CellInstArray.new(c2.cell_index, RBA::Trans.new(RBA::Point.new(100, -100)))) + c0.insert(RBA::CellInstArray.new(c3.cell_index, RBA::Trans.new(1))) + c2.insert(RBA::CellInstArray.new(c3.cell_index, RBA::Trans.new(RBA::Point.new(1100, 0)))) + c9.insert(RBA::CellInstArray.new(c1.cell_index, tt)) + + assert_equal(collect(c0.begin_shapes_rec(0), l), "[c0](0,100;1000,1200)/[c2](100,0;1100,1100)/[c3](1200,0;2200,1100)/[c3](-1200,0;-100,1000)/[c1](0,100;1000,1200)") + assert_equal(collect(c0.begin_shapes_rec(1), l), "[c0](1,101;1001,1201)") + assert_equal(collect(c9.begin_shapes_rec(0), l), "[c1](0,100;1000,1200)") + assert_equal(collect(c9.begin_shapes_rec(1), l), "") + + lt = RBA::Layout::new + + new_cells = [ c0, c9 ].collect { |c| lt.add_cell(c.name) } + ( c0t, c9t ) = new_cells.collect { |ci| lt.cell(ci) } + org_cells = [ c0, c9 ].collect { |c| c.cell_index } + + cm = RBA::CellMapping::new + cm.for_multi_cells(lt, new_cells, l, org_cells) + + lt.copy_tree_shapes(l, cm) + assert_equal(collect(c0t.begin_shapes_rec(0), lt), "[c0](0,100;1000,1200)/[c0](0,100;1000,1200)/[c0](100,0;1100,1100)/[c0](-1200,0;-100,1000)/[c0](1200,0;2200,1100)") + assert_equal(c0t.begin_shapes_rec(0).shape.property("p"), nil) + assert_equal(collect(c9t.begin_shapes_rec(0), lt), "[c9](0,100;1000,1200)") + assert_equal(collect(c0t.begin_shapes_rec(1), l), "[c0](1,101;1001,1201)") + assert_equal(c0t.begin_shapes_rec(1).shape.property("p"), 17) + assert_equal(collect(c9t.begin_shapes_rec(1), l), "") + + lt = RBA::Layout::new + + new_cells = [ c0, c9 ].collect { |c| lt.add_cell(c.name) } + ( c0t, c9t ) = new_cells.collect { |ci| lt.cell(ci) } + org_cells = [ c0, c9 ].collect { |c| c.cell_index } + + cm = RBA::CellMapping::new + cm.for_multi_cells_full(lt, new_cells, l, org_cells) + + lt.copy_tree_shapes(l, cm) + assert_equal(collect(c0t.begin_shapes_rec(0), lt), "[c0](0,100;1000,1200)/[c2](100,0;1100,1100)/[c3](1200,0;2200,1100)/[c3](-1200,0;-100,1000)/[c1](0,100;1000,1200)") + assert_equal(c0t.begin_shapes_rec(0).shape.property("p"), nil) + assert_equal(collect(c9t.begin_shapes_rec(0), lt), "[c1](0,100;1000,1200)") + assert_equal(collect(c0t.begin_shapes_rec(1), l), "[c0](1,101;1001,1201)") + assert_equal(c0t.begin_shapes_rec(1).shape.property("p"), 17) + assert_equal(collect(c9t.begin_shapes_rec(1), l), "") + + lt = RBA::Layout::new + lt.layer + lt.layer + ll = lt.layer + + new_cells = [ c0, c9 ].collect { |c| lt.add_cell(c.name) } + ( c0t, c9t ) = new_cells.collect { |ci| lt.cell(ci) } + org_cells = [ c0, c9 ].collect { |c| c.cell_index } + + cm = RBA::CellMapping::new + cm.for_multi_cells_full(lt, new_cells, l, org_cells) + + lm = RBA::LayerMapping::new + lm.map(0, ll) + + lt.copy_tree_shapes(l, cm, lm) + assert_equal(collect(c0t.begin_shapes_rec(ll), lt), "[c0](0,100;1000,1200)/[c2](100,0;1100,1100)/[c3](1200,0;2200,1100)/[c3](-1200,0;-100,1000)/[c1](0,100;1000,1200)") + assert_equal(c0t.begin_shapes_rec(ll).shape.property("p"), nil) + assert_equal(collect(c9t.begin_shapes_rec(ll), lt), "[c1](0,100;1000,1200)") + + lt = RBA::Layout::new + ls = l.dup + + assert_equal(ls.cell(c0.cell_index).name, "c0") + assert_equal(ls.cell(c9.cell_index).name, "c9") + + new_cells = [ c0, c9 ].collect { |c| lt.add_cell(c.name) } + ( c0t, c9t ) = new_cells.collect { |ci| lt.cell(ci) } + org_cells = [ c0, c9 ].collect { |c| c.cell_index } + + cm = RBA::CellMapping::new + cm.for_multi_cells(lt, new_cells, ls, org_cells) + + lt.move_tree_shapes(ls, cm) + + assert_equal(collect(ls.cell(c0.cell_index).begin_shapes_rec(0), ls), "") + assert_equal(collect(ls.cell(c0.cell_index).begin_shapes_rec(1), ls), "") + assert_equal(collect(ls.cell(c9.cell_index).begin_shapes_rec(0), ls), "") + assert_equal(collect(ls.cell(c9.cell_index).begin_shapes_rec(1), ls), "") + + assert_equal(collect(c0t.begin_shapes_rec(0), lt), "[c0](0,100;1000,1200)/[c0](0,100;1000,1200)/[c0](100,0;1100,1100)/[c0](-1200,0;-100,1000)/[c0](1200,0;2200,1100)") + assert_equal(c0t.begin_shapes_rec(0).shape.property("p"), nil) + assert_equal(collect(c9t.begin_shapes_rec(0), lt), "[c9](0,100;1000,1200)") + assert_equal(collect(c0t.begin_shapes_rec(1), l), "[c0](1,101;1001,1201)") + assert_equal(c0t.begin_shapes_rec(1).shape.property("p"), 17) + assert_equal(collect(c9t.begin_shapes_rec(1), l), "") + + lt = RBA::Layout::new + lt.layer + lt.layer + ll = lt.layer + + ls = l.dup + + assert_equal(ls.cell(c0.cell_index).name, "c0") + assert_equal(ls.cell(c9.cell_index).name, "c9") + + new_cells = [ c0, c9 ].collect { |c| lt.add_cell(c.name) } + ( c0t, c9t ) = new_cells.collect { |ci| lt.cell(ci) } + org_cells = [ c0, c9 ].collect { |c| c.cell_index } + + cm = RBA::CellMapping::new + cm.for_multi_cells(lt, new_cells, ls, org_cells) + + lm = RBA::LayerMapping::new + lm.map(0, ll) + + lt.move_tree_shapes(ls, cm, lm) + + assert_equal(collect(ls.cell(c0.cell_index).begin_shapes_rec(0), ls), "") + assert_equal(collect(ls.cell(c0.cell_index).begin_shapes_rec(1), ls), "[c0](1,101;1001,1201)") + assert_equal(collect(ls.cell(c9.cell_index).begin_shapes_rec(0), ls), "") + assert_equal(collect(ls.cell(c9.cell_index).begin_shapes_rec(1), ls), "") + + assert_equal(collect(c0t.begin_shapes_rec(ll), lt), "[c0](0,100;1000,1200)/[c0](0,100;1000,1200)/[c0](100,0;1100,1100)/[c0](-1200,0;-100,1000)/[c0](1200,0;2200,1100)") + assert_equal(c0t.begin_shapes_rec(ll).shape.property("p"), nil) + assert_equal(collect(c9t.begin_shapes_rec(ll), lt), "[c9](0,100;1000,1200)") + + end + # Iterating while flatten def test_issue200 From 33229ccfaa43e9a1ed9d5ab9d9bd047a86584f16 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sat, 29 Aug 2020 10:07:17 +0200 Subject: [PATCH 115/121] Updated fix version in RBA::Layout documentation. --- src/db/db/gsiDeclDbLayout.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/db/db/gsiDeclDbLayout.cc b/src/db/db/gsiDeclDbLayout.cc index e2e358a4c..79574277b 100644 --- a/src/db/db/gsiDeclDbLayout.cc +++ b/src/db/db/gsiDeclDbLayout.cc @@ -1592,7 +1592,7 @@ Class decl_Layout ("db", "Layout", "hierarchy already. After having completed the cell mapping, use \\copy_tree_shapes to copy over the shapes from " "the source to the target layout.\n" "\n" - "This method has been added in version 0.27.\n" + "This method has been added in version 0.26.8.\n" ) + gsi::method_ext ("copy_tree_shapes", ©_tree_shapes3, gsi::arg ("source_layout"), gsi::arg ("cell_mapping"), gsi::arg ("layer_mapping"), "@brief Copies the shapes for all given mappings in the \\CellMapping object using the given layer mapping\n" @@ -1606,7 +1606,7 @@ Class decl_Layout ("db", "Layout", "hierarchy already. After having completed the cell mapping, use \\copy_tree_shapes to copy over the shapes from " "the source to the target layout.\n" "\n" - "This method has been added in version 0.27.\n" + "This method has been added in version 0.26.8.\n" ) + gsi::method_ext ("move_tree_shapes", &move_tree_shapes2, gsi::arg ("source_layout"), gsi::arg ("cell_mapping"), "@brief Moves the shapes for all given mappings in the \\CellMapping object\n" @@ -1614,7 +1614,7 @@ Class decl_Layout ("db", "Layout", "This method acts like the corresponding \\copy_tree_shapes method, but removes the shapes from the source layout " "after they have been copied.\n" "\n" - "This method has been added in version 0.27.\n" + "This method has been added in version 0.26.8.\n" ) + gsi::method_ext ("move_tree_shapes", &move_tree_shapes3, gsi::arg ("source_layout"), gsi::arg ("cell_mapping"), gsi::arg ("layer_mapping"), "@brief Moves the shapes for all given mappings in the \\CellMapping object using the given layer mapping\n" @@ -1622,7 +1622,7 @@ Class decl_Layout ("db", "Layout", "This method acts like the corresponding \\copy_tree_shapes method, but removes the shapes from the source layout " "after they have been copied.\n" "\n" - "This method has been added in version 0.27.\n" + "This method has been added in version 0.26.8.\n" ) + gsi::method_ext ("scale_and_snap", &scale_and_snap1, gsi::arg ("cell"), gsi::arg ("grid"), gsi::arg ("mult"), gsi::arg ("div"), "@brief Scales and snaps the layout below a given cell by the given rational factor and snaps to the given grid\n" From 948819472b3db6a87afa1a13a184d77c0f2d1d45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20K=C3=B6fferlein?= Date: Mon, 14 Sep 2020 18:33:01 +0200 Subject: [PATCH 116/121] Issue 615 (#621) * Password encoding to UTF-8 for Basic HTTP authentication - this is basically a hack. Needs to be reverted as soon as Qt switches to UTF-8 encoding. * Workaround for issue #615 --- src/tl/tl/tlHttpStreamQt.cc | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/src/tl/tl/tlHttpStreamQt.cc b/src/tl/tl/tlHttpStreamQt.cc index be8e1720d..48510c697 100644 --- a/src/tl/tl/tlHttpStreamQt.cc +++ b/src/tl/tl/tlHttpStreamQt.cc @@ -66,8 +66,20 @@ AuthenticationHandler::authenticationRequired (QNetworkReply *reply, QAuthentica // TODO: how to cancel? std::string user, passwd; if (sp_credential_provider->user_password (tl::to_string (reply->url ().toString ()), tl::to_string (auth->realm ()), true, ++m_retry, user, passwd)) { - auth->setPassword (tl::to_qstring (passwd)); - auth->setUser (tl::to_qstring (user)); + + // this is freaky: Qt sends password as Latin1 encoded for Basic authentication, but apparently some servers + // expect UTF-8 today. So do them a favor and encode UTF8 into Latin1, so it gets valid UTF8 when turned into Latin1 ... + // We do this for Digest and Basic as they apparently both use Latin 1 encoding. But it's unclear whether all servers + // expect UTF-8 encoding. + bool is_basic_or_digest = ! auth->option (QString::fromUtf8 ("realm")).isNull (); + if (is_basic_or_digest) { + auth->setPassword (QString::fromLatin1 (passwd.c_str ())); + auth->setUser (QString::fromLatin1 (user.c_str ())); + } else { + auth->setPassword (tl::to_qstring (passwd)); + auth->setUser (tl::to_qstring (user)); + } + } } @@ -81,8 +93,20 @@ AuthenticationHandler::proxyAuthenticationRequired (const QNetworkProxy &proxy, // TODO: how to cancel? std::string user, passwd; if (sp_credential_provider->user_password (tl::to_string (proxy.hostName ()), tl::to_string (auth->realm ()), true, ++m_proxy_retry, user, passwd)) { - auth->setPassword (tl::to_qstring (passwd)); - auth->setUser (tl::to_qstring (user)); + + // this is freaky: Qt sends password as Latin1 encoded for Basic authentication, but apparently some servers + // expect UTF-8 today. So do them a favor and encode UTF8 into Latin1, so it gets valid UTF8 when turned into Latin1 ... + // We do this for Digest and Basic as they apparently both use Latin 1 encoding. But it's unclear whether all servers + // expect UTF-8 encoding. + bool is_basic_or_digest = ! auth->option (QString::fromUtf8 ("realm")).isNull (); + if (is_basic_or_digest) { + auth->setPassword (QString::fromLatin1 (passwd.c_str ())); + auth->setUser (QString::fromLatin1 (user.c_str ())); + } else { + auth->setPassword (tl::to_qstring (passwd)); + auth->setUser (tl::to_qstring (user)); + } + } } From 8cdb6187b8043e688a5f3728b8c4d462fd0a0629 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20K=C3=B6fferlein?= Date: Mon, 14 Sep 2020 18:33:24 +0200 Subject: [PATCH 117/121] Fixed issue #617 (constness problem in netlist) (#622) --- src/db/db/dbCircuit.cc | 4 +- src/db/db/dbCircuit.h | 4 +- src/db/db/gsiDeclDbNetlist.cc | 271 +++++++++++++++++++++++++++++++++- testdata/ruby/dbNetlist.rb | 45 +++++- 4 files changed, 314 insertions(+), 10 deletions(-) diff --git a/src/db/db/dbCircuit.cc b/src/db/db/dbCircuit.cc index 0c80b380a..8ad4321cc 100644 --- a/src/db/db/dbCircuit.cc +++ b/src/db/db/dbCircuit.cc @@ -307,7 +307,7 @@ void Circuit::clear_pins () m_pin_by_id.clear (); } -const Pin &Circuit::add_pin (const Pin &pin) +Pin &Circuit::add_pin (const Pin &pin) { m_pins.push_back (pin); m_pins.back ().set_id (m_pin_by_id.size ()); @@ -315,7 +315,7 @@ const Pin &Circuit::add_pin (const Pin &pin) return m_pins.back (); } -const Pin &Circuit::add_pin (const std::string &name) +Pin &Circuit::add_pin (const std::string &name) { m_pins.push_back (Pin (name)); m_pins.back ().set_id (m_pin_by_id.size ()); diff --git a/src/db/db/dbCircuit.h b/src/db/db/dbCircuit.h index 7c1c5f727..bcb1e956d 100644 --- a/src/db/db/dbCircuit.h +++ b/src/db/db/dbCircuit.h @@ -322,13 +322,13 @@ public: /** * @brief Adds a pin to this circuit */ - const Pin &add_pin (const std::string &name); + Pin &add_pin (const std::string &name); /** * @brief Adds a pin to this circuit * This version uses the given pin as the template. */ - const Pin &add_pin (const Pin &pin); + Pin &add_pin (const Pin &pin); /** * @brief Removes the pin with the given ID diff --git a/src/db/db/gsiDeclDbNetlist.cc b/src/db/db/gsiDeclDbNetlist.cc index 77cd998a6..a4f17d210 100644 --- a/src/db/db/gsiDeclDbNetlist.cc +++ b/src/db/db/gsiDeclDbNetlist.cc @@ -295,6 +295,11 @@ Class decl_dbDevice (decl_dbNetlistObject, "db", "Device", gsi::method ("circuit", (const db::Circuit *(db::Device::*) () const) &db::Device::circuit, "@brief Gets the circuit the device lives in." ) + + gsi::method ("circuit", (db::Circuit *(db::Device::*) ()) &db::Device::circuit, + "@brief Gets the circuit the device lives in (non-const version)." + "\n\n" + "This constness variant has been introduced in version 0.26.8" + ) + gsi::method ("id", &db::Device::id, "@brief Gets the device ID.\n" "The ID is a unique integer which identifies the device.\n" @@ -326,6 +331,12 @@ Class decl_dbDevice (decl_dbNetlistObject, "db", "Device", "@brief Gets the net connected to the specified terminal.\n" "If the terminal is not connected, nil is returned for the net." ) + + gsi::method ("net_for_terminal", (db::Net *(db::Device::*) (size_t)) &db::Device::net_for_terminal, gsi::arg ("terminal_id"), + "@brief Gets the net connected to the specified terminal (non-const version).\n" + "If the terminal is not connected, nil is returned for the net." + "\n\n" + "This constness variant has been introduced in version 0.26.8" + ) + gsi::method ("connect_terminal", &db::Device::connect_terminal, gsi::arg ("terminal_id"), gsi::arg ("net"), "@brief Connects the given terminal to the specified net.\n" ) + @@ -378,6 +389,11 @@ Class decl_dbDeviceAbstract ("db", "DeviceAbstract", gsi::method ("netlist", (const db::Netlist *(db::DeviceAbstract::*) () const) &db::DeviceAbstract::netlist, "@brief Gets the netlist the device abstract lives in." ) + + gsi::method ("netlist", (db::Netlist *(db::DeviceAbstract::*) ()) &db::DeviceAbstract::netlist, + "@brief Gets the netlist the device abstract lives in (non-const version)." + "\n\n" + "This constness variant has been introduced in version 0.26.8" + ) + gsi::method ("device_class", &db::DeviceAbstract::device_class, "@brief Gets the device class of the device." ) + @@ -427,10 +443,21 @@ Class decl_dbSubCircuit (decl_dbNetlistObject, "db", "SubCircuit gsi::method ("circuit_ref", (const db::Circuit *(db::SubCircuit::*) () const) &db::SubCircuit::circuit_ref, "@brief Gets the circuit referenced by the subcircuit.\n" ) + + gsi::method ("circuit_ref", (db::Circuit *(db::SubCircuit::*) ()) &db::SubCircuit::circuit_ref, + "@brief Gets the circuit referenced by the subcircuit (non-const version).\n" + "\n\n" + "This constness variant has been introduced in version 0.26.8" + ) + gsi::method ("circuit", (const db::Circuit *(db::SubCircuit::*) () const) &db::SubCircuit::circuit, "@brief Gets the circuit the subcircuit lives in.\n" "This is NOT the circuit which is referenced. For getting the circuit that the subcircuit references, use \\circuit_ref." ) + + gsi::method ("circuit", (db::Circuit *(db::SubCircuit::*) ()) &db::SubCircuit::circuit, + "@brief Gets the circuit the subcircuit lives in (non-const version).\n" + "This is NOT the circuit which is referenced. For getting the circuit that the subcircuit references, use \\circuit_ref." + "\n\n" + "This constness variant has been introduced in version 0.26.8" + ) + gsi::method ("id", &db::SubCircuit::id, "@brief Gets the subcircuit ID.\n" "The ID is a unique integer which identifies the subcircuit.\n" @@ -453,6 +480,12 @@ Class decl_dbSubCircuit (decl_dbNetlistObject, "db", "SubCircuit "@brief Gets the net connected to the specified pin of the subcircuit.\n" "If the pin is not connected, nil is returned for the net." ) + + gsi::method ("net_for_pin", (db::Net *(db::SubCircuit::*) (size_t)) &db::SubCircuit::net_for_pin, gsi::arg ("pin_id"), + "@brief Gets the net connected to the specified pin of the subcircuit (non-const version).\n" + "If the pin is not connected, nil is returned for the net." + "\n\n" + "This constness variant has been introduced in version 0.26.8" + ) + gsi::method ("connect_pin", &db::SubCircuit::connect_pin, gsi::arg ("pin_id"), gsi::arg ("net"), "@brief Connects the given pin to the specified net.\n" ) + @@ -505,8 +538,19 @@ Class decl_dbNetTerminalRef ("db", "NetTerminalRef", "@brief Gets the device reference.\n" "Gets the device object that this connection is made to." ) + + gsi::method ("device", (db::Device *(db::NetTerminalRef::*) ()) &db::NetTerminalRef::device, + "@brief Gets the device reference (non-const version).\n" + "Gets the device object that this connection is made to." + "\n\n" + "This constness variant has been introduced in version 0.26.8" + ) + gsi::method ("net", (const db::Net *(db::NetTerminalRef::*) () const) &db::NetTerminalRef::net, - "@brief Gets the net this terminal reference is attached to" + "@brief Gets the net this terminal reference is attached to." + ) + + gsi::method ("net", (db::Net *(db::NetTerminalRef::*) ()) &db::NetTerminalRef::net, + "@brief Gets the net this terminal reference is attached to (non-const version)." + "\n\n" + "This constness variant has been introduced in version 0.26.8" ) + gsi::method ("device_class", (const db::DeviceClass *(db::NetTerminalRef::*) () const) &db::NetTerminalRef::device_class, "@brief Gets the class of the device which is addressed." @@ -528,7 +572,12 @@ Class decl_dbNetPinRef ("db", "NetPinRef", "@brief Gets the \\Pin object of the pin the connection is made to." ) + gsi::method ("net", (const db::Net *(db::NetPinRef::*) () const) &db::NetPinRef::net, - "@brief Gets the net this pin reference is attached to" + "@brief Gets the net this pin reference is attached to." + ) + + gsi::method ("net", (db::Net *(db::NetPinRef::*) ()) &db::NetPinRef::net, + "@brief Gets the net this pin reference is attached to (non-const version)." + "\n\n" + "This constness variant has been introduced in version 0.26.8" ), "@brief A connection to an outgoing pin of the circuit.\n" "This object is used inside a net (see \\Net) to describe the connections a net makes.\n" @@ -548,8 +597,20 @@ Class decl_dbNetSubcircuitPinRef ("db", "NetSubcircuitP "This attribute indicates the subcircuit the net attaches to. The " "subcircuit lives in the same circuit than the net. " ) + + gsi::method ("subcircuit", (db::SubCircuit *(db::NetSubcircuitPinRef::*) ()) &db::NetSubcircuitPinRef::subcircuit, + "@brief Gets the subcircuit reference (non-const version).\n" + "This attribute indicates the subcircuit the net attaches to. The " + "subcircuit lives in the same circuit than the net. " + "\n\n" + "This constness variant has been introduced in version 0.26.8" + ) + gsi::method ("net", (const db::Net *(db::NetSubcircuitPinRef::*) () const) &db::NetSubcircuitPinRef::net, - "@brief Gets the net this pin reference is attached to" + "@brief Gets the net this pin reference is attached to." + ) + + gsi::method ("net", (db::Net *(db::NetSubcircuitPinRef::*) ()) &db::NetSubcircuitPinRef::net, + "@brief Gets the net this pin reference is attached to (non-const version)." + "\n\n" + "This constness variant has been introduced in version 0.26.8" ), "@brief A connection to a pin of a subcircuit.\n" "This object is used inside a net (see \\Net) to describe the connections a net makes.\n" @@ -596,16 +657,37 @@ Class decl_dbNet (decl_dbNetlistObject, "db", "Net", "Pin connections are described by \\NetPinRef objects. Pin connections " "are connections to outgoing pins of the circuit the net lives in." ) + + gsi::iterator ("each_pin", gsi::return_reference (), (db::Net::pin_iterator (db::Net::*) ()) &db::Net::begin_pins, (db::Net::pin_iterator (db::Net::*) ()) &db::Net::end_pins, + "@brief Iterates over all outgoing pins the net connects (non-const version).\n" + "Pin connections are described by \\NetPinRef objects. Pin connections " + "are connections to outgoing pins of the circuit the net lives in." + "\n\n" + "This constness variant has been introduced in version 0.26.8" + ) + gsi::iterator ("each_subcircuit_pin", gsi::return_reference (), (db::Net::const_subcircuit_pin_iterator (db::Net::*) () const) &db::Net::begin_subcircuit_pins, (db::Net::const_subcircuit_pin_iterator (db::Net::*) () const) &db::Net::end_subcircuit_pins, "@brief Iterates over all subcircuit pins the net connects.\n" "Subcircuit pin connections are described by \\NetSubcircuitPinRef objects. These are " "connections to specific pins of subcircuits." ) + + gsi::iterator ("each_subcircuit_pin", gsi::return_reference (), (db::Net::subcircuit_pin_iterator (db::Net::*) ()) &db::Net::begin_subcircuit_pins, (db::Net::subcircuit_pin_iterator (db::Net::*) ()) &db::Net::end_subcircuit_pins, + "@brief Iterates over all subcircuit pins the net connects (non-const version).\n" + "Subcircuit pin connections are described by \\NetSubcircuitPinRef objects. These are " + "connections to specific pins of subcircuits." + "\n\n" + "This constness variant has been introduced in version 0.26.8" + ) + gsi::iterator ("each_terminal", gsi::return_reference (), (db::Net::const_terminal_iterator (db::Net::*) () const) &db::Net::begin_terminals, (db::Net::const_terminal_iterator (db::Net::*) () const) &db::Net::end_terminals, "@brief Iterates over all terminals the net connects.\n" "Terminals connect devices. Terminal connections are described by \\NetTerminalRef " "objects." ) + + gsi::iterator ("each_terminal", gsi::return_reference (), (db::Net::terminal_iterator (db::Net::*) ()) &db::Net::begin_terminals, (db::Net::terminal_iterator (db::Net::*) ()) &db::Net::end_terminals, + "@brief Iterates over all terminals the net connects (non-const version).\n" + "Terminals connect devices. Terminal connections are described by \\NetTerminalRef " + "objects." + "\n\n" + "This constness variant has been introduced in version 0.26.8" + ) + gsi::method ("is_floating?", &db::Net::is_floating, "@brief Returns true, if the net is floating.\n" "Floating nets are those which don't have any device or subcircuit on it and are not connected through a pin." @@ -1128,7 +1210,12 @@ static db::SubCircuit *create_subcircuit1 (db::Circuit *c, db::Circuit *cc, cons return sc; } -static const db::Net *circuit_net_for_pin (const db::Circuit *c, const db::Pin *pin) +static db::Net *circuit_net_for_pin (db::Circuit *c, const db::Pin *pin) +{ + return pin ? c->net_for_pin (pin->id ()) : 0; +} + +static const db::Net *circuit_net_for_pin_const (const db::Circuit *c, const db::Pin *pin) { return pin ? c->net_for_pin (pin->id ()) : 0; } @@ -1152,26 +1239,50 @@ static void circuit_disconnect_pin1 (db::Circuit *c, const db::Pin *pin) } } +static db::Pin *create_pin (db::Circuit *circuit, const std::string &name) +{ + return & circuit->add_pin (name); +} + Class decl_dbCircuit (decl_dbNetlistObject, "db", "Circuit", - gsi::method ("create_pin", (const db::Pin &(db::Circuit::*) (const std::string &)) &db::Circuit::add_pin, gsi::arg ("name"), + gsi::method_ext ("create_pin", &create_pin, gsi::arg ("name"), "@brief Creates a new \\Pin object inside the circuit\n" "This object will describe a pin of the circuit. A circuit connects " "to the outside through such a pin. The pin is added after all existing " "pins. For more details see the \\Pin class." + "\n\n" + "Starting with version 0.26.8, this method returns a reference to a \\Pin object rather than a copy." ) + gsi::method ("remove_pin", &db::Circuit::remove_pin, gsi::arg ("id"), "@brief Removes the pin with the given ID from the circuit\n" "\n" "This method has been introduced in version 0.26.2.\n" ) + + gsi::method ("rename_pin", &db::Circuit::rename_pin, gsi::arg ("id"), gsi::arg ("new_name"), + "@brief Renames the pin with the given ID to 'new_name'\n" + "\n" + "This method has been introduced in version 0.26.8.\n" + ) + gsi::iterator ("each_child", (db::Circuit::child_circuit_iterator (db::Circuit::*) ()) &db::Circuit::begin_children, (db::Circuit::child_circuit_iterator (db::Circuit::*) ()) &db::Circuit::end_children, "@brief Iterates over the child circuits of this circuit\n" "Child circuits are the ones that are referenced from this circuit via subcircuits." ) + + gsi::iterator ("each_child", (db::Circuit::const_child_circuit_iterator (db::Circuit::*) () const) &db::Circuit::begin_children, (db::Circuit::const_child_circuit_iterator (db::Circuit::*) () const) &db::Circuit::end_children, + "@brief Iterates over the child circuits of this circuit (const version)\n" + "Child circuits are the ones that are referenced from this circuit via subcircuits." + "\n\n" + "This constness variant has been introduced in version 0.26.8" + ) + gsi::iterator ("each_parent", (db::Circuit::parent_circuit_iterator (db::Circuit::*) ()) &db::Circuit::begin_parents, (db::Circuit::parent_circuit_iterator (db::Circuit::*) ()) &db::Circuit::end_parents, "@brief Iterates over the parent circuits of this circuit\n" "Child circuits are the ones that are referencing this circuit via subcircuits." ) + + gsi::iterator ("each_parent", (db::Circuit::const_parent_circuit_iterator (db::Circuit::*) () const) &db::Circuit::begin_parents, (db::Circuit::const_parent_circuit_iterator (db::Circuit::*) () const) &db::Circuit::end_parents, + "@brief Iterates over the parent circuits of this circuit (const version)\n" + "Child circuits are the ones that are referencing this circuit via subcircuits." + "\n\n" + "This constness variant has been introduced in version 0.26.8" + ) + gsi::method ("has_refs?", &db::Circuit::has_refs, "@brief Returns a value indicating whether the circuit has references\n" "A circuit has references if there is at least one subcircuit referring to it." @@ -1179,25 +1290,59 @@ Class decl_dbCircuit (decl_dbNetlistObject, "db", "Circuit", gsi::iterator ("each_ref", (db::Circuit::refs_iterator (db::Circuit::*) ()) &db::Circuit::begin_refs, (db::Circuit::refs_iterator (db::Circuit::*) ()) &db::Circuit::end_refs, "@brief Iterates over the subcircuit objects referencing this circuit\n" ) + + gsi::iterator ("each_ref", (db::Circuit::const_refs_iterator (db::Circuit::*) () const) &db::Circuit::begin_refs, (db::Circuit::const_refs_iterator (db::Circuit::*) () const) &db::Circuit::end_refs, + "@brief Iterates over the subcircuit objects referencing this circuit (const version)\n" + "\n\n" + "This constness variant has been introduced in version 0.26.8" + ) + gsi::iterator ("each_pin", (db::Circuit::pin_iterator (db::Circuit::*) ()) &db::Circuit::begin_pins, (db::Circuit::pin_iterator (db::Circuit::*) ()) &db::Circuit::end_pins, "@brief Iterates over the pins of the circuit" ) + + gsi::iterator ("each_pin", (db::Circuit::const_pin_iterator (db::Circuit::*) () const) &db::Circuit::begin_pins, (db::Circuit::const_pin_iterator (db::Circuit::*) () const) &db::Circuit::end_pins, + "@brief Iterates over the pins of the circuit (const version)" + "\n\n" + "This constness variant has been introduced in version 0.26.8" + ) + gsi::method ("device_by_id", (db::Device *(db::Circuit::*) (size_t)) &db::Circuit::device_by_id, gsi::arg ("id"), "@brief Gets the device object for a given ID.\n" "If the ID is not a valid device ID, nil is returned." ) + + gsi::method ("device_by_id", (const db::Device *(db::Circuit::*) (size_t) const) &db::Circuit::device_by_id, gsi::arg ("id"), + "@brief Gets the device object for a given ID (const version).\n" + "If the ID is not a valid device ID, nil is returned." + "\n\n" + "This constness variant has been introduced in version 0.26.8" + ) + gsi::method ("device_by_name", (db::Device *(db::Circuit::*) (const std::string &)) &db::Circuit::device_by_name, gsi::arg ("name"), "@brief Gets the device object for a given name.\n" "If the ID is not a valid device name, nil is returned." ) + + gsi::method ("device_by_name", (const db::Device *(db::Circuit::*) (const std::string &) const) &db::Circuit::device_by_name, gsi::arg ("name"), + "@brief Gets the device object for a given name (const version).\n" + "If the ID is not a valid device name, nil is returned." + "\n\n" + "This constness variant has been introduced in version 0.26.8" + ) + gsi::method ("subcircuit_by_id", (db::SubCircuit *(db::Circuit::*) (size_t)) &db::Circuit::subcircuit_by_id, gsi::arg ("id"), "@brief Gets the subcircuit object for a given ID.\n" "If the ID is not a valid subcircuit ID, nil is returned." ) + + gsi::method ("subcircuit_by_id", (const db::SubCircuit *(db::Circuit::*) (size_t) const) &db::Circuit::subcircuit_by_id, gsi::arg ("id"), + "@brief Gets the subcircuit object for a given ID (const version).\n" + "If the ID is not a valid subcircuit ID, nil is returned." + "\n\n" + "This constness variant has been introduced in version 0.26.8" + ) + gsi::method ("subcircuit_by_name", (db::SubCircuit *(db::Circuit::*) (const std::string &)) &db::Circuit::subcircuit_by_name, gsi::arg ("name"), "@brief Gets the subcircuit object for a given name.\n" "If the ID is not a valid subcircuit name, nil is returned." ) + + gsi::method ("subcircuit_by_name", (const db::SubCircuit *(db::Circuit::*) (const std::string &) const) &db::Circuit::subcircuit_by_name, gsi::arg ("name"), + "@brief Gets the subcircuit object for a given name (const version).\n" + "If the ID is not a valid subcircuit name, nil is returned." + "\n\n" + "This constness variant has been introduced in version 0.26.8" + ) + gsi::method ("net_by_cluster_id", (db::Net *(db::Circuit::*) (size_t)) &db::Circuit::net_by_cluster_id, gsi::arg ("cluster_id"), "@brief Gets the net object corresponding to a specific cluster ID\n" "If the ID is not a valid pin cluster ID, nil is returned." @@ -1206,14 +1351,32 @@ Class decl_dbCircuit (decl_dbNetlistObject, "db", "Circuit", "@brief Gets the net object for a given name.\n" "If the ID is not a valid net name, nil is returned." ) + + gsi::method ("net_by_name", (const db::Net *(db::Circuit::*) (const std::string &) const) &db::Circuit::net_by_name, gsi::arg ("name"), + "@brief Gets the net object for a given name (const version).\n" + "If the ID is not a valid net name, nil is returned." + "\n\n" + "This constness variant has been introduced in version 0.26.8" + ) + gsi::method ("pin_by_id", (db::Pin *(db::Circuit::*) (size_t)) &db::Circuit::pin_by_id, gsi::arg ("id"), "@brief Gets the \\Pin object corresponding to a specific ID\n" "If the ID is not a valid pin ID, nil is returned." ) + + gsi::method ("pin_by_id", (const db::Pin *(db::Circuit::*) (size_t) const) &db::Circuit::pin_by_id, gsi::arg ("id"), + "@brief Gets the \\Pin object corresponding to a specific ID (const version)\n" + "If the ID is not a valid pin ID, nil is returned." + "\n\n" + "This constness variant has been introduced in version 0.26.8" + ) + gsi::method ("pin_by_name", (db::Pin *(db::Circuit::*) (const std::string &)) &db::Circuit::pin_by_name, gsi::arg ("name"), "@brief Gets the \\Pin object corresponding to a specific name\n" "If the ID is not a valid pin name, nil is returned." ) + + gsi::method ("pin_by_name", (const db::Pin *(db::Circuit::*) (const std::string &) const) &db::Circuit::pin_by_name, gsi::arg ("name"), + "@brief Gets the \\Pin object corresponding to a specific name (const version)\n" + "If the ID is not a valid pin name, nil is returned." + "\n\n" + "This constness variant has been introduced in version 0.26.8" + ) + gsi::method ("pin_count", &db::Circuit::pin_count, "@brief Gets the number of pins in the circuit" ) + @@ -1238,6 +1401,11 @@ Class decl_dbCircuit (decl_dbNetlistObject, "db", "Circuit", gsi::iterator ("each_net", (db::Circuit::net_iterator (db::Circuit::*) ()) &db::Circuit::begin_nets, (db::Circuit::net_iterator (db::Circuit::*) ()) &db::Circuit::end_nets, "@brief Iterates over the nets of the circuit" ) + + gsi::iterator ("each_net", (db::Circuit::const_net_iterator (db::Circuit::*) () const) &db::Circuit::begin_nets, (db::Circuit::const_net_iterator (db::Circuit::*) () const) &db::Circuit::end_nets, + "@brief Iterates over the nets of the circuit (const version)" + "\n\n" + "This constness variant has been introduced in version 0.26.8" + ) + gsi::method_ext ("create_device", &gsi::create_device1, gsi::arg ("device_class"), gsi::arg ("name", std::string ()), "@brief Creates a new bound \\Device object inside the circuit\n" "This object describes a device of the circuit. The device is already attached " @@ -1252,6 +1420,11 @@ Class decl_dbCircuit (decl_dbNetlistObject, "db", "Circuit", gsi::iterator ("each_device", (db::Circuit::device_iterator (db::Circuit::*) ()) &db::Circuit::begin_devices, (db::Circuit::device_iterator (db::Circuit::*) ()) &db::Circuit::end_devices, "@brief Iterates over the devices of the circuit" ) + + gsi::iterator ("each_device", (db::Circuit::const_device_iterator (db::Circuit::*) () const) &db::Circuit::begin_devices, (db::Circuit::const_device_iterator (db::Circuit::*) () const) &db::Circuit::end_devices, + "@brief Iterates over the devices of the circuit (const version)" + "\n\n" + "This constness variant has been introduced in version 0.26.8" + ) + gsi::method_ext ("create_subcircuit", &gsi::create_subcircuit1, gsi::arg ("circuit"), gsi::arg ("name", std::string ()), "@brief Creates a new bound \\SubCircuit object inside the circuit\n" "This object describes an instance of another circuit inside the circuit. The subcircuit is already attached " @@ -1271,6 +1444,11 @@ Class decl_dbCircuit (decl_dbNetlistObject, "db", "Circuit", gsi::iterator ("each_subcircuit", (db::Circuit::subcircuit_iterator (db::Circuit::*) ()) &db::Circuit::begin_subcircuits, (db::Circuit::subcircuit_iterator (db::Circuit::*) ()) &db::Circuit::end_subcircuits, "@brief Iterates over the subcircuits of the circuit" ) + + gsi::iterator ("each_subcircuit", (db::Circuit::const_subcircuit_iterator (db::Circuit::*) () const) &db::Circuit::begin_subcircuits, (db::Circuit::const_subcircuit_iterator (db::Circuit::*) () const) &db::Circuit::end_subcircuits, + "@brief Iterates over the subcircuits of the circuit (const version)" + "\n\n" + "This constness variant has been introduced in version 0.26.8" + ) + gsi::method ("blank", &db::Circuit::blank, "@brief Blanks out the circuit\n" "This method will remove all the innards of the circuit and just leave the pins. " @@ -1282,6 +1460,11 @@ Class decl_dbCircuit (decl_dbNetlistObject, "db", "Circuit", gsi::method ("netlist", (db::Netlist *(db::Circuit::*) ()) &db::Circuit::netlist, "@brief Gets the netlist object the circuit lives in" ) + + gsi::method ("netlist", (const db::Netlist *(db::Circuit::*) () const) &db::Circuit::netlist, + "@brief Gets the netlist object the circuit lives in (const version)" + "\n\n" + "This constness variant has been introduced in version 0.26.8" + ) + gsi::method ("name=", &db::Circuit::set_name, gsi::arg ("name"), "@brief Sets the name of the circuit" ) + @@ -1316,11 +1499,25 @@ Class decl_dbCircuit (decl_dbNetlistObject, "db", "Circuit", "This is the net object inside the circuit which attaches to the given outward-bound pin.\n" "This method returns nil if the pin is not connected or the pin ID is invalid." ) + + gsi::method ("net_for_pin", (const db::Net *(db::Circuit::*) (size_t) const) &db::Circuit::net_for_pin, gsi::arg ("pin_id"), + "@brief Gets the net object attached to a specific pin (const version).\n" + "This is the net object inside the circuit which attaches to the given outward-bound pin.\n" + "This method returns nil if the pin is not connected or the pin ID is invalid." + "\n\n" + "This constness variant has been introduced in version 0.26.8" + ) + gsi::method_ext ("net_for_pin", &gsi::circuit_net_for_pin, gsi::arg ("pin"), "@brief Gets the net object attached to a specific pin.\n" "This is the net object inside the circuit which attaches to the given outward-bound pin.\n" "This method returns nil if the pin is not connected or the pin object is nil." ) + + gsi::method_ext ("net_for_pin", &gsi::circuit_net_for_pin_const, gsi::arg ("pin"), + "@brief Gets the net object attached to a specific pin (const version).\n" + "This is the net object inside the circuit which attaches to the given outward-bound pin.\n" + "This method returns nil if the pin is not connected or the pin object is nil." + "\n\n" + "This constness variant has been introduced in version 0.26.8" + ) + gsi::method ("connect_pin", &db::Circuit::connect_pin, gsi::arg ("pin_id"), gsi::arg ("net"), "@brief Connects the given pin with the given net.\n" "The net must be one inside the circuit. Any previous connected is resolved before this " @@ -1462,6 +1659,22 @@ circuits_by_name (db::Netlist *netlist, const std::string &name_pattern) return res; } +static std::vector +circuits_by_name_const (const db::Netlist *netlist, const std::string &name_pattern) +{ + std::vector res; + + tl::GlobPattern glob (name_pattern); + for (db::Netlist::const_circuit_iterator c = netlist->begin_circuits (); c != netlist->end_circuits (); ++c) { + const db::Circuit *circuit = c.operator-> (); + if (glob.match (circuit->name ())) { + res.push_back (circuit); + } + } + + return res; +} + Class decl_dbNetlist ("db", "Netlist", gsi::method_ext ("add", &gsi::add_circuit, gsi::arg ("circuit"), "@brief Adds the circuit to the netlist\n" @@ -1515,26 +1728,58 @@ Class decl_dbNetlist ("db", "Netlist", "@brief Gets the circuit object for a given cell index.\n" "If the cell index is not valid or no circuit is registered with this index, nil is returned." ) + + gsi::method ("circuit_by_cell_index", (const db::Circuit *(db::Netlist::*) (db::cell_index_type) const) &db::Netlist::circuit_by_cell_index, gsi::arg ("cell_index"), + "@brief Gets the circuit object for a given cell index (const version).\n" + "If the cell index is not valid or no circuit is registered with this index, nil is returned." + "\n\n" + "This constness variant has been introduced in version 0.26.8" + ) + gsi::method ("circuit_by_name", (db::Circuit *(db::Netlist::*) (const std::string &)) &db::Netlist::circuit_by_name, gsi::arg ("name"), "@brief Gets the circuit object for a given name.\n" "If the name is not a valid circuit name, nil is returned." ) + + gsi::method ("circuit_by_name", (const db::Circuit *(db::Netlist::*) (const std::string &) const) &db::Netlist::circuit_by_name, gsi::arg ("name"), + "@brief Gets the circuit object for a given name (const version).\n" + "If the name is not a valid circuit name, nil is returned." + "\n\n" + "This constness variant has been introduced in version 0.26.8" + ) + gsi::method_ext ("circuits_by_name", &circuits_by_name, gsi::arg ("name_pattern"), "@brief Gets the circuit objects for a given name filter.\n" "The name filter is a glob pattern. This method will return all \\Circuit objects matching the glob pattern.\n" "\n" "This method has been introduced in version 0.26.4.\n" ) + + gsi::method_ext ("circuits_by_name", &circuits_by_name_const, gsi::arg ("name_pattern"), + "@brief Gets the circuit objects for a given name filter (const version).\n" + "The name filter is a glob pattern. This method will return all \\Circuit objects matching the glob pattern.\n" + "\n\n" + "This constness variant has been introduced in version 0.26.8" + ) + gsi::iterator ("each_circuit_top_down", (db::Netlist::top_down_circuit_iterator (db::Netlist::*) ()) &db::Netlist::begin_top_down, (db::Netlist::top_down_circuit_iterator (db::Netlist::*) ()) &db::Netlist::end_top_down, "@brief Iterates over the circuits top-down\n" "Iterating top-down means the parent circuits come before the child circuits. " "The first \\top_circuit_count circuits are top circuits - i.e. those which are not referenced by other circuits." ) + + gsi::iterator ("each_circuit_top_down", (db::Netlist::const_top_down_circuit_iterator (db::Netlist::*) () const) &db::Netlist::begin_top_down, (db::Netlist::const_top_down_circuit_iterator (db::Netlist::*) () const) &db::Netlist::end_top_down, + "@brief Iterates over the circuits top-down (const version)\n" + "Iterating top-down means the parent circuits come before the child circuits. " + "The first \\top_circuit_count circuits are top circuits - i.e. those which are not referenced by other circuits." + "\n\n" + "This constness variant has been introduced in version 0.26.8" + ) + gsi::iterator ("each_circuit_bottom_up", (db::Netlist::bottom_up_circuit_iterator (db::Netlist::*) ()) &db::Netlist::begin_bottom_up, (db::Netlist::bottom_up_circuit_iterator (db::Netlist::*) ()) &db::Netlist::end_bottom_up, "@brief Iterates over the circuits bottom-up\n" "Iterating bottom-up means the parent circuits come after the child circuits. " "This is the basically the reverse order as delivered by \\each_circuit_top_down." ) + + gsi::iterator ("each_circuit_bottom_up", (db::Netlist::const_bottom_up_circuit_iterator (db::Netlist::*) () const) &db::Netlist::begin_bottom_up, (db::Netlist::const_bottom_up_circuit_iterator (db::Netlist::*) () const) &db::Netlist::end_bottom_up, + "@brief Iterates over the circuits bottom-up (const version)\n" + "Iterating bottom-up means the parent circuits come after the child circuits. " + "This is the basically the reverse order as delivered by \\each_circuit_top_down." + "\n\n" + "This constness variant has been introduced in version 0.26.8" + ) + gsi::method ("top_circuit_count", &db::Netlist::top_circuit_count, "@brief Gets the number of top circuits.\n" "Top circuits are those which are not referenced by other circuits via subcircuits. " @@ -1543,6 +1788,11 @@ Class decl_dbNetlist ("db", "Netlist", gsi::iterator ("each_circuit", (db::Netlist::circuit_iterator (db::Netlist::*) ()) &db::Netlist::begin_circuits, (db::Netlist::circuit_iterator (db::Netlist::*) ()) &db::Netlist::end_circuits, "@brief Iterates over the circuits of the netlist" ) + + gsi::iterator ("each_circuit", (db::Netlist::const_circuit_iterator (db::Netlist::*) () const) &db::Netlist::begin_circuits, (db::Netlist::const_circuit_iterator (db::Netlist::*) () const) &db::Netlist::end_circuits, + "@brief Iterates over the circuits of the netlist (const version)" + "\n\n" + "This constness variant has been introduced in version 0.26.8" + ) + gsi::method_ext ("add", &gsi::add_device_class, gsi::arg ("device_class"), "@brief Adds the device class to the netlist\n" "This method will add the given device class object to the netlist. " @@ -1558,9 +1808,20 @@ Class decl_dbNetlist ("db", "Netlist", "@brief Gets the device class for a given name.\n" "If the name is not a valid device class name, nil is returned." ) + + gsi::method ("device_class_by_name", (const db::DeviceClass *(db::Netlist::*) (const std::string &) const) &db::Netlist::device_class_by_name, gsi::arg ("name"), + "@brief Gets the device class for a given name (const version).\n" + "If the name is not a valid device class name, nil is returned." + "\n\n" + "This constness variant has been introduced in version 0.26.8" + ) + gsi::iterator ("each_device_class", (db::Netlist::device_class_iterator (db::Netlist::*) ()) &db::Netlist::begin_device_classes, (db::Netlist::device_class_iterator (db::Netlist::*) ()) &db::Netlist::end_device_classes, "@brief Iterates over the device classes of the netlist" ) + + gsi::iterator ("each_device_class", (db::Netlist::const_device_class_iterator (db::Netlist::*) () const) &db::Netlist::begin_device_classes, (db::Netlist::const_device_class_iterator (db::Netlist::*) () const) &db::Netlist::end_device_classes, + "@brief Iterates over the device classes of the netlist (const version)" + "\n\n" + "This constness variant has been introduced in version 0.26.8" + ) + gsi::method ("to_s", &db::Netlist::to_string, "@brief Converts the netlist to a string representation.\n" "This method is intended for test purposes mainly." diff --git a/testdata/ruby/dbNetlist.rb b/testdata/ruby/dbNetlist.rb index c927e9dfb..75a33077e 100644 --- a/testdata/ruby/dbNetlist.rb +++ b/testdata/ruby/dbNetlist.rb @@ -188,8 +188,10 @@ class DBNetlist_TestClass < TestBase def test_3_Pin c = RBA::Circuit::new - p1 = c.create_pin("A") + p1 = c.create_pin("X") p2 = c.create_pin("B") + assert_equal(p1.name, "X") + assert_equal(p2.name, "B") assert_equal(p1.property(17), nil) p1.set_property(17, 42) @@ -198,9 +200,23 @@ class DBNetlist_TestClass < TestBase assert_equal(p1.id, 0) assert_equal(p2.id, 1) + names = [] + c.each_pin { |p| names << p.name } + assert_equal(names, [ "X", "B" ]) + assert_equal(c.pin_by_name("A") == nil, true) + assert_equal(c.pin_by_name("X") != nil, true) + assert_equal(c.pin_by_name("X").id, 0) + + # modification of pin name + c.rename_pin(p1.id, "A") + assert_equal(p1.name, "A") + assert_equal(p2.name, "B") names = [] c.each_pin { |p| names << p.name } assert_equal(names, [ "A", "B" ]) + assert_equal(c.pin_by_name("X") == nil, true) + assert_equal(c.pin_by_name("A") != nil, true) + assert_equal(c.pin_by_name("A").id, 0) assert_equal(c.pin_by_id(0) == nil, false) assert_equal(c.pin_by_id(1) == nil, false) @@ -1098,6 +1114,33 @@ END end + def test_14_issue617 + + netlist = RBA::Netlist::new + netlist.from_s(<<"END") + circuit TOP (); + subcircuit SC1 $1 (A='1', B='2'); + end; + circuit SC1 (A='A', 'B'='B'); + end; +END + + def collect_net_names(net) + names = [] + if ! net.name.empty? + names << net.name + end + net.each_subcircuit_pin do |scp| + subnet = scp.subcircuit.circuit_ref.net_for_pin(scp.pin_id) + names += collect_net_names(subnet) + end + names + end + + assert_equal(collect_net_names(netlist.circuit_by_name("TOP").net_by_name("1")), ["1", "A"]) + + end + end load("test_epilogue.rb") From 59ee6b6a83f3e34b77b6cfc00a43b344930a0e18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20K=C3=B6fferlein?= Date: Mon, 14 Sep 2020 18:34:28 +0200 Subject: [PATCH 118/121] Fixed #629 (timeout event of QTimer not present on Qt5) (#631) In addition, the "destroyed" and "objectNameChanged" signals were added (specifically to QObject). The API binding for Qt5 was updated which adds some events. --- scripts/mkqtdecl4/mkqtdecl.events | 4 + scripts/mkqtdecl5/mkqtdecl.conf | 1 - scripts/mkqtdecl5/mkqtdecl.events | 2306 +++++++---------- scripts/mkqtdecl_common/cpp_parser_classes.rb | 2 +- .../mkqtdecl_extract_signals.rb | 2 +- scripts/mkqtdecl_common/produce.rb | 54 +- src/gsiqt/qt4/QtCore/gsiDeclQObject.cc | 23 +- .../qt5/QtCore/gsiDeclQAbstractAnimation.cc | 27 + .../QtCore/gsiDeclQAbstractEventDispatcher.cc | 27 + .../qt5/QtCore/gsiDeclQAbstractItemModel.cc | 523 ++++ .../qt5/QtCore/gsiDeclQAbstractListModel.cc | 523 ++++ .../qt5/QtCore/gsiDeclQAbstractProxyModel.cc | 545 ++++ src/gsiqt/qt5/QtCore/gsiDeclQAbstractState.cc | 71 + .../qt5/QtCore/gsiDeclQAbstractTableModel.cc | 523 ++++ .../qt5/QtCore/gsiDeclQAbstractTransition.cc | 93 + .../qt5/QtCore/gsiDeclQAnimationDriver.cc | 27 + .../qt5/QtCore/gsiDeclQAnimationGroup.cc | 27 + src/gsiqt/qt5/QtCore/gsiDeclQBuffer.cc | 1 + .../qt5/QtCore/gsiDeclQCoreApplication.cc | 49 + src/gsiqt/qt5/QtCore/gsiDeclQEventLoop.cc | 27 + .../qt5/QtCore/gsiDeclQEventTransition.cc | 93 + src/gsiqt/qt5/QtCore/gsiDeclQFile.cc | 1 + src/gsiqt/qt5/QtCore/gsiDeclQFileDevice.cc | 27 + src/gsiqt/qt5/QtCore/gsiDeclQFileSelector.cc | 27 + .../qt5/QtCore/gsiDeclQFileSystemWatcher.cc | 81 + src/gsiqt/qt5/QtCore/gsiDeclQFinalState.cc | 71 + src/gsiqt/qt5/QtCore/gsiDeclQHistoryState.cc | 115 + src/gsiqt/qt5/QtCore/gsiDeclQIODevice.cc | 1 + .../qt5/QtCore/gsiDeclQIdentityProxyModel.cc | 545 ++++ .../qt5/QtCore/gsiDeclQItemSelectionModel.cc | 27 + src/gsiqt/qt5/QtCore/gsiDeclQLibrary.cc | 27 + src/gsiqt/qt5/QtCore/gsiDeclQMimeData.cc | 27 + src/gsiqt/qt5/QtCore/gsiDeclQObject.cc | 74 +- .../QtCore/gsiDeclQParallelAnimationGroup.cc | 27 + .../qt5/QtCore/gsiDeclQPauseAnimation.cc | 27 + src/gsiqt/qt5/QtCore/gsiDeclQPluginLoader.cc | 27 + src/gsiqt/qt5/QtCore/gsiDeclQProcess.cc | 5 + .../qt5/QtCore/gsiDeclQPropertyAnimation.cc | 27 + src/gsiqt/qt5/QtCore/gsiDeclQSaveFile.cc | 27 + .../gsiDeclQSequentialAnimationGroup.cc | 27 + src/gsiqt/qt5/QtCore/gsiDeclQSettings.cc | 27 + src/gsiqt/qt5/QtCore/gsiDeclQSharedMemory.cc | 27 + src/gsiqt/qt5/QtCore/gsiDeclQSignalMapper.cc | 27 + .../qt5/QtCore/gsiDeclQSignalTransition.cc | 137 + .../qt5/QtCore/gsiDeclQSocketNotifier.cc | 54 + .../QtCore/gsiDeclQSortFilterProxyModel.cc | 545 ++++ src/gsiqt/qt5/QtCore/gsiDeclQState.cc | 181 ++ src/gsiqt/qt5/QtCore/gsiDeclQStateMachine.cc | 225 ++ .../qt5/QtCore/gsiDeclQStringListModel.cc | 523 ++++ src/gsiqt/qt5/QtCore/gsiDeclQTemporaryFile.cc | 1 + src/gsiqt/qt5/QtCore/gsiDeclQThread.cc | 71 + src/gsiqt/qt5/QtCore/gsiDeclQThreadPool.cc | 27 + src/gsiqt/qt5/QtCore/gsiDeclQTimeLine.cc | 130 + src/gsiqt/qt5/QtCore/gsiDeclQTimer.cc | 49 + src/gsiqt/qt5/QtCore/gsiDeclQTranslator.cc | 27 + .../qt5/QtCore/gsiDeclQVariantAnimation.cc | 27 + .../gsiDeclQAbstractTextDocumentLayout.cc | 27 + src/gsiqt/qt5/QtGui/gsiDeclQClipboard.cc | 1 + .../qt5/QtGui/gsiDeclQDoubleValidator.cc | 27 + src/gsiqt/qt5/QtGui/gsiDeclQDrag.cc | 27 + src/gsiqt/qt5/QtGui/gsiDeclQGenericPlugin.cc | 27 + src/gsiqt/qt5/QtGui/gsiDeclQGuiApplication.cc | 49 + .../qt5/QtGui/gsiDeclQIconEnginePlugin.cc | 27 + src/gsiqt/qt5/QtGui/gsiDeclQImageIOPlugin.cc | 27 + src/gsiqt/qt5/QtGui/gsiDeclQInputMethod.cc | 1 + src/gsiqt/qt5/QtGui/gsiDeclQIntValidator.cc | 27 + src/gsiqt/qt5/QtGui/gsiDeclQMovie.cc | 27 + .../qt5/QtGui/gsiDeclQOffscreenSurface.cc | 27 + .../qt5/QtGui/gsiDeclQPaintDeviceWindow.cc | 27 + src/gsiqt/qt5/QtGui/gsiDeclQPdfWriter.cc | 27 + .../qt5/QtGui/gsiDeclQPictureFormatPlugin.cc | 27 + src/gsiqt/qt5/QtGui/gsiDeclQRasterWindow.cc | 27 + .../qt5/QtGui/gsiDeclQRegExpValidator.cc | 27 + .../gsiDeclQRegularExpressionValidator.cc | 27 + src/gsiqt/qt5/QtGui/gsiDeclQScreen.cc | 27 + src/gsiqt/qt5/QtGui/gsiDeclQSessionManager.cc | 1 + .../qt5/QtGui/gsiDeclQStandardItemModel.cc | 523 ++++ src/gsiqt/qt5/QtGui/gsiDeclQStyleHints.cc | 27 + .../qt5/QtGui/gsiDeclQSyntaxHighlighter.cc | 27 + src/gsiqt/qt5/QtGui/gsiDeclQTextBlockGroup.cc | 27 + src/gsiqt/qt5/QtGui/gsiDeclQTextDocument.cc | 27 + src/gsiqt/qt5/QtGui/gsiDeclQTextFrame.cc | 27 + src/gsiqt/qt5/QtGui/gsiDeclQTextList.cc | 27 + src/gsiqt/qt5/QtGui/gsiDeclQTextObject.cc | 27 + src/gsiqt/qt5/QtGui/gsiDeclQTextTable.cc | 27 + src/gsiqt/qt5/QtGui/gsiDeclQValidator.cc | 27 + src/gsiqt/qt5/QtGui/gsiDeclQWindow.cc | 27 + .../gsiDeclQAbstractAudioDeviceInfo.cc | 26 - .../gsiDeclQAbstractAudioInput.cc | 159 +- .../gsiDeclQAbstractAudioOutput.cc | 159 +- .../gsiDeclQAbstractVideoFilter.cc | 65 +- .../gsiDeclQAbstractVideoSurface.cc | 206 +- .../qt5/QtMultimedia/gsiDeclQAudioDecoder.cc | 580 ++--- .../gsiDeclQAudioDecoderControl.cc | 431 ++- .../gsiDeclQAudioEncoderSettingsControl.cc | 26 - .../qt5/QtMultimedia/gsiDeclQAudioInput.cc | 112 +- .../gsiDeclQAudioInputSelectorControl.cc | 112 +- .../qt5/QtMultimedia/gsiDeclQAudioOutput.cc | 112 +- .../gsiDeclQAudioOutputSelectorControl.cc | 112 +- .../qt5/QtMultimedia/gsiDeclQAudioProbe.cc | 112 +- .../qt5/QtMultimedia/gsiDeclQAudioRecorder.cc | 449 +--- .../QtMultimedia/gsiDeclQAudioSystemPlugin.cc | 26 - src/gsiqt/qt5/QtMultimedia/gsiDeclQCamera.cc | 559 ++-- ...siDeclQCameraCaptureBufferFormatControl.cc | 73 +- ...gsiDeclQCameraCaptureDestinationControl.cc | 73 +- .../qt5/QtMultimedia/gsiDeclQCameraControl.cc | 220 +- .../QtMultimedia/gsiDeclQCameraExposure.cc | 147 +- .../gsiDeclQCameraExposureControl.cc | 167 +- .../gsiDeclQCameraFeedbackControl.cc | 26 - .../gsiDeclQCameraFlashControl.cc | 73 +- .../qt5/QtMultimedia/gsiDeclQCameraFocus.cc | 107 +- .../gsiDeclQCameraFocusControl.cc | 206 +- .../gsiDeclQCameraImageCapture.cc | 491 ++-- .../gsiDeclQCameraImageCaptureControl.cc | 397 ++- .../gsiDeclQCameraImageProcessing.cc | 1 - .../gsiDeclQCameraImageProcessingControl.cc | 26 - .../QtMultimedia/gsiDeclQCameraInfoControl.cc | 26 - .../gsiDeclQCameraLocksControl.cc | 85 +- ...gsiDeclQCameraViewfinderSettingsControl.cc | 26 - ...siDeclQCameraViewfinderSettingsControl2.cc | 26 - .../QtMultimedia/gsiDeclQCameraZoomControl.cc | 308 +-- .../QtMultimedia/gsiDeclQGraphicsVideoItem.cc | 337 +-- .../gsiDeclQImageEncoderControl.cc | 26 - .../gsiDeclQMediaAudioProbeControl.cc | 112 +- .../gsiDeclQMediaAvailabilityControl.cc | 73 +- .../gsiDeclQMediaContainerControl.cc | 26 - .../qt5/QtMultimedia/gsiDeclQMediaControl.cc | 26 - .../gsiDeclQMediaGaplessPlaybackControl.cc | 159 +- .../gsiDeclQMediaNetworkAccessControl.cc | 73 +- .../qt5/QtMultimedia/gsiDeclQMediaObject.cc | 306 +-- .../qt5/QtMultimedia/gsiDeclQMediaPlayer.cc | 886 +++---- .../gsiDeclQMediaPlayerControl.cc | 690 +++-- .../qt5/QtMultimedia/gsiDeclQMediaPlaylist.cc | 510 ++-- .../qt5/QtMultimedia/gsiDeclQMediaRecorder.cc | 635 ++--- .../gsiDeclQMediaRecorderControl.cc | 361 ++- .../qt5/QtMultimedia/gsiDeclQMediaService.cc | 26 - .../gsiDeclQMediaServiceProviderPlugin.cc | 26 - .../gsiDeclQMediaStreamsControl.cc | 104 +- .../gsiDeclQMediaVideoProbeControl.cc | 112 +- .../gsiDeclQMetaDataReaderControl.cc | 165 +- .../gsiDeclQMetaDataWriterControl.cc | 212 +- .../qt5/QtMultimedia/gsiDeclQRadioData.cc | 355 ++- .../QtMultimedia/gsiDeclQRadioDataControl.cc | 355 ++- .../qt5/QtMultimedia/gsiDeclQRadioTuner.cc | 704 ++--- .../QtMultimedia/gsiDeclQRadioTunerControl.cc | 549 ++-- src/gsiqt/qt5/QtMultimedia/gsiDeclQSound.cc | 26 - .../qt5/QtMultimedia/gsiDeclQSoundEffect.cc | 377 ++- .../gsiDeclQVideoDeviceSelectorControl.cc | 159 +- .../gsiDeclQVideoEncoderSettingsControl.cc | 26 - .../qt5/QtMultimedia/gsiDeclQVideoProbe.cc | 112 +- .../gsiDeclQVideoRendererControl.cc | 26 - .../qt5/QtMultimedia/gsiDeclQVideoWidget.cc | 365 +-- .../gsiDeclQVideoWindowControl.cc | 300 +-- .../QtNetwork/gsiDeclQAbstractNetworkCache.cc | 27 + .../qt5/QtNetwork/gsiDeclQAbstractSocket.cc | 1 + src/gsiqt/qt5/QtNetwork/gsiDeclQDnsLookup.cc | 27 + .../qt5/QtNetwork/gsiDeclQHttpMultiPart.cc | 27 + .../qt5/QtNetwork/gsiDeclQLocalServer.cc | 27 + .../qt5/QtNetwork/gsiDeclQLocalSocket.cc | 1 + .../QtNetwork/gsiDeclQNetworkAccessManager.cc | 27 + .../gsiDeclQNetworkConfigurationManager.cc | 27 + .../qt5/QtNetwork/gsiDeclQNetworkCookieJar.cc | 27 + .../qt5/QtNetwork/gsiDeclQNetworkDiskCache.cc | 27 + .../qt5/QtNetwork/gsiDeclQNetworkReply.cc | 1 + .../qt5/QtNetwork/gsiDeclQNetworkSession.cc | 27 + src/gsiqt/qt5/QtNetwork/gsiDeclQSslSocket.cc | 1 + src/gsiqt/qt5/QtNetwork/gsiDeclQTcpServer.cc | 27 + src/gsiqt/qt5/QtNetwork/gsiDeclQTcpSocket.cc | 1 + src/gsiqt/qt5/QtNetwork/gsiDeclQUdpSocket.cc | 1 + .../gsiDeclQAbstractPrintDialog.cc | 200 -- .../qt5/QtPrintSupport/gsiDeclQPrintDialog.cc | 264 +- .../gsiDeclQPrintPreviewDialog.cc | 247 +- .../gsiDeclQPrintPreviewWidget.cc | 216 +- src/gsiqt/qt5/QtSql/gsiDeclQSqlDriver.cc | 27 + src/gsiqt/qt5/QtSql/gsiDeclQSqlQueryModel.cc | 523 ++++ .../QtSql/gsiDeclQSqlRelationalTableModel.cc | 523 ++++ src/gsiqt/qt5/QtSql/gsiDeclQSqlTableModel.cc | 523 ++++ .../qt5/QtSvg/gsiDeclQGraphicsSvgItem.cc | 290 --- src/gsiqt/qt5/QtSvg/gsiDeclQSvgRenderer.cc | 65 +- src/gsiqt/qt5/QtSvg/gsiDeclQSvgWidget.cc | 130 - .../qt5/QtWidgets/gsiDeclQAbstractButton.cc | 27 + .../QtWidgets/gsiDeclQAbstractItemDelegate.cc | 27 + .../qt5/QtWidgets/gsiDeclQAbstractItemView.cc | 27 + .../QtWidgets/gsiDeclQAbstractScrollArea.cc | 27 + .../qt5/QtWidgets/gsiDeclQAbstractSlider.cc | 27 + .../qt5/QtWidgets/gsiDeclQAbstractSpinBox.cc | 27 + src/gsiqt/qt5/QtWidgets/gsiDeclQAction.cc | 27 + .../qt5/QtWidgets/gsiDeclQActionGroup.cc | 27 + .../qt5/QtWidgets/gsiDeclQApplication.cc | 49 + src/gsiqt/qt5/QtWidgets/gsiDeclQBoxLayout.cc | 27 + .../qt5/QtWidgets/gsiDeclQButtonGroup.cc | 27 + .../qt5/QtWidgets/gsiDeclQCalendarWidget.cc | 27 + src/gsiqt/qt5/QtWidgets/gsiDeclQCheckBox.cc | 27 + .../qt5/QtWidgets/gsiDeclQColorDialog.cc | 27 + src/gsiqt/qt5/QtWidgets/gsiDeclQColumnView.cc | 27 + src/gsiqt/qt5/QtWidgets/gsiDeclQComboBox.cc | 27 + .../QtWidgets/gsiDeclQCommandLinkButton.cc | 27 + .../qt5/QtWidgets/gsiDeclQCommonStyle.cc | 27 + src/gsiqt/qt5/QtWidgets/gsiDeclQCompleter.cc | 27 + .../qt5/QtWidgets/gsiDeclQDataWidgetMapper.cc | 27 + src/gsiqt/qt5/QtWidgets/gsiDeclQDateEdit.cc | 27 + .../qt5/QtWidgets/gsiDeclQDateTimeEdit.cc | 27 + .../qt5/QtWidgets/gsiDeclQDesktopWidget.cc | 27 + src/gsiqt/qt5/QtWidgets/gsiDeclQDial.cc | 27 + src/gsiqt/qt5/QtWidgets/gsiDeclQDialog.cc | 27 + .../qt5/QtWidgets/gsiDeclQDialogButtonBox.cc | 27 + src/gsiqt/qt5/QtWidgets/gsiDeclQDirModel.cc | 523 ++++ src/gsiqt/qt5/QtWidgets/gsiDeclQDockWidget.cc | 27 + .../qt5/QtWidgets/gsiDeclQDoubleSpinBox.cc | 27 + .../qt5/QtWidgets/gsiDeclQErrorMessage.cc | 27 + src/gsiqt/qt5/QtWidgets/gsiDeclQFileDialog.cc | 27 + .../qt5/QtWidgets/gsiDeclQFileSystemModel.cc | 523 ++++ src/gsiqt/qt5/QtWidgets/gsiDeclQFocusFrame.cc | 27 + .../qt5/QtWidgets/gsiDeclQFontComboBox.cc | 27 + src/gsiqt/qt5/QtWidgets/gsiDeclQFontDialog.cc | 27 + src/gsiqt/qt5/QtWidgets/gsiDeclQFormLayout.cc | 27 + src/gsiqt/qt5/QtWidgets/gsiDeclQFrame.cc | 27 + src/gsiqt/qt5/QtWidgets/gsiDeclQGesture.cc | 27 + .../qt5/QtWidgets/gsiDeclQGraphicsAnchor.cc | 27 + .../QtWidgets/gsiDeclQGraphicsBlurEffect.cc | 27 + .../gsiDeclQGraphicsColorizeEffect.cc | 27 + .../gsiDeclQGraphicsDropShadowEffect.cc | 27 + .../qt5/QtWidgets/gsiDeclQGraphicsEffect.cc | 27 + .../gsiDeclQGraphicsItemAnimation.cc | 27 + .../qt5/QtWidgets/gsiDeclQGraphicsObject.cc | 27 + .../gsiDeclQGraphicsOpacityEffect.cc | 27 + .../QtWidgets/gsiDeclQGraphicsProxyWidget.cc | 27 + .../qt5/QtWidgets/gsiDeclQGraphicsRotation.cc | 27 + .../qt5/QtWidgets/gsiDeclQGraphicsScale.cc | 27 + .../qt5/QtWidgets/gsiDeclQGraphicsScene.cc | 27 + .../qt5/QtWidgets/gsiDeclQGraphicsTextItem.cc | 27 + .../QtWidgets/gsiDeclQGraphicsTransform.cc | 27 + .../qt5/QtWidgets/gsiDeclQGraphicsView.cc | 27 + .../qt5/QtWidgets/gsiDeclQGraphicsWidget.cc | 27 + src/gsiqt/qt5/QtWidgets/gsiDeclQGridLayout.cc | 27 + src/gsiqt/qt5/QtWidgets/gsiDeclQGroupBox.cc | 27 + src/gsiqt/qt5/QtWidgets/gsiDeclQHBoxLayout.cc | 27 + src/gsiqt/qt5/QtWidgets/gsiDeclQHeaderView.cc | 27 + .../qt5/QtWidgets/gsiDeclQInputDialog.cc | 27 + .../qt5/QtWidgets/gsiDeclQItemDelegate.cc | 27 + .../qt5/QtWidgets/gsiDeclQKeySequenceEdit.cc | 27 + src/gsiqt/qt5/QtWidgets/gsiDeclQLCDNumber.cc | 27 + src/gsiqt/qt5/QtWidgets/gsiDeclQLabel.cc | 27 + src/gsiqt/qt5/QtWidgets/gsiDeclQLayout.cc | 27 + src/gsiqt/qt5/QtWidgets/gsiDeclQLineEdit.cc | 27 + src/gsiqt/qt5/QtWidgets/gsiDeclQListView.cc | 27 + src/gsiqt/qt5/QtWidgets/gsiDeclQListWidget.cc | 27 + src/gsiqt/qt5/QtWidgets/gsiDeclQMainWindow.cc | 27 + src/gsiqt/qt5/QtWidgets/gsiDeclQMdiArea.cc | 27 + .../qt5/QtWidgets/gsiDeclQMdiSubWindow.cc | 27 + src/gsiqt/qt5/QtWidgets/gsiDeclQMenu.cc | 27 + src/gsiqt/qt5/QtWidgets/gsiDeclQMenuBar.cc | 27 + src/gsiqt/qt5/QtWidgets/gsiDeclQMessageBox.cc | 27 + src/gsiqt/qt5/QtWidgets/gsiDeclQPanGesture.cc | 27 + .../qt5/QtWidgets/gsiDeclQPinchGesture.cc | 27 + .../gsiDeclQPlainTextDocumentLayout.cc | 27 + .../qt5/QtWidgets/gsiDeclQPlainTextEdit.cc | 27 + .../qt5/QtWidgets/gsiDeclQProgressBar.cc | 27 + .../qt5/QtWidgets/gsiDeclQProgressDialog.cc | 27 + src/gsiqt/qt5/QtWidgets/gsiDeclQPushButton.cc | 27 + .../qt5/QtWidgets/gsiDeclQRadioButton.cc | 27 + src/gsiqt/qt5/QtWidgets/gsiDeclQRubberBand.cc | 27 + src/gsiqt/qt5/QtWidgets/gsiDeclQScrollArea.cc | 27 + src/gsiqt/qt5/QtWidgets/gsiDeclQScrollBar.cc | 27 + src/gsiqt/qt5/QtWidgets/gsiDeclQScroller.cc | 1 + src/gsiqt/qt5/QtWidgets/gsiDeclQShortcut.cc | 27 + src/gsiqt/qt5/QtWidgets/gsiDeclQSizeGrip.cc | 27 + src/gsiqt/qt5/QtWidgets/gsiDeclQSlider.cc | 27 + src/gsiqt/qt5/QtWidgets/gsiDeclQSpinBox.cc | 27 + .../qt5/QtWidgets/gsiDeclQSplashScreen.cc | 27 + src/gsiqt/qt5/QtWidgets/gsiDeclQSplitter.cc | 27 + .../qt5/QtWidgets/gsiDeclQSplitterHandle.cc | 27 + .../qt5/QtWidgets/gsiDeclQStackedLayout.cc | 27 + .../qt5/QtWidgets/gsiDeclQStackedWidget.cc | 27 + src/gsiqt/qt5/QtWidgets/gsiDeclQStatusBar.cc | 27 + src/gsiqt/qt5/QtWidgets/gsiDeclQStyle.cc | 27 + .../qt5/QtWidgets/gsiDeclQStylePlugin.cc | 27 + .../QtWidgets/gsiDeclQStyledItemDelegate.cc | 27 + .../qt5/QtWidgets/gsiDeclQSwipeGesture.cc | 27 + .../qt5/QtWidgets/gsiDeclQSystemTrayIcon.cc | 27 + src/gsiqt/qt5/QtWidgets/gsiDeclQTabBar.cc | 27 + src/gsiqt/qt5/QtWidgets/gsiDeclQTabWidget.cc | 27 + src/gsiqt/qt5/QtWidgets/gsiDeclQTableView.cc | 27 + .../qt5/QtWidgets/gsiDeclQTableWidget.cc | 27 + .../QtWidgets/gsiDeclQTapAndHoldGesture.cc | 27 + src/gsiqt/qt5/QtWidgets/gsiDeclQTapGesture.cc | 27 + .../qt5/QtWidgets/gsiDeclQTextBrowser.cc | 27 + src/gsiqt/qt5/QtWidgets/gsiDeclQTextEdit.cc | 27 + src/gsiqt/qt5/QtWidgets/gsiDeclQTimeEdit.cc | 27 + src/gsiqt/qt5/QtWidgets/gsiDeclQToolBar.cc | 27 + src/gsiqt/qt5/QtWidgets/gsiDeclQToolBox.cc | 27 + src/gsiqt/qt5/QtWidgets/gsiDeclQToolButton.cc | 27 + src/gsiqt/qt5/QtWidgets/gsiDeclQTreeView.cc | 27 + src/gsiqt/qt5/QtWidgets/gsiDeclQTreeWidget.cc | 27 + src/gsiqt/qt5/QtWidgets/gsiDeclQUndoGroup.cc | 27 + src/gsiqt/qt5/QtWidgets/gsiDeclQUndoStack.cc | 27 + src/gsiqt/qt5/QtWidgets/gsiDeclQUndoView.cc | 27 + src/gsiqt/qt5/QtWidgets/gsiDeclQVBoxLayout.cc | 27 + src/gsiqt/qt5/QtWidgets/gsiDeclQWidget.cc | 27 + .../qt5/QtWidgets/gsiDeclQWidgetAction.cc | 27 + src/gsiqt/qt5/QtWidgets/gsiDeclQWizard.cc | 27 + src/gsiqt/qt5/QtWidgets/gsiDeclQWizardPage.cc | 27 + .../gsiDeclQAbstractMessageHandler.cc | 26 - .../gsiDeclQAbstractUriResolver.cc | 26 - testdata/ruby/qtbinding.rb | 28 +- 305 files changed, 19399 insertions(+), 11683 deletions(-) diff --git a/scripts/mkqtdecl4/mkqtdecl.events b/scripts/mkqtdecl4/mkqtdecl.events index 59b96701f..44ed9646d 100644 --- a/scripts/mkqtdecl4/mkqtdecl.events +++ b/scripts/mkqtdecl4/mkqtdecl.events @@ -1,3 +1,7 @@ +# manually added: +event("QObject", /::destroyed\s*\(/, "QObject*") +event("QObject", /::objectNameChanged\s*\(/, "QString") +# generated: event("QAbstractButton", /::destroyed\s*\(/, "QObject*") event("QAbstractButton", /::customContextMenuRequested\s*\(/, "QPoint") event("QAbstractButton", /::pressed\s*\(/, "") diff --git a/scripts/mkqtdecl5/mkqtdecl.conf b/scripts/mkqtdecl5/mkqtdecl.conf index f82d80d16..570a19204 100644 --- a/scripts/mkqtdecl5/mkqtdecl.conf +++ b/scripts/mkqtdecl5/mkqtdecl.conf @@ -21,7 +21,6 @@ load(File.join(File.dirname(__FILE__), "common.conf")) # -------------------------------------------------------------- # all modules -drop_method :all_classes, /QPrivateSignal/ # private signals cannot be exposed as methods drop_method :all_classes, /::metaObject/ # messes up the overload scheme since it can be overloaded but is required internally before overloading is effective (on attach). Use staticMetaObject instead. drop_method :all_classes, /::qt_/ # internal use only drop_method :all_classes, /::d_func/ # internal use only diff --git a/scripts/mkqtdecl5/mkqtdecl.events b/scripts/mkqtdecl5/mkqtdecl.events index d3f1f2bac..5c493c6a3 100644 --- a/scripts/mkqtdecl5/mkqtdecl.events +++ b/scripts/mkqtdecl5/mkqtdecl.events @@ -4,37 +4,10 @@ event("QAbstractAnimation", /::finished\s*\(/, "") event("QAbstractAnimation", /::stateChanged\s*\(/, "QAbstractAnimation::State, QAbstractAnimation::State") event("QAbstractAnimation", /::currentLoopChanged\s*\(/, "int") event("QAbstractAnimation", /::directionChanged\s*\(/, "QAbstractAnimation::Direction") -event("QAbstractAudioDeviceInfo", /::destroyed\s*\(/, "QObject*") -event("QAbstractAudioDeviceInfo", /::objectNameChanged\s*\(/, "QString") -event("QAbstractAudioInput", /::destroyed\s*\(/, "QObject*") -event("QAbstractAudioInput", /::objectNameChanged\s*\(/, "QString") -event("QAbstractAudioInput", /::errorChanged\s*\(/, "QAudio::Error") -event("QAbstractAudioInput", /::stateChanged\s*\(/, "QAudio::State") -event("QAbstractAudioInput", /::notify\s*\(/, "") -event("QAbstractAudioOutput", /::destroyed\s*\(/, "QObject*") -event("QAbstractAudioOutput", /::objectNameChanged\s*\(/, "QString") -event("QAbstractAudioOutput", /::errorChanged\s*\(/, "QAudio::Error") -event("QAbstractAudioOutput", /::stateChanged\s*\(/, "QAudio::State") -event("QAbstractAudioOutput", /::notify\s*\(/, "") -event("QAbstractButton", /::destroyed\s*\(/, "QObject*") -event("QAbstractButton", /::objectNameChanged\s*\(/, "QString") -event("QAbstractButton", /::windowTitleChanged\s*\(/, "QString") -event("QAbstractButton", /::windowIconChanged\s*\(/, "QIcon") -event("QAbstractButton", /::windowIconTextChanged\s*\(/, "QString") -event("QAbstractButton", /::customContextMenuRequested\s*\(/, "QPoint") -event("QAbstractButton", /::pressed\s*\(/, "") -event("QAbstractButton", /::released\s*\(/, "") -event("QAbstractButton", /::clicked\s*\(/, "bool") -event("QAbstractButton", /::toggled\s*\(/, "bool") event("QAbstractEventDispatcher", /::destroyed\s*\(/, "QObject*") event("QAbstractEventDispatcher", /::objectNameChanged\s*\(/, "QString") event("QAbstractEventDispatcher", /::aboutToBlock\s*\(/, "") event("QAbstractEventDispatcher", /::awake\s*\(/, "") -event("QAbstractItemDelegate", /::destroyed\s*\(/, "QObject*") -event("QAbstractItemDelegate", /::objectNameChanged\s*\(/, "QString") -event("QAbstractItemDelegate", /::commitData\s*\(/, "QWidget*") -event("QAbstractItemDelegate", /::closeEditor\s*\(/, "QWidget*, QAbstractItemDelegate::EndEditHint") -event("QAbstractItemDelegate", /::sizeHintChanged\s*\(/, "QModelIndex") event("QAbstractItemModel", /::destroyed\s*\(/, "QObject*") event("QAbstractItemModel", /::objectNameChanged\s*\(/, "QString") event("QAbstractItemModel", /::dataChanged\s*\(/, "QModelIndex, QModelIndex, QVector") @@ -55,19 +28,6 @@ event("QAbstractItemModel", /::rowsAboutToBeMoved\s*\(/, "QModelIndex, int, int, event("QAbstractItemModel", /::rowsMoved\s*\(/, "QModelIndex, int, int, QModelIndex, int") event("QAbstractItemModel", /::columnsAboutToBeMoved\s*\(/, "QModelIndex, int, int, QModelIndex, int") event("QAbstractItemModel", /::columnsMoved\s*\(/, "QModelIndex, int, int, QModelIndex, int") -event("QAbstractItemView", /::destroyed\s*\(/, "QObject*") -event("QAbstractItemView", /::objectNameChanged\s*\(/, "QString") -event("QAbstractItemView", /::windowTitleChanged\s*\(/, "QString") -event("QAbstractItemView", /::windowIconChanged\s*\(/, "QIcon") -event("QAbstractItemView", /::windowIconTextChanged\s*\(/, "QString") -event("QAbstractItemView", /::customContextMenuRequested\s*\(/, "QPoint") -event("QAbstractItemView", /::pressed\s*\(/, "QModelIndex") -event("QAbstractItemView", /::clicked\s*\(/, "QModelIndex") -event("QAbstractItemView", /::doubleClicked\s*\(/, "QModelIndex") -event("QAbstractItemView", /::activated\s*\(/, "QModelIndex") -event("QAbstractItemView", /::entered\s*\(/, "QModelIndex") -event("QAbstractItemView", /::viewportEntered\s*\(/, "") -event("QAbstractItemView", /::iconSizeChanged\s*\(/, "QSize") event("QAbstractListModel", /::destroyed\s*\(/, "QObject*") event("QAbstractListModel", /::objectNameChanged\s*\(/, "QString") event("QAbstractListModel", /::dataChanged\s*\(/, "QModelIndex, QModelIndex, QVector") @@ -88,19 +48,6 @@ event("QAbstractListModel", /::rowsAboutToBeMoved\s*\(/, "QModelIndex, int, int, event("QAbstractListModel", /::rowsMoved\s*\(/, "QModelIndex, int, int, QModelIndex, int") event("QAbstractListModel", /::columnsAboutToBeMoved\s*\(/, "QModelIndex, int, int, QModelIndex, int") event("QAbstractListModel", /::columnsMoved\s*\(/, "QModelIndex, int, int, QModelIndex, int") -event("QAbstractMessageHandler", /::destroyed\s*\(/, "QObject*") -event("QAbstractMessageHandler", /::objectNameChanged\s*\(/, "QString") -event("QAbstractNetworkCache", /::destroyed\s*\(/, "QObject*") -event("QAbstractNetworkCache", /::objectNameChanged\s*\(/, "QString") -event("QAbstractPrintDialog", /::destroyed\s*\(/, "QObject*") -event("QAbstractPrintDialog", /::objectNameChanged\s*\(/, "QString") -event("QAbstractPrintDialog", /::windowTitleChanged\s*\(/, "QString") -event("QAbstractPrintDialog", /::windowIconChanged\s*\(/, "QIcon") -event("QAbstractPrintDialog", /::windowIconTextChanged\s*\(/, "QString") -event("QAbstractPrintDialog", /::customContextMenuRequested\s*\(/, "QPoint") -event("QAbstractPrintDialog", /::finished\s*\(/, "int") -event("QAbstractPrintDialog", /::accepted\s*\(/, "") -event("QAbstractPrintDialog", /::rejected\s*\(/, "") event("QAbstractProxyModel", /::destroyed\s*\(/, "QObject*") event("QAbstractProxyModel", /::objectNameChanged\s*\(/, "QString") event("QAbstractProxyModel", /::dataChanged\s*\(/, "QModelIndex, QModelIndex, QVector") @@ -122,43 +69,6 @@ event("QAbstractProxyModel", /::rowsMoved\s*\(/, "QModelIndex, int, int, QModelI event("QAbstractProxyModel", /::columnsAboutToBeMoved\s*\(/, "QModelIndex, int, int, QModelIndex, int") event("QAbstractProxyModel", /::columnsMoved\s*\(/, "QModelIndex, int, int, QModelIndex, int") event("QAbstractProxyModel", /::sourceModelChanged\s*\(/, "") -event("QAbstractScrollArea", /::destroyed\s*\(/, "QObject*") -event("QAbstractScrollArea", /::objectNameChanged\s*\(/, "QString") -event("QAbstractScrollArea", /::windowTitleChanged\s*\(/, "QString") -event("QAbstractScrollArea", /::windowIconChanged\s*\(/, "QIcon") -event("QAbstractScrollArea", /::windowIconTextChanged\s*\(/, "QString") -event("QAbstractScrollArea", /::customContextMenuRequested\s*\(/, "QPoint") -event("QAbstractSlider", /::destroyed\s*\(/, "QObject*") -event("QAbstractSlider", /::objectNameChanged\s*\(/, "QString") -event("QAbstractSlider", /::windowTitleChanged\s*\(/, "QString") -event("QAbstractSlider", /::windowIconChanged\s*\(/, "QIcon") -event("QAbstractSlider", /::windowIconTextChanged\s*\(/, "QString") -event("QAbstractSlider", /::customContextMenuRequested\s*\(/, "QPoint") -event("QAbstractSlider", /::valueChanged\s*\(/, "int") -event("QAbstractSlider", /::sliderPressed\s*\(/, "") -event("QAbstractSlider", /::sliderMoved\s*\(/, "int") -event("QAbstractSlider", /::sliderReleased\s*\(/, "") -event("QAbstractSlider", /::rangeChanged\s*\(/, "int, int") -event("QAbstractSlider", /::actionTriggered\s*\(/, "int") -event("QAbstractSocket", /::destroyed\s*\(/, "QObject*") -event("QAbstractSocket", /::objectNameChanged\s*\(/, "QString") -event("QAbstractSocket", /::readyRead\s*\(/, "") -event("QAbstractSocket", /::bytesWritten\s*\(/, "qlonglong") -event("QAbstractSocket", /::aboutToClose\s*\(/, "") -event("QAbstractSocket", /::readChannelFinished\s*\(/, "") -event("QAbstractSocket", /::hostFound\s*\(/, "") -event("QAbstractSocket", /::connected\s*\(/, "") -event("QAbstractSocket", /::disconnected\s*\(/, "") -event("QAbstractSocket", /::stateChanged\s*\(/, "QAbstractSocket::SocketState") -event("QAbstractSocket", /::error\s*\(/, "QAbstractSocket::SocketError") -event("QAbstractSocket", /::proxyAuthenticationRequired\s*\(/, "QNetworkProxy, QAuthenticator*") -event("QAbstractSpinBox", /::destroyed\s*\(/, "QObject*") -event("QAbstractSpinBox", /::objectNameChanged\s*\(/, "QString") -event("QAbstractSpinBox", /::windowTitleChanged\s*\(/, "QString") -event("QAbstractSpinBox", /::windowIconChanged\s*\(/, "QIcon") -event("QAbstractSpinBox", /::windowIconTextChanged\s*\(/, "QString") -event("QAbstractSpinBox", /::customContextMenuRequested\s*\(/, "QPoint") -event("QAbstractSpinBox", /::editingFinished\s*\(/, "") event("QAbstractState", /::destroyed\s*\(/, "QObject*") event("QAbstractState", /::objectNameChanged\s*\(/, "QString") event("QAbstractState", /::entered\s*\(/, "") @@ -184,38 +94,11 @@ event("QAbstractTableModel", /::rowsAboutToBeMoved\s*\(/, "QModelIndex, int, int event("QAbstractTableModel", /::rowsMoved\s*\(/, "QModelIndex, int, int, QModelIndex, int") event("QAbstractTableModel", /::columnsAboutToBeMoved\s*\(/, "QModelIndex, int, int, QModelIndex, int") event("QAbstractTableModel", /::columnsMoved\s*\(/, "QModelIndex, int, int, QModelIndex, int") -event("QAbstractTextDocumentLayout", /::destroyed\s*\(/, "QObject*") -event("QAbstractTextDocumentLayout", /::objectNameChanged\s*\(/, "QString") -event("QAbstractTextDocumentLayout", /::update\s*\(/, "QRectF") -event("QAbstractTextDocumentLayout", /::updateBlock\s*\(/, "QTextBlock") -event("QAbstractTextDocumentLayout", /::documentSizeChanged\s*\(/, "QSizeF") -event("QAbstractTextDocumentLayout", /::pageCountChanged\s*\(/, "int") event("QAbstractTransition", /::destroyed\s*\(/, "QObject*") event("QAbstractTransition", /::objectNameChanged\s*\(/, "QString") event("QAbstractTransition", /::triggered\s*\(/, "") event("QAbstractTransition", /::targetStateChanged\s*\(/, "") event("QAbstractTransition", /::targetStatesChanged\s*\(/, "") -event("QAbstractUriResolver", /::destroyed\s*\(/, "QObject*") -event("QAbstractUriResolver", /::objectNameChanged\s*\(/, "QString") -event("QAbstractVideoFilter", /::destroyed\s*\(/, "QObject*") -event("QAbstractVideoFilter", /::objectNameChanged\s*\(/, "QString") -event("QAbstractVideoFilter", /::activeChanged\s*\(/, "") -event("QAbstractVideoSurface", /::destroyed\s*\(/, "QObject*") -event("QAbstractVideoSurface", /::objectNameChanged\s*\(/, "QString") -event("QAbstractVideoSurface", /::activeChanged\s*\(/, "bool") -event("QAbstractVideoSurface", /::surfaceFormatChanged\s*\(/, "QVideoSurfaceFormat") -event("QAbstractVideoSurface", /::supportedFormatsChanged\s*\(/, "") -event("QAbstractVideoSurface", /::nativeResolutionChanged\s*\(/, "QSize") -event("QAction", /::destroyed\s*\(/, "QObject*") -event("QAction", /::objectNameChanged\s*\(/, "QString") -event("QAction", /::changed\s*\(/, "") -event("QAction", /::triggered\s*\(/, "bool") -event("QAction", /::hovered\s*\(/, "") -event("QAction", /::toggled\s*\(/, "bool") -event("QActionGroup", /::destroyed\s*\(/, "QObject*") -event("QActionGroup", /::objectNameChanged\s*\(/, "QString") -event("QActionGroup", /::triggered\s*\(/, "QAction*") -event("QActionGroup", /::hovered\s*\(/, "QAction*") event("QAnimationDriver", /::destroyed\s*\(/, "QObject*") event("QAnimationDriver", /::objectNameChanged\s*\(/, "QString") event("QAnimationDriver", /::started\s*\(/, "") @@ -226,6 +109,560 @@ event("QAnimationGroup", /::finished\s*\(/, "") event("QAnimationGroup", /::stateChanged\s*\(/, "QAbstractAnimation::State, QAbstractAnimation::State") event("QAnimationGroup", /::currentLoopChanged\s*\(/, "int") event("QAnimationGroup", /::directionChanged\s*\(/, "QAbstractAnimation::Direction") +event("QBuffer", /::destroyed\s*\(/, "QObject*") +event("QBuffer", /::objectNameChanged\s*\(/, "QString") +event("QBuffer", /::readyRead\s*\(/, "") +event("QBuffer", /::channelReadyRead\s*\(/, "int") +event("QBuffer", /::bytesWritten\s*\(/, "qlonglong") +event("QBuffer", /::channelBytesWritten\s*\(/, "int, qlonglong") +event("QBuffer", /::aboutToClose\s*\(/, "") +event("QBuffer", /::readChannelFinished\s*\(/, "") +event("QCoreApplication", /::destroyed\s*\(/, "QObject*") +event("QCoreApplication", /::objectNameChanged\s*\(/, "QString") +event("QCoreApplication", /::aboutToQuit\s*\(/, "") +event("QCoreApplication", /::organizationNameChanged\s*\(/, "") +event("QCoreApplication", /::organizationDomainChanged\s*\(/, "") +event("QCoreApplication", /::applicationNameChanged\s*\(/, "") +event("QCoreApplication", /::applicationVersionChanged\s*\(/, "") +event("QEventLoop", /::destroyed\s*\(/, "QObject*") +event("QEventLoop", /::objectNameChanged\s*\(/, "QString") +event("QEventTransition", /::destroyed\s*\(/, "QObject*") +event("QEventTransition", /::objectNameChanged\s*\(/, "QString") +event("QEventTransition", /::triggered\s*\(/, "") +event("QEventTransition", /::targetStateChanged\s*\(/, "") +event("QEventTransition", /::targetStatesChanged\s*\(/, "") +event("QFile", /::destroyed\s*\(/, "QObject*") +event("QFile", /::objectNameChanged\s*\(/, "QString") +event("QFile", /::readyRead\s*\(/, "") +event("QFile", /::channelReadyRead\s*\(/, "int") +event("QFile", /::bytesWritten\s*\(/, "qlonglong") +event("QFile", /::channelBytesWritten\s*\(/, "int, qlonglong") +event("QFile", /::aboutToClose\s*\(/, "") +event("QFile", /::readChannelFinished\s*\(/, "") +event("QFileDevice", /::destroyed\s*\(/, "QObject*") +event("QFileDevice", /::objectNameChanged\s*\(/, "QString") +event("QFileDevice", /::readyRead\s*\(/, "") +event("QFileDevice", /::channelReadyRead\s*\(/, "int") +event("QFileDevice", /::bytesWritten\s*\(/, "qlonglong") +event("QFileDevice", /::channelBytesWritten\s*\(/, "int, qlonglong") +event("QFileDevice", /::aboutToClose\s*\(/, "") +event("QFileDevice", /::readChannelFinished\s*\(/, "") +event("QFileSelector", /::destroyed\s*\(/, "QObject*") +event("QFileSelector", /::objectNameChanged\s*\(/, "QString") +event("QFileSystemWatcher", /::destroyed\s*\(/, "QObject*") +event("QFileSystemWatcher", /::objectNameChanged\s*\(/, "QString") +event("QFileSystemWatcher", /::fileChanged\s*\(/, "QString") +event("QFileSystemWatcher", /::directoryChanged\s*\(/, "QString") +event("QFinalState", /::destroyed\s*\(/, "QObject*") +event("QFinalState", /::objectNameChanged\s*\(/, "QString") +event("QFinalState", /::entered\s*\(/, "") +event("QFinalState", /::exited\s*\(/, "") +event("QFinalState", /::activeChanged\s*\(/, "bool") +event("QHistoryState", /::destroyed\s*\(/, "QObject*") +event("QHistoryState", /::objectNameChanged\s*\(/, "QString") +event("QHistoryState", /::entered\s*\(/, "") +event("QHistoryState", /::exited\s*\(/, "") +event("QHistoryState", /::activeChanged\s*\(/, "bool") +event("QHistoryState", /::defaultTransitionChanged\s*\(/, "") +event("QHistoryState", /::defaultStateChanged\s*\(/, "") +event("QHistoryState", /::historyTypeChanged\s*\(/, "") +event("QIODevice", /::destroyed\s*\(/, "QObject*") +event("QIODevice", /::objectNameChanged\s*\(/, "QString") +event("QIODevice", /::readyRead\s*\(/, "") +event("QIODevice", /::channelReadyRead\s*\(/, "int") +event("QIODevice", /::bytesWritten\s*\(/, "qlonglong") +event("QIODevice", /::channelBytesWritten\s*\(/, "int, qlonglong") +event("QIODevice", /::aboutToClose\s*\(/, "") +event("QIODevice", /::readChannelFinished\s*\(/, "") +event("QIdentityProxyModel", /::destroyed\s*\(/, "QObject*") +event("QIdentityProxyModel", /::objectNameChanged\s*\(/, "QString") +event("QIdentityProxyModel", /::dataChanged\s*\(/, "QModelIndex, QModelIndex, QVector") +event("QIdentityProxyModel", /::headerDataChanged\s*\(/, "Qt::Orientation, int, int") +event("QIdentityProxyModel", /::layoutChanged\s*\(/, "QList, QAbstractItemModel::LayoutChangeHint") +event("QIdentityProxyModel", /::layoutAboutToBeChanged\s*\(/, "QList, QAbstractItemModel::LayoutChangeHint") +event("QIdentityProxyModel", /::rowsAboutToBeInserted\s*\(/, "QModelIndex, int, int") +event("QIdentityProxyModel", /::rowsInserted\s*\(/, "QModelIndex, int, int") +event("QIdentityProxyModel", /::rowsAboutToBeRemoved\s*\(/, "QModelIndex, int, int") +event("QIdentityProxyModel", /::rowsRemoved\s*\(/, "QModelIndex, int, int") +event("QIdentityProxyModel", /::columnsAboutToBeInserted\s*\(/, "QModelIndex, int, int") +event("QIdentityProxyModel", /::columnsInserted\s*\(/, "QModelIndex, int, int") +event("QIdentityProxyModel", /::columnsAboutToBeRemoved\s*\(/, "QModelIndex, int, int") +event("QIdentityProxyModel", /::columnsRemoved\s*\(/, "QModelIndex, int, int") +event("QIdentityProxyModel", /::modelAboutToBeReset\s*\(/, "") +event("QIdentityProxyModel", /::modelReset\s*\(/, "") +event("QIdentityProxyModel", /::rowsAboutToBeMoved\s*\(/, "QModelIndex, int, int, QModelIndex, int") +event("QIdentityProxyModel", /::rowsMoved\s*\(/, "QModelIndex, int, int, QModelIndex, int") +event("QIdentityProxyModel", /::columnsAboutToBeMoved\s*\(/, "QModelIndex, int, int, QModelIndex, int") +event("QIdentityProxyModel", /::columnsMoved\s*\(/, "QModelIndex, int, int, QModelIndex, int") +event("QIdentityProxyModel", /::sourceModelChanged\s*\(/, "") +event("QItemSelectionModel", /::destroyed\s*\(/, "QObject*") +event("QItemSelectionModel", /::objectNameChanged\s*\(/, "QString") +event("QItemSelectionModel", /::selectionChanged\s*\(/, "QItemSelection, QItemSelection") +event("QItemSelectionModel", /::currentChanged\s*\(/, "QModelIndex, QModelIndex") +event("QItemSelectionModel", /::currentRowChanged\s*\(/, "QModelIndex, QModelIndex") +event("QItemSelectionModel", /::currentColumnChanged\s*\(/, "QModelIndex, QModelIndex") +event("QItemSelectionModel", /::modelChanged\s*\(/, "QAbstractItemModel*") +event("QLibrary", /::destroyed\s*\(/, "QObject*") +event("QLibrary", /::objectNameChanged\s*\(/, "QString") +event("QMimeData", /::destroyed\s*\(/, "QObject*") +event("QMimeData", /::objectNameChanged\s*\(/, "QString") +event("QObject", /::destroyed\s*\(/, "QObject*") +event("QObject", /::objectNameChanged\s*\(/, "QString") +event("QParallelAnimationGroup", /::destroyed\s*\(/, "QObject*") +event("QParallelAnimationGroup", /::objectNameChanged\s*\(/, "QString") +event("QParallelAnimationGroup", /::finished\s*\(/, "") +event("QParallelAnimationGroup", /::stateChanged\s*\(/, "QAbstractAnimation::State, QAbstractAnimation::State") +event("QParallelAnimationGroup", /::currentLoopChanged\s*\(/, "int") +event("QParallelAnimationGroup", /::directionChanged\s*\(/, "QAbstractAnimation::Direction") +event("QPauseAnimation", /::destroyed\s*\(/, "QObject*") +event("QPauseAnimation", /::objectNameChanged\s*\(/, "QString") +event("QPauseAnimation", /::finished\s*\(/, "") +event("QPauseAnimation", /::stateChanged\s*\(/, "QAbstractAnimation::State, QAbstractAnimation::State") +event("QPauseAnimation", /::currentLoopChanged\s*\(/, "int") +event("QPauseAnimation", /::directionChanged\s*\(/, "QAbstractAnimation::Direction") +event("QPluginLoader", /::destroyed\s*\(/, "QObject*") +event("QPluginLoader", /::objectNameChanged\s*\(/, "QString") +event("QProcess", /::destroyed\s*\(/, "QObject*") +event("QProcess", /::objectNameChanged\s*\(/, "QString") +event("QProcess", /::readyRead\s*\(/, "") +event("QProcess", /::channelReadyRead\s*\(/, "int") +event("QProcess", /::bytesWritten\s*\(/, "qlonglong") +event("QProcess", /::channelBytesWritten\s*\(/, "int, qlonglong") +event("QProcess", /::aboutToClose\s*\(/, "") +event("QProcess", /::readChannelFinished\s*\(/, "") +event("QProcess", /::started\s*\(/, "") +event("QProcess", /::finished\s*\(/, "int, QProcess::ExitStatus") +event("QProcess", /::error\s*\(/, "QProcess::ProcessError") +event("QProcess", /::errorOccurred\s*\(/, "QProcess::ProcessError") +event("QProcess", /::stateChanged\s*\(/, "QProcess::ProcessState") +event("QProcess", /::readyReadStandardOutput\s*\(/, "") +event("QProcess", /::readyReadStandardError\s*\(/, "") +event("QPropertyAnimation", /::destroyed\s*\(/, "QObject*") +event("QPropertyAnimation", /::objectNameChanged\s*\(/, "QString") +event("QPropertyAnimation", /::finished\s*\(/, "") +event("QPropertyAnimation", /::stateChanged\s*\(/, "QAbstractAnimation::State, QAbstractAnimation::State") +event("QPropertyAnimation", /::currentLoopChanged\s*\(/, "int") +event("QPropertyAnimation", /::directionChanged\s*\(/, "QAbstractAnimation::Direction") +event("QPropertyAnimation", /::valueChanged\s*\(/, "QVariant") +event("QSaveFile", /::destroyed\s*\(/, "QObject*") +event("QSaveFile", /::objectNameChanged\s*\(/, "QString") +event("QSaveFile", /::readyRead\s*\(/, "") +event("QSaveFile", /::channelReadyRead\s*\(/, "int") +event("QSaveFile", /::bytesWritten\s*\(/, "qlonglong") +event("QSaveFile", /::channelBytesWritten\s*\(/, "int, qlonglong") +event("QSaveFile", /::aboutToClose\s*\(/, "") +event("QSaveFile", /::readChannelFinished\s*\(/, "") +event("QSequentialAnimationGroup", /::destroyed\s*\(/, "QObject*") +event("QSequentialAnimationGroup", /::objectNameChanged\s*\(/, "QString") +event("QSequentialAnimationGroup", /::finished\s*\(/, "") +event("QSequentialAnimationGroup", /::stateChanged\s*\(/, "QAbstractAnimation::State, QAbstractAnimation::State") +event("QSequentialAnimationGroup", /::currentLoopChanged\s*\(/, "int") +event("QSequentialAnimationGroup", /::directionChanged\s*\(/, "QAbstractAnimation::Direction") +event("QSequentialAnimationGroup", /::currentAnimationChanged\s*\(/, "QAbstractAnimation*") +event("QSettings", /::destroyed\s*\(/, "QObject*") +event("QSettings", /::objectNameChanged\s*\(/, "QString") +event("QSharedMemory", /::destroyed\s*\(/, "QObject*") +event("QSharedMemory", /::objectNameChanged\s*\(/, "QString") +event("QSignalMapper", /::destroyed\s*\(/, "QObject*") +event("QSignalMapper", /::objectNameChanged\s*\(/, "QString") +event("QSignalMapper", /::mapped\s*\(.*int/, "int") +event("QSignalMapper", /::mapped\s*\(.*QString/, "QString") +rename("QSignalMapper", /::mapped\s*\(.*QString/, "mapped_qs") +event("QSignalMapper", /::mapped\s*\(.*QWidget/, "QWidget*") +rename("QSignalMapper", /::mapped\s*\(.*QWidget/, "mapped_qw") +event("QSignalMapper", /::mapped\s*\(.*QObject/, "QObject*") +rename("QSignalMapper", /::mapped\s*\(.*QObject/, "mapped_qo") +event("QSignalTransition", /::destroyed\s*\(/, "QObject*") +event("QSignalTransition", /::objectNameChanged\s*\(/, "QString") +event("QSignalTransition", /::triggered\s*\(/, "") +event("QSignalTransition", /::targetStateChanged\s*\(/, "") +event("QSignalTransition", /::targetStatesChanged\s*\(/, "") +event("QSignalTransition", /::senderObjectChanged\s*\(/, "") +event("QSignalTransition", /::signalChanged\s*\(/, "") +event("QSocketNotifier", /::destroyed\s*\(/, "QObject*") +event("QSocketNotifier", /::objectNameChanged\s*\(/, "QString") +event("QSocketNotifier", /::activated\s*\(/, "int") +event("QSortFilterProxyModel", /::destroyed\s*\(/, "QObject*") +event("QSortFilterProxyModel", /::objectNameChanged\s*\(/, "QString") +event("QSortFilterProxyModel", /::dataChanged\s*\(/, "QModelIndex, QModelIndex, QVector") +event("QSortFilterProxyModel", /::headerDataChanged\s*\(/, "Qt::Orientation, int, int") +event("QSortFilterProxyModel", /::layoutChanged\s*\(/, "QList, QAbstractItemModel::LayoutChangeHint") +event("QSortFilterProxyModel", /::layoutAboutToBeChanged\s*\(/, "QList, QAbstractItemModel::LayoutChangeHint") +event("QSortFilterProxyModel", /::rowsAboutToBeInserted\s*\(/, "QModelIndex, int, int") +event("QSortFilterProxyModel", /::rowsInserted\s*\(/, "QModelIndex, int, int") +event("QSortFilterProxyModel", /::rowsAboutToBeRemoved\s*\(/, "QModelIndex, int, int") +event("QSortFilterProxyModel", /::rowsRemoved\s*\(/, "QModelIndex, int, int") +event("QSortFilterProxyModel", /::columnsAboutToBeInserted\s*\(/, "QModelIndex, int, int") +event("QSortFilterProxyModel", /::columnsInserted\s*\(/, "QModelIndex, int, int") +event("QSortFilterProxyModel", /::columnsAboutToBeRemoved\s*\(/, "QModelIndex, int, int") +event("QSortFilterProxyModel", /::columnsRemoved\s*\(/, "QModelIndex, int, int") +event("QSortFilterProxyModel", /::modelAboutToBeReset\s*\(/, "") +event("QSortFilterProxyModel", /::modelReset\s*\(/, "") +event("QSortFilterProxyModel", /::rowsAboutToBeMoved\s*\(/, "QModelIndex, int, int, QModelIndex, int") +event("QSortFilterProxyModel", /::rowsMoved\s*\(/, "QModelIndex, int, int, QModelIndex, int") +event("QSortFilterProxyModel", /::columnsAboutToBeMoved\s*\(/, "QModelIndex, int, int, QModelIndex, int") +event("QSortFilterProxyModel", /::columnsMoved\s*\(/, "QModelIndex, int, int, QModelIndex, int") +event("QSortFilterProxyModel", /::sourceModelChanged\s*\(/, "") +event("QState", /::destroyed\s*\(/, "QObject*") +event("QState", /::objectNameChanged\s*\(/, "QString") +event("QState", /::entered\s*\(/, "") +event("QState", /::exited\s*\(/, "") +event("QState", /::activeChanged\s*\(/, "bool") +event("QState", /::finished\s*\(/, "") +event("QState", /::propertiesAssigned\s*\(/, "") +event("QState", /::childModeChanged\s*\(/, "") +event("QState", /::initialStateChanged\s*\(/, "") +event("QState", /::errorStateChanged\s*\(/, "") +event("QStateMachine", /::destroyed\s*\(/, "QObject*") +event("QStateMachine", /::objectNameChanged\s*\(/, "QString") +event("QStateMachine", /::entered\s*\(/, "") +event("QStateMachine", /::exited\s*\(/, "") +event("QStateMachine", /::activeChanged\s*\(/, "bool") +event("QStateMachine", /::finished\s*\(/, "") +event("QStateMachine", /::propertiesAssigned\s*\(/, "") +event("QStateMachine", /::childModeChanged\s*\(/, "") +event("QStateMachine", /::initialStateChanged\s*\(/, "") +event("QStateMachine", /::errorStateChanged\s*\(/, "") +event("QStateMachine", /::started\s*\(/, "") +event("QStateMachine", /::stopped\s*\(/, "") +event("QStateMachine", /::runningChanged\s*\(/, "bool") +event("QStringListModel", /::destroyed\s*\(/, "QObject*") +event("QStringListModel", /::objectNameChanged\s*\(/, "QString") +event("QStringListModel", /::dataChanged\s*\(/, "QModelIndex, QModelIndex, QVector") +event("QStringListModel", /::headerDataChanged\s*\(/, "Qt::Orientation, int, int") +event("QStringListModel", /::layoutChanged\s*\(/, "QList, QAbstractItemModel::LayoutChangeHint") +event("QStringListModel", /::layoutAboutToBeChanged\s*\(/, "QList, QAbstractItemModel::LayoutChangeHint") +event("QStringListModel", /::rowsAboutToBeInserted\s*\(/, "QModelIndex, int, int") +event("QStringListModel", /::rowsInserted\s*\(/, "QModelIndex, int, int") +event("QStringListModel", /::rowsAboutToBeRemoved\s*\(/, "QModelIndex, int, int") +event("QStringListModel", /::rowsRemoved\s*\(/, "QModelIndex, int, int") +event("QStringListModel", /::columnsAboutToBeInserted\s*\(/, "QModelIndex, int, int") +event("QStringListModel", /::columnsInserted\s*\(/, "QModelIndex, int, int") +event("QStringListModel", /::columnsAboutToBeRemoved\s*\(/, "QModelIndex, int, int") +event("QStringListModel", /::columnsRemoved\s*\(/, "QModelIndex, int, int") +event("QStringListModel", /::modelAboutToBeReset\s*\(/, "") +event("QStringListModel", /::modelReset\s*\(/, "") +event("QStringListModel", /::rowsAboutToBeMoved\s*\(/, "QModelIndex, int, int, QModelIndex, int") +event("QStringListModel", /::rowsMoved\s*\(/, "QModelIndex, int, int, QModelIndex, int") +event("QStringListModel", /::columnsAboutToBeMoved\s*\(/, "QModelIndex, int, int, QModelIndex, int") +event("QStringListModel", /::columnsMoved\s*\(/, "QModelIndex, int, int, QModelIndex, int") +event("QTemporaryFile", /::destroyed\s*\(/, "QObject*") +event("QTemporaryFile", /::objectNameChanged\s*\(/, "QString") +event("QTemporaryFile", /::readyRead\s*\(/, "") +event("QTemporaryFile", /::channelReadyRead\s*\(/, "int") +event("QTemporaryFile", /::bytesWritten\s*\(/, "qlonglong") +event("QTemporaryFile", /::channelBytesWritten\s*\(/, "int, qlonglong") +event("QTemporaryFile", /::aboutToClose\s*\(/, "") +event("QTemporaryFile", /::readChannelFinished\s*\(/, "") +event("QThread", /::destroyed\s*\(/, "QObject*") +event("QThread", /::objectNameChanged\s*\(/, "QString") +event("QThread", /::started\s*\(/, "") +event("QThread", /::finished\s*\(/, "") +event("QThreadPool", /::destroyed\s*\(/, "QObject*") +event("QThreadPool", /::objectNameChanged\s*\(/, "QString") +event("QTimeLine", /::destroyed\s*\(/, "QObject*") +event("QTimeLine", /::objectNameChanged\s*\(/, "QString") +event("QTimeLine", /::valueChanged\s*\(/, "double") +event("QTimeLine", /::frameChanged\s*\(/, "int") +event("QTimeLine", /::stateChanged\s*\(/, "QTimeLine::State") +event("QTimeLine", /::finished\s*\(/, "") +event("QTimer", /::destroyed\s*\(/, "QObject*") +event("QTimer", /::objectNameChanged\s*\(/, "QString") +event("QTimer", /::timeout\s*\(/, "") +event("QTranslator", /::destroyed\s*\(/, "QObject*") +event("QTranslator", /::objectNameChanged\s*\(/, "QString") +event("QVariantAnimation", /::destroyed\s*\(/, "QObject*") +event("QVariantAnimation", /::objectNameChanged\s*\(/, "QString") +event("QVariantAnimation", /::finished\s*\(/, "") +event("QVariantAnimation", /::stateChanged\s*\(/, "QAbstractAnimation::State, QAbstractAnimation::State") +event("QVariantAnimation", /::currentLoopChanged\s*\(/, "int") +event("QVariantAnimation", /::directionChanged\s*\(/, "QAbstractAnimation::Direction") +event("QVariantAnimation", /::valueChanged\s*\(/, "QVariant") +event("QAbstractTextDocumentLayout", /::destroyed\s*\(/, "QObject*") +event("QAbstractTextDocumentLayout", /::objectNameChanged\s*\(/, "QString") +event("QAbstractTextDocumentLayout", /::update\s*\(/, "QRectF") +event("QAbstractTextDocumentLayout", /::updateBlock\s*\(/, "QTextBlock") +event("QAbstractTextDocumentLayout", /::documentSizeChanged\s*\(/, "QSizeF") +event("QAbstractTextDocumentLayout", /::pageCountChanged\s*\(/, "int") +event("QClipboard", /::destroyed\s*\(/, "QObject*") +event("QClipboard", /::objectNameChanged\s*\(/, "QString") +event("QClipboard", /::changed\s*\(/, "QClipboard::Mode") +event("QClipboard", /::selectionChanged\s*\(/, "") +event("QClipboard", /::findBufferChanged\s*\(/, "") +event("QClipboard", /::dataChanged\s*\(/, "") +event("QDoubleValidator", /::destroyed\s*\(/, "QObject*") +event("QDoubleValidator", /::objectNameChanged\s*\(/, "QString") +event("QDoubleValidator", /::changed\s*\(/, "") +event("QDoubleValidator", /::bottomChanged\s*\(/, "double") +event("QDoubleValidator", /::topChanged\s*\(/, "double") +event("QDoubleValidator", /::decimalsChanged\s*\(/, "int") +event("QDoubleValidator", /::notationChanged\s*\(/, "QDoubleValidator::Notation") +event("QDrag", /::destroyed\s*\(/, "QObject*") +event("QDrag", /::objectNameChanged\s*\(/, "QString") +event("QDrag", /::actionChanged\s*\(/, "Qt::DropAction") +event("QDrag", /::targetChanged\s*\(/, "QObject*") +event("QGenericPlugin", /::destroyed\s*\(/, "QObject*") +event("QGenericPlugin", /::objectNameChanged\s*\(/, "QString") +event("QGuiApplication", /::destroyed\s*\(/, "QObject*") +event("QGuiApplication", /::objectNameChanged\s*\(/, "QString") +event("QGuiApplication", /::aboutToQuit\s*\(/, "") +event("QGuiApplication", /::organizationNameChanged\s*\(/, "") +event("QGuiApplication", /::organizationDomainChanged\s*\(/, "") +event("QGuiApplication", /::applicationNameChanged\s*\(/, "") +event("QGuiApplication", /::applicationVersionChanged\s*\(/, "") +event("QGuiApplication", /::fontDatabaseChanged\s*\(/, "") +event("QGuiApplication", /::screenAdded\s*\(/, "QScreen*") +event("QGuiApplication", /::screenRemoved\s*\(/, "QScreen*") +event("QGuiApplication", /::primaryScreenChanged\s*\(/, "QScreen*") +event("QGuiApplication", /::lastWindowClosed\s*\(/, "") +event("QGuiApplication", /::focusObjectChanged\s*\(/, "QObject*") +event("QGuiApplication", /::focusWindowChanged\s*\(/, "QWindow*") +event("QGuiApplication", /::applicationStateChanged\s*\(/, "Qt::ApplicationState") +event("QGuiApplication", /::layoutDirectionChanged\s*\(/, "Qt::LayoutDirection") +event("QGuiApplication", /::commitDataRequest\s*\(/, "QSessionManager&") +event("QGuiApplication", /::saveStateRequest\s*\(/, "QSessionManager&") +event("QGuiApplication", /::paletteChanged\s*\(/, "QPalette") +event("QGuiApplication", /::applicationDisplayNameChanged\s*\(/, "") +event("QGuiApplication", /::fontChanged\s*\(/, "QFont") +event("QIconEnginePlugin", /::destroyed\s*\(/, "QObject*") +event("QIconEnginePlugin", /::objectNameChanged\s*\(/, "QString") +event("QImageIOPlugin", /::destroyed\s*\(/, "QObject*") +event("QImageIOPlugin", /::objectNameChanged\s*\(/, "QString") +event("QInputMethod", /::destroyed\s*\(/, "QObject*") +event("QInputMethod", /::objectNameChanged\s*\(/, "QString") +event("QInputMethod", /::cursorRectangleChanged\s*\(/, "") +event("QInputMethod", /::anchorRectangleChanged\s*\(/, "") +event("QInputMethod", /::keyboardRectangleChanged\s*\(/, "") +event("QInputMethod", /::inputItemClipRectangleChanged\s*\(/, "") +event("QInputMethod", /::visibleChanged\s*\(/, "") +event("QInputMethod", /::animatingChanged\s*\(/, "") +event("QInputMethod", /::localeChanged\s*\(/, "") +event("QInputMethod", /::inputDirectionChanged\s*\(/, "Qt::LayoutDirection") +event("QIntValidator", /::destroyed\s*\(/, "QObject*") +event("QIntValidator", /::objectNameChanged\s*\(/, "QString") +event("QIntValidator", /::changed\s*\(/, "") +event("QIntValidator", /::bottomChanged\s*\(/, "int") +event("QIntValidator", /::topChanged\s*\(/, "int") +event("QMovie", /::destroyed\s*\(/, "QObject*") +event("QMovie", /::objectNameChanged\s*\(/, "QString") +event("QMovie", /::started\s*\(/, "") +event("QMovie", /::resized\s*\(/, "QSize") +event("QMovie", /::updated\s*\(/, "QRect") +event("QMovie", /::stateChanged\s*\(/, "QMovie::MovieState") +event("QMovie", /::error\s*\(/, "QImageReader::ImageReaderError") +event("QMovie", /::finished\s*\(/, "") +event("QMovie", /::frameChanged\s*\(/, "int") +event("QOffscreenSurface", /::destroyed\s*\(/, "QObject*") +event("QOffscreenSurface", /::objectNameChanged\s*\(/, "QString") +event("QOffscreenSurface", /::screenChanged\s*\(/, "QScreen*") +event("QPaintDeviceWindow", /::destroyed\s*\(/, "QObject*") +event("QPaintDeviceWindow", /::objectNameChanged\s*\(/, "QString") +event("QPaintDeviceWindow", /::screenChanged\s*\(/, "QScreen*") +event("QPaintDeviceWindow", /::modalityChanged\s*\(/, "Qt::WindowModality") +event("QPaintDeviceWindow", /::windowStateChanged\s*\(/, "Qt::WindowState") +event("QPaintDeviceWindow", /::windowTitleChanged\s*\(/, "QString") +event("QPaintDeviceWindow", /::xChanged\s*\(/, "int") +event("QPaintDeviceWindow", /::yChanged\s*\(/, "int") +event("QPaintDeviceWindow", /::widthChanged\s*\(/, "int") +event("QPaintDeviceWindow", /::heightChanged\s*\(/, "int") +event("QPaintDeviceWindow", /::minimumWidthChanged\s*\(/, "int") +event("QPaintDeviceWindow", /::minimumHeightChanged\s*\(/, "int") +event("QPaintDeviceWindow", /::maximumWidthChanged\s*\(/, "int") +event("QPaintDeviceWindow", /::maximumHeightChanged\s*\(/, "int") +event("QPaintDeviceWindow", /::visibleChanged\s*\(/, "bool") +event("QPaintDeviceWindow", /::visibilityChanged\s*\(/, "QWindow::Visibility") +event("QPaintDeviceWindow", /::activeChanged\s*\(/, "") +event("QPaintDeviceWindow", /::contentOrientationChanged\s*\(/, "Qt::ScreenOrientation") +event("QPaintDeviceWindow", /::focusObjectChanged\s*\(/, "QObject*") +event("QPaintDeviceWindow", /::opacityChanged\s*\(/, "double") +event("QPdfWriter", /::destroyed\s*\(/, "QObject*") +event("QPdfWriter", /::objectNameChanged\s*\(/, "QString") +event("QPictureFormatPlugin", /::destroyed\s*\(/, "QObject*") +event("QPictureFormatPlugin", /::objectNameChanged\s*\(/, "QString") +event("QRasterWindow", /::destroyed\s*\(/, "QObject*") +event("QRasterWindow", /::objectNameChanged\s*\(/, "QString") +event("QRasterWindow", /::screenChanged\s*\(/, "QScreen*") +event("QRasterWindow", /::modalityChanged\s*\(/, "Qt::WindowModality") +event("QRasterWindow", /::windowStateChanged\s*\(/, "Qt::WindowState") +event("QRasterWindow", /::windowTitleChanged\s*\(/, "QString") +event("QRasterWindow", /::xChanged\s*\(/, "int") +event("QRasterWindow", /::yChanged\s*\(/, "int") +event("QRasterWindow", /::widthChanged\s*\(/, "int") +event("QRasterWindow", /::heightChanged\s*\(/, "int") +event("QRasterWindow", /::minimumWidthChanged\s*\(/, "int") +event("QRasterWindow", /::minimumHeightChanged\s*\(/, "int") +event("QRasterWindow", /::maximumWidthChanged\s*\(/, "int") +event("QRasterWindow", /::maximumHeightChanged\s*\(/, "int") +event("QRasterWindow", /::visibleChanged\s*\(/, "bool") +event("QRasterWindow", /::visibilityChanged\s*\(/, "QWindow::Visibility") +event("QRasterWindow", /::activeChanged\s*\(/, "") +event("QRasterWindow", /::contentOrientationChanged\s*\(/, "Qt::ScreenOrientation") +event("QRasterWindow", /::focusObjectChanged\s*\(/, "QObject*") +event("QRasterWindow", /::opacityChanged\s*\(/, "double") +event("QRegExpValidator", /::destroyed\s*\(/, "QObject*") +event("QRegExpValidator", /::objectNameChanged\s*\(/, "QString") +event("QRegExpValidator", /::changed\s*\(/, "") +event("QRegExpValidator", /::regExpChanged\s*\(/, "QRegExp") +event("QRegularExpressionValidator", /::destroyed\s*\(/, "QObject*") +event("QRegularExpressionValidator", /::objectNameChanged\s*\(/, "QString") +event("QRegularExpressionValidator", /::changed\s*\(/, "") +event("QRegularExpressionValidator", /::regularExpressionChanged\s*\(/, "QRegularExpression") +event("QScreen", /::destroyed\s*\(/, "QObject*") +event("QScreen", /::objectNameChanged\s*\(/, "QString") +event("QScreen", /::geometryChanged\s*\(/, "QRect") +event("QScreen", /::availableGeometryChanged\s*\(/, "QRect") +event("QScreen", /::physicalSizeChanged\s*\(/, "QSizeF") +event("QScreen", /::physicalDotsPerInchChanged\s*\(/, "double") +event("QScreen", /::logicalDotsPerInchChanged\s*\(/, "double") +event("QScreen", /::virtualGeometryChanged\s*\(/, "QRect") +event("QScreen", /::primaryOrientationChanged\s*\(/, "Qt::ScreenOrientation") +event("QScreen", /::orientationChanged\s*\(/, "Qt::ScreenOrientation") +event("QScreen", /::refreshRateChanged\s*\(/, "double") +event("QSessionManager", /::destroyed\s*\(/, "QObject*") +event("QSessionManager", /::objectNameChanged\s*\(/, "QString") +event("QStandardItemModel", /::destroyed\s*\(/, "QObject*") +event("QStandardItemModel", /::objectNameChanged\s*\(/, "QString") +event("QStandardItemModel", /::dataChanged\s*\(/, "QModelIndex, QModelIndex, QVector") +event("QStandardItemModel", /::headerDataChanged\s*\(/, "Qt::Orientation, int, int") +event("QStandardItemModel", /::layoutChanged\s*\(/, "QList, QAbstractItemModel::LayoutChangeHint") +event("QStandardItemModel", /::layoutAboutToBeChanged\s*\(/, "QList, QAbstractItemModel::LayoutChangeHint") +event("QStandardItemModel", /::rowsAboutToBeInserted\s*\(/, "QModelIndex, int, int") +event("QStandardItemModel", /::rowsInserted\s*\(/, "QModelIndex, int, int") +event("QStandardItemModel", /::rowsAboutToBeRemoved\s*\(/, "QModelIndex, int, int") +event("QStandardItemModel", /::rowsRemoved\s*\(/, "QModelIndex, int, int") +event("QStandardItemModel", /::columnsAboutToBeInserted\s*\(/, "QModelIndex, int, int") +event("QStandardItemModel", /::columnsInserted\s*\(/, "QModelIndex, int, int") +event("QStandardItemModel", /::columnsAboutToBeRemoved\s*\(/, "QModelIndex, int, int") +event("QStandardItemModel", /::columnsRemoved\s*\(/, "QModelIndex, int, int") +event("QStandardItemModel", /::modelAboutToBeReset\s*\(/, "") +event("QStandardItemModel", /::modelReset\s*\(/, "") +event("QStandardItemModel", /::rowsAboutToBeMoved\s*\(/, "QModelIndex, int, int, QModelIndex, int") +event("QStandardItemModel", /::rowsMoved\s*\(/, "QModelIndex, int, int, QModelIndex, int") +event("QStandardItemModel", /::columnsAboutToBeMoved\s*\(/, "QModelIndex, int, int, QModelIndex, int") +event("QStandardItemModel", /::columnsMoved\s*\(/, "QModelIndex, int, int, QModelIndex, int") +event("QStandardItemModel", /::itemChanged\s*\(/, "QStandardItem*") +event("QStyleHints", /::destroyed\s*\(/, "QObject*") +event("QStyleHints", /::objectNameChanged\s*\(/, "QString") +event("QStyleHints", /::cursorFlashTimeChanged\s*\(/, "int") +event("QStyleHints", /::keyboardInputIntervalChanged\s*\(/, "int") +event("QStyleHints", /::mouseDoubleClickIntervalChanged\s*\(/, "int") +event("QStyleHints", /::mousePressAndHoldIntervalChanged\s*\(/, "int") +event("QStyleHints", /::startDragDistanceChanged\s*\(/, "int") +event("QStyleHints", /::startDragTimeChanged\s*\(/, "int") +event("QStyleHints", /::tabFocusBehaviorChanged\s*\(/, "Qt::TabFocusBehavior") +event("QStyleHints", /::useHoverEffectsChanged\s*\(/, "bool") +event("QStyleHints", /::wheelScrollLinesChanged\s*\(/, "int") +event("QStyleHints", /::mouseQuickSelectionThresholdChanged\s*\(/, "int") +event("QSyntaxHighlighter", /::destroyed\s*\(/, "QObject*") +event("QSyntaxHighlighter", /::objectNameChanged\s*\(/, "QString") +event("QTextBlockGroup", /::destroyed\s*\(/, "QObject*") +event("QTextBlockGroup", /::objectNameChanged\s*\(/, "QString") +event("QTextDocument", /::destroyed\s*\(/, "QObject*") +event("QTextDocument", /::objectNameChanged\s*\(/, "QString") +event("QTextDocument", /::contentsChange\s*\(/, "int, int, int") +event("QTextDocument", /::contentsChanged\s*\(/, "") +event("QTextDocument", /::undoAvailable\s*\(/, "bool") +event("QTextDocument", /::redoAvailable\s*\(/, "bool") +event("QTextDocument", /::undoCommandAdded\s*\(/, "") +event("QTextDocument", /::modificationChanged\s*\(/, "bool") +event("QTextDocument", /::cursorPositionChanged\s*\(/, "QTextCursor") +event("QTextDocument", /::blockCountChanged\s*\(/, "int") +event("QTextDocument", /::baseUrlChanged\s*\(/, "QUrl") +event("QTextDocument", /::documentLayoutChanged\s*\(/, "") +event("QTextFrame", /::destroyed\s*\(/, "QObject*") +event("QTextFrame", /::objectNameChanged\s*\(/, "QString") +event("QTextList", /::destroyed\s*\(/, "QObject*") +event("QTextList", /::objectNameChanged\s*\(/, "QString") +event("QTextObject", /::destroyed\s*\(/, "QObject*") +event("QTextObject", /::objectNameChanged\s*\(/, "QString") +event("QTextTable", /::destroyed\s*\(/, "QObject*") +event("QTextTable", /::objectNameChanged\s*\(/, "QString") +event("QValidator", /::destroyed\s*\(/, "QObject*") +event("QValidator", /::objectNameChanged\s*\(/, "QString") +event("QValidator", /::changed\s*\(/, "") +event("QWindow", /::destroyed\s*\(/, "QObject*") +event("QWindow", /::objectNameChanged\s*\(/, "QString") +event("QWindow", /::screenChanged\s*\(/, "QScreen*") +event("QWindow", /::modalityChanged\s*\(/, "Qt::WindowModality") +event("QWindow", /::windowStateChanged\s*\(/, "Qt::WindowState") +event("QWindow", /::windowTitleChanged\s*\(/, "QString") +event("QWindow", /::xChanged\s*\(/, "int") +event("QWindow", /::yChanged\s*\(/, "int") +event("QWindow", /::widthChanged\s*\(/, "int") +event("QWindow", /::heightChanged\s*\(/, "int") +event("QWindow", /::minimumWidthChanged\s*\(/, "int") +event("QWindow", /::minimumHeightChanged\s*\(/, "int") +event("QWindow", /::maximumWidthChanged\s*\(/, "int") +event("QWindow", /::maximumHeightChanged\s*\(/, "int") +event("QWindow", /::visibleChanged\s*\(/, "bool") +event("QWindow", /::visibilityChanged\s*\(/, "QWindow::Visibility") +event("QWindow", /::activeChanged\s*\(/, "") +event("QWindow", /::contentOrientationChanged\s*\(/, "Qt::ScreenOrientation") +event("QWindow", /::focusObjectChanged\s*\(/, "QObject*") +event("QWindow", /::opacityChanged\s*\(/, "double") +event("QAbstractButton", /::destroyed\s*\(/, "QObject*") +event("QAbstractButton", /::objectNameChanged\s*\(/, "QString") +event("QAbstractButton", /::windowTitleChanged\s*\(/, "QString") +event("QAbstractButton", /::windowIconChanged\s*\(/, "QIcon") +event("QAbstractButton", /::windowIconTextChanged\s*\(/, "QString") +event("QAbstractButton", /::customContextMenuRequested\s*\(/, "QPoint") +event("QAbstractButton", /::pressed\s*\(/, "") +event("QAbstractButton", /::released\s*\(/, "") +event("QAbstractButton", /::clicked\s*\(/, "bool") +event("QAbstractButton", /::toggled\s*\(/, "bool") +event("QAbstractItemDelegate", /::destroyed\s*\(/, "QObject*") +event("QAbstractItemDelegate", /::objectNameChanged\s*\(/, "QString") +event("QAbstractItemDelegate", /::commitData\s*\(/, "QWidget*") +event("QAbstractItemDelegate", /::closeEditor\s*\(/, "QWidget*, QAbstractItemDelegate::EndEditHint") +event("QAbstractItemDelegate", /::sizeHintChanged\s*\(/, "QModelIndex") +event("QAbstractItemView", /::destroyed\s*\(/, "QObject*") +event("QAbstractItemView", /::objectNameChanged\s*\(/, "QString") +event("QAbstractItemView", /::windowTitleChanged\s*\(/, "QString") +event("QAbstractItemView", /::windowIconChanged\s*\(/, "QIcon") +event("QAbstractItemView", /::windowIconTextChanged\s*\(/, "QString") +event("QAbstractItemView", /::customContextMenuRequested\s*\(/, "QPoint") +event("QAbstractItemView", /::pressed\s*\(/, "QModelIndex") +event("QAbstractItemView", /::clicked\s*\(/, "QModelIndex") +event("QAbstractItemView", /::doubleClicked\s*\(/, "QModelIndex") +event("QAbstractItemView", /::activated\s*\(/, "QModelIndex") +event("QAbstractItemView", /::entered\s*\(/, "QModelIndex") +event("QAbstractItemView", /::viewportEntered\s*\(/, "") +event("QAbstractItemView", /::iconSizeChanged\s*\(/, "QSize") +event("QAbstractScrollArea", /::destroyed\s*\(/, "QObject*") +event("QAbstractScrollArea", /::objectNameChanged\s*\(/, "QString") +event("QAbstractScrollArea", /::windowTitleChanged\s*\(/, "QString") +event("QAbstractScrollArea", /::windowIconChanged\s*\(/, "QIcon") +event("QAbstractScrollArea", /::windowIconTextChanged\s*\(/, "QString") +event("QAbstractScrollArea", /::customContextMenuRequested\s*\(/, "QPoint") +event("QAbstractSlider", /::destroyed\s*\(/, "QObject*") +event("QAbstractSlider", /::objectNameChanged\s*\(/, "QString") +event("QAbstractSlider", /::windowTitleChanged\s*\(/, "QString") +event("QAbstractSlider", /::windowIconChanged\s*\(/, "QIcon") +event("QAbstractSlider", /::windowIconTextChanged\s*\(/, "QString") +event("QAbstractSlider", /::customContextMenuRequested\s*\(/, "QPoint") +event("QAbstractSlider", /::valueChanged\s*\(/, "int") +event("QAbstractSlider", /::sliderPressed\s*\(/, "") +event("QAbstractSlider", /::sliderMoved\s*\(/, "int") +event("QAbstractSlider", /::sliderReleased\s*\(/, "") +event("QAbstractSlider", /::rangeChanged\s*\(/, "int, int") +event("QAbstractSlider", /::actionTriggered\s*\(/, "int") +event("QAbstractSpinBox", /::destroyed\s*\(/, "QObject*") +event("QAbstractSpinBox", /::objectNameChanged\s*\(/, "QString") +event("QAbstractSpinBox", /::windowTitleChanged\s*\(/, "QString") +event("QAbstractSpinBox", /::windowIconChanged\s*\(/, "QIcon") +event("QAbstractSpinBox", /::windowIconTextChanged\s*\(/, "QString") +event("QAbstractSpinBox", /::customContextMenuRequested\s*\(/, "QPoint") +event("QAbstractSpinBox", /::editingFinished\s*\(/, "") +event("QAction", /::destroyed\s*\(/, "QObject*") +event("QAction", /::objectNameChanged\s*\(/, "QString") +event("QAction", /::changed\s*\(/, "") +event("QAction", /::triggered\s*\(/, "bool") +event("QAction", /::hovered\s*\(/, "") +event("QAction", /::toggled\s*\(/, "bool") +event("QActionGroup", /::destroyed\s*\(/, "QObject*") +event("QActionGroup", /::objectNameChanged\s*\(/, "QString") +event("QActionGroup", /::triggered\s*\(/, "QAction*") +event("QActionGroup", /::hovered\s*\(/, "QAction*") event("QApplication", /::destroyed\s*\(/, "QObject*") event("QApplication", /::objectNameChanged\s*\(/, "QString") event("QApplication", /::aboutToQuit\s*\(/, "") @@ -236,6 +673,7 @@ event("QApplication", /::applicationVersionChanged\s*\(/, "") event("QApplication", /::fontDatabaseChanged\s*\(/, "") event("QApplication", /::screenAdded\s*\(/, "QScreen*") event("QApplication", /::screenRemoved\s*\(/, "QScreen*") +event("QApplication", /::primaryScreenChanged\s*\(/, "QScreen*") event("QApplication", /::lastWindowClosed\s*\(/, "") event("QApplication", /::focusObjectChanged\s*\(/, "QObject*") event("QApplication", /::focusWindowChanged\s*\(/, "QWindow*") @@ -244,82 +682,11 @@ event("QApplication", /::layoutDirectionChanged\s*\(/, "Qt::LayoutDirection") event("QApplication", /::commitDataRequest\s*\(/, "QSessionManager&") event("QApplication", /::saveStateRequest\s*\(/, "QSessionManager&") event("QApplication", /::paletteChanged\s*\(/, "QPalette") +event("QApplication", /::applicationDisplayNameChanged\s*\(/, "") +event("QApplication", /::fontChanged\s*\(/, "QFont") event("QApplication", /::focusChanged\s*\(/, "QWidget*, QWidget*") -event("QAudioDecoder", /::destroyed\s*\(/, "QObject*") -event("QAudioDecoder", /::objectNameChanged\s*\(/, "QString") -event("QAudioDecoder", /::notifyIntervalChanged\s*\(/, "int") -event("QAudioDecoder", /::metaDataAvailableChanged\s*\(/, "bool") -event("QAudioDecoder", /::metaDataChanged\s*\(/, "QString, QVariant") -event("QAudioDecoder", /::availabilityChanged\s*\(/, "bool") -event("QAudioDecoder", /::availabilityChanged\s*\(/, "QMultimedia::AvailabilityStatus") -event("QAudioDecoder", /::bufferAvailableChanged\s*\(/, "bool") -event("QAudioDecoder", /::bufferReady\s*\(/, "") -event("QAudioDecoder", /::finished\s*\(/, "") -event("QAudioDecoder", /::stateChanged\s*\(/, "QAudioDecoder::State") -event("QAudioDecoder", /::formatChanged\s*\(/, "QAudioFormat") -event("QAudioDecoder", /::error\s*\(/, "QAudioDecoder::Error") -event("QAudioDecoder", /::sourceChanged\s*\(/, "") -event("QAudioDecoder", /::positionChanged\s*\(/, "qlonglong") -event("QAudioDecoder", /::durationChanged\s*\(/, "qlonglong") -event("QAudioDecoderControl", /::destroyed\s*\(/, "QObject*") -event("QAudioDecoderControl", /::objectNameChanged\s*\(/, "QString") -event("QAudioDecoderControl", /::stateChanged\s*\(/, "QAudioDecoder::State") -event("QAudioDecoderControl", /::formatChanged\s*\(/, "QAudioFormat") -event("QAudioDecoderControl", /::sourceChanged\s*\(/, "") -event("QAudioDecoderControl", /::error\s*\(/, "int, QString") -event("QAudioDecoderControl", /::bufferReady\s*\(/, "") -event("QAudioDecoderControl", /::bufferAvailableChanged\s*\(/, "bool") -event("QAudioDecoderControl", /::finished\s*\(/, "") -event("QAudioDecoderControl", /::positionChanged\s*\(/, "qlonglong") -event("QAudioDecoderControl", /::durationChanged\s*\(/, "qlonglong") -event("QAudioEncoderSettingsControl", /::destroyed\s*\(/, "QObject*") -event("QAudioEncoderSettingsControl", /::objectNameChanged\s*\(/, "QString") -event("QAudioInput", /::destroyed\s*\(/, "QObject*") -event("QAudioInput", /::objectNameChanged\s*\(/, "QString") -event("QAudioInput", /::stateChanged\s*\(/, "QAudio::State") -event("QAudioInput", /::notify\s*\(/, "") -event("QAudioInputSelectorControl", /::destroyed\s*\(/, "QObject*") -event("QAudioInputSelectorControl", /::objectNameChanged\s*\(/, "QString") -event("QAudioInputSelectorControl", /::activeInputChanged\s*\(/, "QString") -event("QAudioInputSelectorControl", /::availableInputsChanged\s*\(/, "") -event("QAudioOutput", /::destroyed\s*\(/, "QObject*") -event("QAudioOutput", /::objectNameChanged\s*\(/, "QString") -event("QAudioOutput", /::stateChanged\s*\(/, "QAudio::State") -event("QAudioOutput", /::notify\s*\(/, "") -event("QAudioOutputSelectorControl", /::destroyed\s*\(/, "QObject*") -event("QAudioOutputSelectorControl", /::objectNameChanged\s*\(/, "QString") -event("QAudioOutputSelectorControl", /::activeOutputChanged\s*\(/, "QString") -event("QAudioOutputSelectorControl", /::availableOutputsChanged\s*\(/, "") -event("QAudioProbe", /::destroyed\s*\(/, "QObject*") -event("QAudioProbe", /::objectNameChanged\s*\(/, "QString") -event("QAudioProbe", /::audioBufferProbed\s*\(/, "QAudioBuffer") -event("QAudioProbe", /::flush\s*\(/, "") -event("QAudioRecorder", /::destroyed\s*\(/, "QObject*") -event("QAudioRecorder", /::objectNameChanged\s*\(/, "QString") -event("QAudioRecorder", /::stateChanged\s*\(/, "QMediaRecorder::State") -event("QAudioRecorder", /::statusChanged\s*\(/, "QMediaRecorder::Status") -event("QAudioRecorder", /::durationChanged\s*\(/, "qlonglong") -event("QAudioRecorder", /::mutedChanged\s*\(/, "bool") -event("QAudioRecorder", /::volumeChanged\s*\(/, "double") -event("QAudioRecorder", /::actualLocationChanged\s*\(/, "QUrl") -event("QAudioRecorder", /::error\s*\(/, "QMediaRecorder::Error") -event("QAudioRecorder", /::metaDataAvailableChanged\s*\(/, "bool") -event("QAudioRecorder", /::metaDataWritableChanged\s*\(/, "bool") -event("QAudioRecorder", /::metaDataChanged\s*\(/, "QString, QVariant") -event("QAudioRecorder", /::availabilityChanged\s*\(/, "bool") -event("QAudioRecorder", /::availabilityChanged\s*\(/, "QMultimedia::AvailabilityStatus") -event("QAudioRecorder", /::audioInputChanged\s*\(/, "QString") -event("QAudioRecorder", /::availableAudioInputsChanged\s*\(/, "") -event("QAudioSystemPlugin", /::destroyed\s*\(/, "QObject*") -event("QAudioSystemPlugin", /::objectNameChanged\s*\(/, "QString") event("QBoxLayout", /::destroyed\s*\(/, "QObject*") event("QBoxLayout", /::objectNameChanged\s*\(/, "QString") -event("QBuffer", /::destroyed\s*\(/, "QObject*") -event("QBuffer", /::objectNameChanged\s*\(/, "QString") -event("QBuffer", /::readyRead\s*\(/, "") -event("QBuffer", /::bytesWritten\s*\(/, "qlonglong") -event("QBuffer", /::aboutToClose\s*\(/, "") -event("QBuffer", /::readChannelFinished\s*\(/, "") event("QButtonGroup", /::destroyed\s*\(/, "QObject*") event("QButtonGroup", /::objectNameChanged\s*\(/, "QString") event("QButtonGroup", /::buttonClicked\s*\(.*QAbstractButton/, "QAbstractButton*") @@ -343,106 +710,6 @@ event("QCalendarWidget", /::selectionChanged\s*\(/, "") event("QCalendarWidget", /::clicked\s*\(/, "QDate") event("QCalendarWidget", /::activated\s*\(/, "QDate") event("QCalendarWidget", /::currentPageChanged\s*\(/, "int, int") -event("QCamera", /::destroyed\s*\(/, "QObject*") -event("QCamera", /::objectNameChanged\s*\(/, "QString") -event("QCamera", /::notifyIntervalChanged\s*\(/, "int") -event("QCamera", /::metaDataAvailableChanged\s*\(/, "bool") -event("QCamera", /::metaDataChanged\s*\(/, "QString, QVariant") -event("QCamera", /::availabilityChanged\s*\(/, "bool") -event("QCamera", /::availabilityChanged\s*\(/, "QMultimedia::AvailabilityStatus") -event("QCamera", /::stateChanged\s*\(/, "QCamera::State") -event("QCamera", /::captureModeChanged\s*\(/, "QCamera::CaptureModes") -event("QCamera", /::statusChanged\s*\(/, "QCamera::Status") -event("QCamera", /::locked\s*\(/, "") -event("QCamera", /::lockFailed\s*\(/, "") -event("QCamera", /::lockStatusChanged\s*\(/, "QCamera::LockStatus, QCamera::LockChangeReason") -event("QCamera", /::lockStatusChanged\s*\(/, "QCamera::LockType, QCamera::LockStatus, QCamera::LockChangeReason") -event("QCamera", /::error\s*\(/, "QCamera::Error") -event("QCameraCaptureBufferFormatControl", /::destroyed\s*\(/, "QObject*") -event("QCameraCaptureBufferFormatControl", /::objectNameChanged\s*\(/, "QString") -event("QCameraCaptureBufferFormatControl", /::bufferFormatChanged\s*\(/, "QVideoFrame::PixelFormat") -event("QCameraCaptureDestinationControl", /::destroyed\s*\(/, "QObject*") -event("QCameraCaptureDestinationControl", /::objectNameChanged\s*\(/, "QString") -event("QCameraCaptureDestinationControl", /::captureDestinationChanged\s*\(/, "QCameraImageCapture::CaptureDestinations") -event("QCameraControl", /::destroyed\s*\(/, "QObject*") -event("QCameraControl", /::objectNameChanged\s*\(/, "QString") -event("QCameraControl", /::stateChanged\s*\(/, "QCamera::State") -event("QCameraControl", /::statusChanged\s*\(/, "QCamera::Status") -event("QCameraControl", /::error\s*\(/, "int, QString") -event("QCameraControl", /::captureModeChanged\s*\(/, "QCamera::CaptureModes") -event("QCameraExposure", /::destroyed\s*\(/, "QObject*") -event("QCameraExposure", /::objectNameChanged\s*\(/, "QString") -event("QCameraExposure", /::flashReady\s*\(/, "bool") -event("QCameraExposure", /::apertureChanged\s*\(/, "double") -event("QCameraExposure", /::apertureRangeChanged\s*\(/, "") -event("QCameraExposure", /::shutterSpeedChanged\s*\(/, "double") -event("QCameraExposure", /::shutterSpeedRangeChanged\s*\(/, "") -event("QCameraExposure", /::isoSensitivityChanged\s*\(/, "int") -event("QCameraExposure", /::exposureCompensationChanged\s*\(/, "double") -event("QCameraExposureControl", /::destroyed\s*\(/, "QObject*") -event("QCameraExposureControl", /::objectNameChanged\s*\(/, "QString") -event("QCameraExposureControl", /::requestedValueChanged\s*\(/, "int") -event("QCameraExposureControl", /::actualValueChanged\s*\(/, "int") -event("QCameraExposureControl", /::parameterRangeChanged\s*\(/, "int") -event("QCameraFeedbackControl", /::destroyed\s*\(/, "QObject*") -event("QCameraFeedbackControl", /::objectNameChanged\s*\(/, "QString") -event("QCameraFlashControl", /::destroyed\s*\(/, "QObject*") -event("QCameraFlashControl", /::objectNameChanged\s*\(/, "QString") -event("QCameraFlashControl", /::flashReady\s*\(/, "bool") -event("QCameraFocus", /::destroyed\s*\(/, "QObject*") -event("QCameraFocus", /::objectNameChanged\s*\(/, "QString") -event("QCameraFocus", /::opticalZoomChanged\s*\(/, "double") -event("QCameraFocus", /::digitalZoomChanged\s*\(/, "double") -event("QCameraFocus", /::focusZonesChanged\s*\(/, "") -event("QCameraFocus", /::maximumOpticalZoomChanged\s*\(/, "double") -event("QCameraFocus", /::maximumDigitalZoomChanged\s*\(/, "double") -event("QCameraFocusControl", /::destroyed\s*\(/, "QObject*") -event("QCameraFocusControl", /::objectNameChanged\s*\(/, "QString") -event("QCameraFocusControl", /::focusModeChanged\s*\(/, "QCameraFocus::FocusModes") -event("QCameraFocusControl", /::focusPointModeChanged\s*\(/, "QCameraFocus::FocusPointMode") -event("QCameraFocusControl", /::customFocusPointChanged\s*\(/, "QPointF") -event("QCameraFocusControl", /::focusZonesChanged\s*\(/, "") -event("QCameraImageCapture", /::destroyed\s*\(/, "QObject*") -event("QCameraImageCapture", /::objectNameChanged\s*\(/, "QString") -event("QCameraImageCapture", /::error\s*\(/, "int, QCameraImageCapture::Error, QString") -event("QCameraImageCapture", /::readyForCaptureChanged\s*\(/, "bool") -event("QCameraImageCapture", /::bufferFormatChanged\s*\(/, "QVideoFrame::PixelFormat") -event("QCameraImageCapture", /::captureDestinationChanged\s*\(/, "QCameraImageCapture::CaptureDestinations") -event("QCameraImageCapture", /::imageExposed\s*\(/, "int") -event("QCameraImageCapture", /::imageCaptured\s*\(/, "int, QImage") -event("QCameraImageCapture", /::imageMetadataAvailable\s*\(/, "int, QString, QVariant") -event("QCameraImageCapture", /::imageAvailable\s*\(/, "int, QVideoFrame") -event("QCameraImageCapture", /::imageSaved\s*\(/, "int, QString") -event("QCameraImageCaptureControl", /::destroyed\s*\(/, "QObject*") -event("QCameraImageCaptureControl", /::objectNameChanged\s*\(/, "QString") -event("QCameraImageCaptureControl", /::readyForCaptureChanged\s*\(/, "bool") -event("QCameraImageCaptureControl", /::imageExposed\s*\(/, "int") -event("QCameraImageCaptureControl", /::imageCaptured\s*\(/, "int, QImage") -event("QCameraImageCaptureControl", /::imageMetadataAvailable\s*\(/, "int, QString, QVariant") -event("QCameraImageCaptureControl", /::imageAvailable\s*\(/, "int, QVideoFrame") -event("QCameraImageCaptureControl", /::imageSaved\s*\(/, "int, QString") -event("QCameraImageCaptureControl", /::error\s*\(/, "int, int, QString") -event("QCameraImageProcessing", /::destroyed\s*\(/, "QObject*") -event("QCameraImageProcessing", /::objectNameChanged\s*\(/, "QString") -event("QCameraImageProcessingControl", /::destroyed\s*\(/, "QObject*") -event("QCameraImageProcessingControl", /::objectNameChanged\s*\(/, "QString") -event("QCameraInfoControl", /::destroyed\s*\(/, "QObject*") -event("QCameraInfoControl", /::objectNameChanged\s*\(/, "QString") -event("QCameraLocksControl", /::destroyed\s*\(/, "QObject*") -event("QCameraLocksControl", /::objectNameChanged\s*\(/, "QString") -event("QCameraLocksControl", /::lockStatusChanged\s*\(/, "QCamera::LockType, QCamera::LockStatus, QCamera::LockChangeReason") -event("QCameraViewfinderSettingsControl", /::destroyed\s*\(/, "QObject*") -event("QCameraViewfinderSettingsControl", /::objectNameChanged\s*\(/, "QString") -event("QCameraViewfinderSettingsControl2", /::destroyed\s*\(/, "QObject*") -event("QCameraViewfinderSettingsControl2", /::objectNameChanged\s*\(/, "QString") -event("QCameraZoomControl", /::destroyed\s*\(/, "QObject*") -event("QCameraZoomControl", /::objectNameChanged\s*\(/, "QString") -event("QCameraZoomControl", /::maximumOpticalZoomChanged\s*\(/, "double") -event("QCameraZoomControl", /::maximumDigitalZoomChanged\s*\(/, "double") -event("QCameraZoomControl", /::requestedOpticalZoomChanged\s*\(/, "double") -event("QCameraZoomControl", /::requestedDigitalZoomChanged\s*\(/, "double") -event("QCameraZoomControl", /::currentOpticalZoomChanged\s*\(/, "double") -event("QCameraZoomControl", /::currentDigitalZoomChanged\s*\(/, "double") event("QCheckBox", /::destroyed\s*\(/, "QObject*") event("QCheckBox", /::objectNameChanged\s*\(/, "QString") event("QCheckBox", /::windowTitleChanged\s*\(/, "QString") @@ -454,12 +721,6 @@ event("QCheckBox", /::released\s*\(/, "") event("QCheckBox", /::clicked\s*\(/, "bool") event("QCheckBox", /::toggled\s*\(/, "bool") event("QCheckBox", /::stateChanged\s*\(/, "int") -event("QClipboard", /::destroyed\s*\(/, "QObject*") -event("QClipboard", /::objectNameChanged\s*\(/, "QString") -event("QClipboard", /::changed\s*\(/, "QClipboard::Mode") -event("QClipboard", /::selectionChanged\s*\(/, "") -event("QClipboard", /::findBufferChanged\s*\(/, "") -event("QClipboard", /::dataChanged\s*\(/, "") event("QColorDialog", /::destroyed\s*\(/, "QObject*") event("QColorDialog", /::objectNameChanged\s*\(/, "QString") event("QColorDialog", /::windowTitleChanged\s*\(/, "QString") @@ -522,13 +783,6 @@ event("QCompleter", /::activated\s*\(.*QModelIndex/, "QModelIndex") event("QCompleter", /::highlighted\s*\(.*QString/, "QString") rename("QCompleter", /::highlighted\s*\(.*QString/, "highlighted_qs") event("QCompleter", /::highlighted\s*\(.*QModelIndex/, "QModelIndex") -event("QCoreApplication", /::destroyed\s*\(/, "QObject*") -event("QCoreApplication", /::objectNameChanged\s*\(/, "QString") -event("QCoreApplication", /::aboutToQuit\s*\(/, "") -event("QCoreApplication", /::organizationNameChanged\s*\(/, "") -event("QCoreApplication", /::organizationDomainChanged\s*\(/, "") -event("QCoreApplication", /::applicationNameChanged\s*\(/, "") -event("QCoreApplication", /::applicationVersionChanged\s*\(/, "") event("QDataWidgetMapper", /::destroyed\s*\(/, "QObject*") event("QDataWidgetMapper", /::objectNameChanged\s*\(/, "QString") event("QDataWidgetMapper", /::currentIndexChanged\s*\(/, "int") @@ -562,6 +816,7 @@ event("QDesktopWidget", /::customContextMenuRequested\s*\(/, "QPoint") event("QDesktopWidget", /::resized\s*\(/, "int") event("QDesktopWidget", /::workAreaResized\s*\(/, "int") event("QDesktopWidget", /::screenCountChanged\s*\(/, "int") +event("QDesktopWidget", /::primaryScreenChanged\s*\(/, "") event("QDial", /::destroyed\s*\(/, "QObject*") event("QDial", /::objectNameChanged\s*\(/, "QString") event("QDial", /::windowTitleChanged\s*\(/, "QString") @@ -613,12 +868,6 @@ event("QDirModel", /::rowsAboutToBeMoved\s*\(/, "QModelIndex, int, int, QModelIn event("QDirModel", /::rowsMoved\s*\(/, "QModelIndex, int, int, QModelIndex, int") event("QDirModel", /::columnsAboutToBeMoved\s*\(/, "QModelIndex, int, int, QModelIndex, int") event("QDirModel", /::columnsMoved\s*\(/, "QModelIndex, int, int, QModelIndex, int") -event("QDnsLookup", /::destroyed\s*\(/, "QObject*") -event("QDnsLookup", /::objectNameChanged\s*\(/, "QString") -event("QDnsLookup", /::finished\s*\(/, "") -event("QDnsLookup", /::nameChanged\s*\(/, "QString") -event("QDnsLookup", /::typeChanged\s*\(/, "Type") -event("QDnsLookup", /::nameserverChanged\s*\(/, "QHostAddress") event("QDockWidget", /::destroyed\s*\(/, "QObject*") event("QDockWidget", /::objectNameChanged\s*\(/, "QString") event("QDockWidget", /::windowTitleChanged\s*\(/, "QString") @@ -640,17 +889,6 @@ event("QDoubleSpinBox", /::editingFinished\s*\(/, "") event("QDoubleSpinBox", /::valueChanged\s*\(.*double/, "double") event("QDoubleSpinBox", /::valueChanged\s*\(.*QString/, "QString") rename("QDoubleSpinBox", /::valueChanged\s*\(.*QString/, "valueChanged_qs") -event("QDoubleValidator", /::destroyed\s*\(/, "QObject*") -event("QDoubleValidator", /::objectNameChanged\s*\(/, "QString") -event("QDoubleValidator", /::changed\s*\(/, "") -event("QDoubleValidator", /::bottomChanged\s*\(/, "double") -event("QDoubleValidator", /::topChanged\s*\(/, "double") -event("QDoubleValidator", /::decimalsChanged\s*\(/, "int") -event("QDoubleValidator", /::notationChanged\s*\(/, "QDoubleValidator::Notation") -event("QDrag", /::destroyed\s*\(/, "QObject*") -event("QDrag", /::objectNameChanged\s*\(/, "QString") -event("QDrag", /::actionChanged\s*\(/, "Qt::DropAction") -event("QDrag", /::targetChanged\s*\(/, "QObject*") event("QErrorMessage", /::destroyed\s*\(/, "QObject*") event("QErrorMessage", /::objectNameChanged\s*\(/, "QString") event("QErrorMessage", /::windowTitleChanged\s*\(/, "QString") @@ -660,25 +898,6 @@ event("QErrorMessage", /::customContextMenuRequested\s*\(/, "QPoint") event("QErrorMessage", /::finished\s*\(/, "int") event("QErrorMessage", /::accepted\s*\(/, "") event("QErrorMessage", /::rejected\s*\(/, "") -event("QEventLoop", /::destroyed\s*\(/, "QObject*") -event("QEventLoop", /::objectNameChanged\s*\(/, "QString") -event("QEventTransition", /::destroyed\s*\(/, "QObject*") -event("QEventTransition", /::objectNameChanged\s*\(/, "QString") -event("QEventTransition", /::triggered\s*\(/, "") -event("QEventTransition", /::targetStateChanged\s*\(/, "") -event("QEventTransition", /::targetStatesChanged\s*\(/, "") -event("QFile", /::destroyed\s*\(/, "QObject*") -event("QFile", /::objectNameChanged\s*\(/, "QString") -event("QFile", /::readyRead\s*\(/, "") -event("QFile", /::bytesWritten\s*\(/, "qlonglong") -event("QFile", /::aboutToClose\s*\(/, "") -event("QFile", /::readChannelFinished\s*\(/, "") -event("QFileDevice", /::destroyed\s*\(/, "QObject*") -event("QFileDevice", /::objectNameChanged\s*\(/, "QString") -event("QFileDevice", /::readyRead\s*\(/, "") -event("QFileDevice", /::bytesWritten\s*\(/, "qlonglong") -event("QFileDevice", /::aboutToClose\s*\(/, "") -event("QFileDevice", /::readChannelFinished\s*\(/, "") event("QFileDialog", /::destroyed\s*\(/, "QObject*") event("QFileDialog", /::objectNameChanged\s*\(/, "QString") event("QFileDialog", /::windowTitleChanged\s*\(/, "QString") @@ -697,8 +916,6 @@ event("QFileDialog", /::urlsSelected\s*\(/, "QList") event("QFileDialog", /::currentUrlChanged\s*\(/, "QUrl") event("QFileDialog", /::directoryUrlEntered\s*\(/, "QUrl") event("QFileDialog", /::filterSelected\s*\(/, "QString") -event("QFileSelector", /::destroyed\s*\(/, "QObject*") -event("QFileSelector", /::objectNameChanged\s*\(/, "QString") event("QFileSystemModel", /::destroyed\s*\(/, "QObject*") event("QFileSystemModel", /::objectNameChanged\s*\(/, "QString") event("QFileSystemModel", /::dataChanged\s*\(/, "QModelIndex, QModelIndex, QVector") @@ -722,15 +939,6 @@ event("QFileSystemModel", /::columnsMoved\s*\(/, "QModelIndex, int, int, QModelI event("QFileSystemModel", /::rootPathChanged\s*\(/, "QString") event("QFileSystemModel", /::fileRenamed\s*\(/, "QString, QString, QString") event("QFileSystemModel", /::directoryLoaded\s*\(/, "QString") -event("QFileSystemWatcher", /::destroyed\s*\(/, "QObject*") -event("QFileSystemWatcher", /::objectNameChanged\s*\(/, "QString") -event("QFileSystemWatcher", /::fileChanged\s*\(/, "QString") -event("QFileSystemWatcher", /::directoryChanged\s*\(/, "QString") -event("QFinalState", /::destroyed\s*\(/, "QObject*") -event("QFinalState", /::objectNameChanged\s*\(/, "QString") -event("QFinalState", /::entered\s*\(/, "") -event("QFinalState", /::exited\s*\(/, "") -event("QFinalState", /::activeChanged\s*\(/, "bool") event("QFocusFrame", /::destroyed\s*\(/, "QObject*") event("QFocusFrame", /::objectNameChanged\s*\(/, "QString") event("QFocusFrame", /::windowTitleChanged\s*\(/, "QString") @@ -774,8 +982,6 @@ event("QFrame", /::windowTitleChanged\s*\(/, "QString") event("QFrame", /::windowIconChanged\s*\(/, "QIcon") event("QFrame", /::windowIconTextChanged\s*\(/, "QString") event("QFrame", /::customContextMenuRequested\s*\(/, "QPoint") -event("QGenericPlugin", /::destroyed\s*\(/, "QObject*") -event("QGenericPlugin", /::objectNameChanged\s*\(/, "QString") event("QGesture", /::destroyed\s*\(/, "QObject*") event("QGesture", /::objectNameChanged\s*\(/, "QString") event("QGraphicsAnchor", /::destroyed\s*\(/, "QObject*") @@ -854,20 +1060,6 @@ event("QGraphicsScene", /::changed\s*\(/, "QList") event("QGraphicsScene", /::sceneRectChanged\s*\(/, "QRectF") event("QGraphicsScene", /::selectionChanged\s*\(/, "") event("QGraphicsScene", /::focusItemChanged\s*\(/, "QGraphicsItem*, QGraphicsItem*, Qt::FocusReason") -event("QGraphicsSvgItem", /::destroyed\s*\(/, "QObject*") -event("QGraphicsSvgItem", /::objectNameChanged\s*\(/, "QString") -event("QGraphicsSvgItem", /::parentChanged\s*\(/, "") -event("QGraphicsSvgItem", /::opacityChanged\s*\(/, "") -event("QGraphicsSvgItem", /::visibleChanged\s*\(/, "") -event("QGraphicsSvgItem", /::enabledChanged\s*\(/, "") -event("QGraphicsSvgItem", /::xChanged\s*\(/, "") -event("QGraphicsSvgItem", /::yChanged\s*\(/, "") -event("QGraphicsSvgItem", /::zChanged\s*\(/, "") -event("QGraphicsSvgItem", /::rotationChanged\s*\(/, "") -event("QGraphicsSvgItem", /::scaleChanged\s*\(/, "") -event("QGraphicsSvgItem", /::childrenChanged\s*\(/, "") -event("QGraphicsSvgItem", /::widthChanged\s*\(/, "") -event("QGraphicsSvgItem", /::heightChanged\s*\(/, "") event("QGraphicsTextItem", /::destroyed\s*\(/, "QObject*") event("QGraphicsTextItem", /::objectNameChanged\s*\(/, "QString") event("QGraphicsTextItem", /::parentChanged\s*\(/, "") @@ -886,21 +1078,6 @@ event("QGraphicsTextItem", /::linkActivated\s*\(/, "QString") event("QGraphicsTextItem", /::linkHovered\s*\(/, "QString") event("QGraphicsTransform", /::destroyed\s*\(/, "QObject*") event("QGraphicsTransform", /::objectNameChanged\s*\(/, "QString") -event("QGraphicsVideoItem", /::destroyed\s*\(/, "QObject*") -event("QGraphicsVideoItem", /::objectNameChanged\s*\(/, "QString") -event("QGraphicsVideoItem", /::parentChanged\s*\(/, "") -event("QGraphicsVideoItem", /::opacityChanged\s*\(/, "") -event("QGraphicsVideoItem", /::visibleChanged\s*\(/, "") -event("QGraphicsVideoItem", /::enabledChanged\s*\(/, "") -event("QGraphicsVideoItem", /::xChanged\s*\(/, "") -event("QGraphicsVideoItem", /::yChanged\s*\(/, "") -event("QGraphicsVideoItem", /::zChanged\s*\(/, "") -event("QGraphicsVideoItem", /::rotationChanged\s*\(/, "") -event("QGraphicsVideoItem", /::scaleChanged\s*\(/, "") -event("QGraphicsVideoItem", /::childrenChanged\s*\(/, "") -event("QGraphicsVideoItem", /::widthChanged\s*\(/, "") -event("QGraphicsVideoItem", /::heightChanged\s*\(/, "") -event("QGraphicsVideoItem", /::nativeSizeChanged\s*\(/, "QSizeF") event("QGraphicsView", /::destroyed\s*\(/, "QObject*") event("QGraphicsView", /::objectNameChanged\s*\(/, "QString") event("QGraphicsView", /::windowTitleChanged\s*\(/, "QString") @@ -934,24 +1111,6 @@ event("QGroupBox", /::windowIconTextChanged\s*\(/, "QString") event("QGroupBox", /::customContextMenuRequested\s*\(/, "QPoint") event("QGroupBox", /::clicked\s*\(/, "bool") event("QGroupBox", /::toggled\s*\(/, "bool") -event("QGuiApplication", /::destroyed\s*\(/, "QObject*") -event("QGuiApplication", /::objectNameChanged\s*\(/, "QString") -event("QGuiApplication", /::aboutToQuit\s*\(/, "") -event("QGuiApplication", /::organizationNameChanged\s*\(/, "") -event("QGuiApplication", /::organizationDomainChanged\s*\(/, "") -event("QGuiApplication", /::applicationNameChanged\s*\(/, "") -event("QGuiApplication", /::applicationVersionChanged\s*\(/, "") -event("QGuiApplication", /::fontDatabaseChanged\s*\(/, "") -event("QGuiApplication", /::screenAdded\s*\(/, "QScreen*") -event("QGuiApplication", /::screenRemoved\s*\(/, "QScreen*") -event("QGuiApplication", /::lastWindowClosed\s*\(/, "") -event("QGuiApplication", /::focusObjectChanged\s*\(/, "QObject*") -event("QGuiApplication", /::focusWindowChanged\s*\(/, "QWindow*") -event("QGuiApplication", /::applicationStateChanged\s*\(/, "Qt::ApplicationState") -event("QGuiApplication", /::layoutDirectionChanged\s*\(/, "Qt::LayoutDirection") -event("QGuiApplication", /::commitDataRequest\s*\(/, "QSessionManager&") -event("QGuiApplication", /::saveStateRequest\s*\(/, "QSessionManager&") -event("QGuiApplication", /::paletteChanged\s*\(/, "QPalette") event("QHBoxLayout", /::destroyed\s*\(/, "QObject*") event("QHBoxLayout", /::objectNameChanged\s*\(/, "QString") event("QHeaderView", /::destroyed\s*\(/, "QObject*") @@ -977,48 +1136,6 @@ event("QHeaderView", /::sectionCountChanged\s*\(/, "int, int") event("QHeaderView", /::sectionHandleDoubleClicked\s*\(/, "int") event("QHeaderView", /::geometriesChanged\s*\(/, "") event("QHeaderView", /::sortIndicatorChanged\s*\(/, "int, Qt::SortOrder") -event("QHistoryState", /::destroyed\s*\(/, "QObject*") -event("QHistoryState", /::objectNameChanged\s*\(/, "QString") -event("QHistoryState", /::entered\s*\(/, "") -event("QHistoryState", /::exited\s*\(/, "") -event("QHistoryState", /::activeChanged\s*\(/, "bool") -event("QHistoryState", /::defaultStateChanged\s*\(/, "") -event("QHistoryState", /::historyTypeChanged\s*\(/, "") -event("QHttpMultiPart", /::destroyed\s*\(/, "QObject*") -event("QHttpMultiPart", /::objectNameChanged\s*\(/, "QString") -event("QIODevice", /::destroyed\s*\(/, "QObject*") -event("QIODevice", /::objectNameChanged\s*\(/, "QString") -event("QIODevice", /::readyRead\s*\(/, "") -event("QIODevice", /::bytesWritten\s*\(/, "qlonglong") -event("QIODevice", /::aboutToClose\s*\(/, "") -event("QIODevice", /::readChannelFinished\s*\(/, "") -event("QIconEnginePlugin", /::destroyed\s*\(/, "QObject*") -event("QIconEnginePlugin", /::objectNameChanged\s*\(/, "QString") -event("QIdentityProxyModel", /::destroyed\s*\(/, "QObject*") -event("QIdentityProxyModel", /::objectNameChanged\s*\(/, "QString") -event("QIdentityProxyModel", /::dataChanged\s*\(/, "QModelIndex, QModelIndex, QVector") -event("QIdentityProxyModel", /::headerDataChanged\s*\(/, "Qt::Orientation, int, int") -event("QIdentityProxyModel", /::layoutChanged\s*\(/, "QList, QAbstractItemModel::LayoutChangeHint") -event("QIdentityProxyModel", /::layoutAboutToBeChanged\s*\(/, "QList, QAbstractItemModel::LayoutChangeHint") -event("QIdentityProxyModel", /::rowsAboutToBeInserted\s*\(/, "QModelIndex, int, int") -event("QIdentityProxyModel", /::rowsInserted\s*\(/, "QModelIndex, int, int") -event("QIdentityProxyModel", /::rowsAboutToBeRemoved\s*\(/, "QModelIndex, int, int") -event("QIdentityProxyModel", /::rowsRemoved\s*\(/, "QModelIndex, int, int") -event("QIdentityProxyModel", /::columnsAboutToBeInserted\s*\(/, "QModelIndex, int, int") -event("QIdentityProxyModel", /::columnsInserted\s*\(/, "QModelIndex, int, int") -event("QIdentityProxyModel", /::columnsAboutToBeRemoved\s*\(/, "QModelIndex, int, int") -event("QIdentityProxyModel", /::columnsRemoved\s*\(/, "QModelIndex, int, int") -event("QIdentityProxyModel", /::modelAboutToBeReset\s*\(/, "") -event("QIdentityProxyModel", /::modelReset\s*\(/, "") -event("QIdentityProxyModel", /::rowsAboutToBeMoved\s*\(/, "QModelIndex, int, int, QModelIndex, int") -event("QIdentityProxyModel", /::rowsMoved\s*\(/, "QModelIndex, int, int, QModelIndex, int") -event("QIdentityProxyModel", /::columnsAboutToBeMoved\s*\(/, "QModelIndex, int, int, QModelIndex, int") -event("QIdentityProxyModel", /::columnsMoved\s*\(/, "QModelIndex, int, int, QModelIndex, int") -event("QIdentityProxyModel", /::sourceModelChanged\s*\(/, "") -event("QImageEncoderControl", /::destroyed\s*\(/, "QObject*") -event("QImageEncoderControl", /::objectNameChanged\s*\(/, "QString") -event("QImageIOPlugin", /::destroyed\s*\(/, "QObject*") -event("QImageIOPlugin", /::objectNameChanged\s*\(/, "QString") event("QInputDialog", /::destroyed\s*\(/, "QObject*") event("QInputDialog", /::objectNameChanged\s*\(/, "QString") event("QInputDialog", /::windowTitleChanged\s*\(/, "QString") @@ -1034,31 +1151,11 @@ event("QInputDialog", /::intValueChanged\s*\(/, "int") event("QInputDialog", /::intValueSelected\s*\(/, "int") event("QInputDialog", /::doubleValueChanged\s*\(/, "double") event("QInputDialog", /::doubleValueSelected\s*\(/, "double") -event("QInputMethod", /::destroyed\s*\(/, "QObject*") -event("QInputMethod", /::objectNameChanged\s*\(/, "QString") -event("QInputMethod", /::cursorRectangleChanged\s*\(/, "") -event("QInputMethod", /::keyboardRectangleChanged\s*\(/, "") -event("QInputMethod", /::visibleChanged\s*\(/, "") -event("QInputMethod", /::animatingChanged\s*\(/, "") -event("QInputMethod", /::localeChanged\s*\(/, "") -event("QInputMethod", /::inputDirectionChanged\s*\(/, "Qt::LayoutDirection") -event("QIntValidator", /::destroyed\s*\(/, "QObject*") -event("QIntValidator", /::objectNameChanged\s*\(/, "QString") -event("QIntValidator", /::changed\s*\(/, "") -event("QIntValidator", /::bottomChanged\s*\(/, "int") -event("QIntValidator", /::topChanged\s*\(/, "int") event("QItemDelegate", /::destroyed\s*\(/, "QObject*") event("QItemDelegate", /::objectNameChanged\s*\(/, "QString") event("QItemDelegate", /::commitData\s*\(/, "QWidget*") event("QItemDelegate", /::closeEditor\s*\(/, "QWidget*, QAbstractItemDelegate::EndEditHint") event("QItemDelegate", /::sizeHintChanged\s*\(/, "QModelIndex") -event("QItemSelectionModel", /::destroyed\s*\(/, "QObject*") -event("QItemSelectionModel", /::objectNameChanged\s*\(/, "QString") -event("QItemSelectionModel", /::selectionChanged\s*\(/, "QItemSelection, QItemSelection") -event("QItemSelectionModel", /::currentChanged\s*\(/, "QModelIndex, QModelIndex") -event("QItemSelectionModel", /::currentRowChanged\s*\(/, "QModelIndex, QModelIndex") -event("QItemSelectionModel", /::currentColumnChanged\s*\(/, "QModelIndex, QModelIndex") -event("QItemSelectionModel", /::modelChanged\s*\(/, "QAbstractItemModel*") event("QKeySequenceEdit", /::destroyed\s*\(/, "QObject*") event("QKeySequenceEdit", /::objectNameChanged\s*\(/, "QString") event("QKeySequenceEdit", /::windowTitleChanged\s*\(/, "QString") @@ -1084,8 +1181,6 @@ event("QLabel", /::linkActivated\s*\(/, "QString") event("QLabel", /::linkHovered\s*\(/, "QString") event("QLayout", /::destroyed\s*\(/, "QObject*") event("QLayout", /::objectNameChanged\s*\(/, "QString") -event("QLibrary", /::destroyed\s*\(/, "QObject*") -event("QLibrary", /::objectNameChanged\s*\(/, "QString") event("QLineEdit", /::destroyed\s*\(/, "QObject*") event("QLineEdit", /::objectNameChanged\s*\(/, "QString") event("QLineEdit", /::windowTitleChanged\s*\(/, "QString") @@ -1098,6 +1193,7 @@ event("QLineEdit", /::cursorPositionChanged\s*\(/, "int, int") event("QLineEdit", /::returnPressed\s*\(/, "") event("QLineEdit", /::editingFinished\s*\(/, "") event("QLineEdit", /::selectionChanged\s*\(/, "") +event("QLineEdit", /::inputRejected\s*\(/, "") event("QListView", /::destroyed\s*\(/, "QObject*") event("QListView", /::objectNameChanged\s*\(/, "QString") event("QListView", /::windowTitleChanged\s*\(/, "QString") @@ -1136,19 +1232,6 @@ event("QListWidget", /::currentItemChanged\s*\(/, "QListWidgetItem*, QListWidget event("QListWidget", /::currentTextChanged\s*\(/, "QString") event("QListWidget", /::currentRowChanged\s*\(/, "int") event("QListWidget", /::itemSelectionChanged\s*\(/, "") -event("QLocalServer", /::destroyed\s*\(/, "QObject*") -event("QLocalServer", /::objectNameChanged\s*\(/, "QString") -event("QLocalServer", /::newConnection\s*\(/, "") -event("QLocalSocket", /::destroyed\s*\(/, "QObject*") -event("QLocalSocket", /::objectNameChanged\s*\(/, "QString") -event("QLocalSocket", /::readyRead\s*\(/, "") -event("QLocalSocket", /::bytesWritten\s*\(/, "qlonglong") -event("QLocalSocket", /::aboutToClose\s*\(/, "") -event("QLocalSocket", /::readChannelFinished\s*\(/, "") -event("QLocalSocket", /::connected\s*\(/, "") -event("QLocalSocket", /::disconnected\s*\(/, "") -event("QLocalSocket", /::error\s*\(/, "QLocalSocket::LocalSocketError") -event("QLocalSocket", /::stateChanged\s*\(/, "QLocalSocket::LocalSocketState") event("QMainWindow", /::destroyed\s*\(/, "QObject*") event("QMainWindow", /::objectNameChanged\s*\(/, "QString") event("QMainWindow", /::windowTitleChanged\s*\(/, "QString") @@ -1157,6 +1240,7 @@ event("QMainWindow", /::windowIconTextChanged\s*\(/, "QString") event("QMainWindow", /::customContextMenuRequested\s*\(/, "QPoint") event("QMainWindow", /::iconSizeChanged\s*\(/, "QSize") event("QMainWindow", /::toolButtonStyleChanged\s*\(/, "Qt::ToolButtonStyle") +event("QMainWindow", /::tabifiedDockWidgetActivated\s*\(/, "QDockWidget*") event("QMdiArea", /::destroyed\s*\(/, "QObject*") event("QMdiArea", /::objectNameChanged\s*\(/, "QString") event("QMdiArea", /::windowTitleChanged\s*\(/, "QString") @@ -1172,117 +1256,6 @@ event("QMdiSubWindow", /::windowIconTextChanged\s*\(/, "QString") event("QMdiSubWindow", /::customContextMenuRequested\s*\(/, "QPoint") event("QMdiSubWindow", /::windowStateChanged\s*\(/, "Qt::WindowStates, Qt::WindowStates") event("QMdiSubWindow", /::aboutToActivate\s*\(/, "") -event("QMediaAudioProbeControl", /::destroyed\s*\(/, "QObject*") -event("QMediaAudioProbeControl", /::objectNameChanged\s*\(/, "QString") -event("QMediaAudioProbeControl", /::audioBufferProbed\s*\(/, "QAudioBuffer") -event("QMediaAudioProbeControl", /::flush\s*\(/, "") -event("QMediaAvailabilityControl", /::destroyed\s*\(/, "QObject*") -event("QMediaAvailabilityControl", /::objectNameChanged\s*\(/, "QString") -event("QMediaAvailabilityControl", /::availabilityChanged\s*\(/, "QMultimedia::AvailabilityStatus") -event("QMediaContainerControl", /::destroyed\s*\(/, "QObject*") -event("QMediaContainerControl", /::objectNameChanged\s*\(/, "QString") -event("QMediaControl", /::destroyed\s*\(/, "QObject*") -event("QMediaControl", /::objectNameChanged\s*\(/, "QString") -event("QMediaGaplessPlaybackControl", /::destroyed\s*\(/, "QObject*") -event("QMediaGaplessPlaybackControl", /::objectNameChanged\s*\(/, "QString") -event("QMediaGaplessPlaybackControl", /::crossfadeTimeChanged\s*\(/, "double") -event("QMediaGaplessPlaybackControl", /::nextMediaChanged\s*\(/, "QMediaContent") -event("QMediaGaplessPlaybackControl", /::advancedToNextMedia\s*\(/, "") -event("QMediaNetworkAccessControl", /::destroyed\s*\(/, "QObject*") -event("QMediaNetworkAccessControl", /::objectNameChanged\s*\(/, "QString") -event("QMediaNetworkAccessControl", /::configurationChanged\s*\(/, "QNetworkConfiguration") -event("QMediaObject", /::destroyed\s*\(/, "QObject*") -event("QMediaObject", /::objectNameChanged\s*\(/, "QString") -event("QMediaObject", /::notifyIntervalChanged\s*\(/, "int") -event("QMediaObject", /::metaDataAvailableChanged\s*\(/, "bool") -event("QMediaObject", /::metaDataChanged\s*\(/, "QString, QVariant") -event("QMediaObject", /::availabilityChanged\s*\(/, "bool") -event("QMediaObject", /::availabilityChanged\s*\(/, "QMultimedia::AvailabilityStatus") -event("QMediaPlayer", /::destroyed\s*\(/, "QObject*") -event("QMediaPlayer", /::objectNameChanged\s*\(/, "QString") -event("QMediaPlayer", /::notifyIntervalChanged\s*\(/, "int") -event("QMediaPlayer", /::metaDataAvailableChanged\s*\(/, "bool") -event("QMediaPlayer", /::metaDataChanged\s*\(/, "QString, QVariant") -event("QMediaPlayer", /::availabilityChanged\s*\(/, "bool") -event("QMediaPlayer", /::availabilityChanged\s*\(/, "QMultimedia::AvailabilityStatus") -event("QMediaPlayer", /::mediaChanged\s*\(/, "QMediaContent") -event("QMediaPlayer", /::currentMediaChanged\s*\(/, "QMediaContent") -event("QMediaPlayer", /::stateChanged\s*\(/, "QMediaPlayer::State") -event("QMediaPlayer", /::mediaStatusChanged\s*\(/, "QMediaPlayer::MediaStatus") -event("QMediaPlayer", /::durationChanged\s*\(/, "qlonglong") -event("QMediaPlayer", /::positionChanged\s*\(/, "qlonglong") -event("QMediaPlayer", /::volumeChanged\s*\(/, "int") -event("QMediaPlayer", /::mutedChanged\s*\(/, "bool") -event("QMediaPlayer", /::audioAvailableChanged\s*\(/, "bool") -event("QMediaPlayer", /::videoAvailableChanged\s*\(/, "bool") -event("QMediaPlayer", /::bufferStatusChanged\s*\(/, "int") -event("QMediaPlayer", /::seekableChanged\s*\(/, "bool") -event("QMediaPlayer", /::playbackRateChanged\s*\(/, "double") -event("QMediaPlayer", /::error\s*\(/, "QMediaPlayer::Error") -event("QMediaPlayer", /::networkConfigurationChanged\s*\(/, "QNetworkConfiguration") -event("QMediaPlayerControl", /::destroyed\s*\(/, "QObject*") -event("QMediaPlayerControl", /::objectNameChanged\s*\(/, "QString") -event("QMediaPlayerControl", /::mediaChanged\s*\(/, "QMediaContent") -event("QMediaPlayerControl", /::durationChanged\s*\(/, "qlonglong") -event("QMediaPlayerControl", /::positionChanged\s*\(/, "qlonglong") -event("QMediaPlayerControl", /::stateChanged\s*\(/, "QMediaPlayer::State") -event("QMediaPlayerControl", /::mediaStatusChanged\s*\(/, "QMediaPlayer::MediaStatus") -event("QMediaPlayerControl", /::volumeChanged\s*\(/, "int") -event("QMediaPlayerControl", /::mutedChanged\s*\(/, "bool") -event("QMediaPlayerControl", /::audioAvailableChanged\s*\(/, "bool") -event("QMediaPlayerControl", /::videoAvailableChanged\s*\(/, "bool") -event("QMediaPlayerControl", /::bufferStatusChanged\s*\(/, "int") -event("QMediaPlayerControl", /::seekableChanged\s*\(/, "bool") -event("QMediaPlayerControl", /::availablePlaybackRangesChanged\s*\(/, "QMediaTimeRange") -event("QMediaPlayerControl", /::playbackRateChanged\s*\(/, "double") -event("QMediaPlayerControl", /::error\s*\(/, "int, QString") -event("QMediaPlaylist", /::destroyed\s*\(/, "QObject*") -event("QMediaPlaylist", /::objectNameChanged\s*\(/, "QString") -event("QMediaPlaylist", /::currentIndexChanged\s*\(/, "int") -event("QMediaPlaylist", /::playbackModeChanged\s*\(/, "QMediaPlaylist::PlaybackMode") -event("QMediaPlaylist", /::currentMediaChanged\s*\(/, "QMediaContent") -event("QMediaPlaylist", /::mediaAboutToBeInserted\s*\(/, "int, int") -event("QMediaPlaylist", /::mediaInserted\s*\(/, "int, int") -event("QMediaPlaylist", /::mediaAboutToBeRemoved\s*\(/, "int, int") -event("QMediaPlaylist", /::mediaRemoved\s*\(/, "int, int") -event("QMediaPlaylist", /::mediaChanged\s*\(/, "int, int") -event("QMediaPlaylist", /::loaded\s*\(/, "") -event("QMediaPlaylist", /::loadFailed\s*\(/, "") -event("QMediaRecorder", /::destroyed\s*\(/, "QObject*") -event("QMediaRecorder", /::objectNameChanged\s*\(/, "QString") -event("QMediaRecorder", /::stateChanged\s*\(/, "QMediaRecorder::State") -event("QMediaRecorder", /::statusChanged\s*\(/, "QMediaRecorder::Status") -event("QMediaRecorder", /::durationChanged\s*\(/, "qlonglong") -event("QMediaRecorder", /::mutedChanged\s*\(/, "bool") -event("QMediaRecorder", /::volumeChanged\s*\(/, "double") -event("QMediaRecorder", /::actualLocationChanged\s*\(/, "QUrl") -event("QMediaRecorder", /::error\s*\(/, "QMediaRecorder::Error") -event("QMediaRecorder", /::metaDataAvailableChanged\s*\(/, "bool") -event("QMediaRecorder", /::metaDataWritableChanged\s*\(/, "bool") -event("QMediaRecorder", /::metaDataChanged\s*\(/, "QString, QVariant") -event("QMediaRecorder", /::availabilityChanged\s*\(/, "bool") -event("QMediaRecorder", /::availabilityChanged\s*\(/, "QMultimedia::AvailabilityStatus") -event("QMediaRecorderControl", /::destroyed\s*\(/, "QObject*") -event("QMediaRecorderControl", /::objectNameChanged\s*\(/, "QString") -event("QMediaRecorderControl", /::stateChanged\s*\(/, "QMediaRecorder::State") -event("QMediaRecorderControl", /::statusChanged\s*\(/, "QMediaRecorder::Status") -event("QMediaRecorderControl", /::durationChanged\s*\(/, "qlonglong") -event("QMediaRecorderControl", /::mutedChanged\s*\(/, "bool") -event("QMediaRecorderControl", /::volumeChanged\s*\(/, "double") -event("QMediaRecorderControl", /::actualLocationChanged\s*\(/, "QUrl") -event("QMediaRecorderControl", /::error\s*\(/, "int, QString") -event("QMediaService", /::destroyed\s*\(/, "QObject*") -event("QMediaService", /::objectNameChanged\s*\(/, "QString") -event("QMediaServiceProviderPlugin", /::destroyed\s*\(/, "QObject*") -event("QMediaServiceProviderPlugin", /::objectNameChanged\s*\(/, "QString") -event("QMediaStreamsControl", /::destroyed\s*\(/, "QObject*") -event("QMediaStreamsControl", /::objectNameChanged\s*\(/, "QString") -event("QMediaStreamsControl", /::streamsChanged\s*\(/, "") -event("QMediaStreamsControl", /::activeStreamsChanged\s*\(/, "") -event("QMediaVideoProbeControl", /::destroyed\s*\(/, "QObject*") -event("QMediaVideoProbeControl", /::objectNameChanged\s*\(/, "QString") -event("QMediaVideoProbeControl", /::videoFrameProbed\s*\(/, "QVideoFrame") -event("QMediaVideoProbeControl", /::flush\s*\(/, "") event("QMenu", /::destroyed\s*\(/, "QObject*") event("QMenu", /::objectNameChanged\s*\(/, "QString") event("QMenu", /::windowTitleChanged\s*\(/, "QString") @@ -1311,111 +1284,8 @@ event("QMessageBox", /::finished\s*\(/, "int") event("QMessageBox", /::accepted\s*\(/, "") event("QMessageBox", /::rejected\s*\(/, "") event("QMessageBox", /::buttonClicked\s*\(/, "QAbstractButton*") -event("QMetaDataReaderControl", /::destroyed\s*\(/, "QObject*") -event("QMetaDataReaderControl", /::objectNameChanged\s*\(/, "QString") -event("QMetaDataReaderControl", /::metaDataChanged\s*\(/, "QString, QVariant") -event("QMetaDataReaderControl", /::metaDataAvailableChanged\s*\(/, "bool") -event("QMetaDataWriterControl", /::destroyed\s*\(/, "QObject*") -event("QMetaDataWriterControl", /::objectNameChanged\s*\(/, "QString") -event("QMetaDataWriterControl", /::metaDataChanged\s*\(/, "QString, QVariant") -event("QMetaDataWriterControl", /::writableChanged\s*\(/, "bool") -event("QMetaDataWriterControl", /::metaDataAvailableChanged\s*\(/, "bool") -event("QMimeData", /::destroyed\s*\(/, "QObject*") -event("QMimeData", /::objectNameChanged\s*\(/, "QString") -event("QMovie", /::destroyed\s*\(/, "QObject*") -event("QMovie", /::objectNameChanged\s*\(/, "QString") -event("QMovie", /::started\s*\(/, "") -event("QMovie", /::resized\s*\(/, "QSize") -event("QMovie", /::updated\s*\(/, "QRect") -event("QMovie", /::stateChanged\s*\(/, "QMovie::MovieState") -event("QMovie", /::error\s*\(/, "QImageReader::ImageReaderError") -event("QMovie", /::finished\s*\(/, "") -event("QMovie", /::frameChanged\s*\(/, "int") -event("QNetworkAccessManager", /::destroyed\s*\(/, "QObject*") -event("QNetworkAccessManager", /::objectNameChanged\s*\(/, "QString") -event("QNetworkAccessManager", /::proxyAuthenticationRequired\s*\(/, "QNetworkProxy, QAuthenticator*") -event("QNetworkAccessManager", /::authenticationRequired\s*\(/, "QNetworkReply*, QAuthenticator*") -event("QNetworkAccessManager", /::finished\s*\(/, "QNetworkReply*") -event("QNetworkAccessManager", /::encrypted\s*\(/, "QNetworkReply*") -event("QNetworkAccessManager", /::sslErrors\s*\(/, "QNetworkReply*, QList") -event("QNetworkAccessManager", /::preSharedKeyAuthenticationRequired\s*\(/, "QNetworkReply*, QSslPreSharedKeyAuthenticator*") -event("QNetworkAccessManager", /::networkSessionConnected\s*\(/, "") -event("QNetworkAccessManager", /::networkAccessibleChanged\s*\(/, "QNetworkAccessManager::NetworkAccessibility") -event("QNetworkConfigurationManager", /::destroyed\s*\(/, "QObject*") -event("QNetworkConfigurationManager", /::objectNameChanged\s*\(/, "QString") -event("QNetworkConfigurationManager", /::configurationAdded\s*\(/, "QNetworkConfiguration") -event("QNetworkConfigurationManager", /::configurationRemoved\s*\(/, "QNetworkConfiguration") -event("QNetworkConfigurationManager", /::configurationChanged\s*\(/, "QNetworkConfiguration") -event("QNetworkConfigurationManager", /::onlineStateChanged\s*\(/, "bool") -event("QNetworkConfigurationManager", /::updateCompleted\s*\(/, "") -event("QNetworkCookieJar", /::destroyed\s*\(/, "QObject*") -event("QNetworkCookieJar", /::objectNameChanged\s*\(/, "QString") -event("QNetworkDiskCache", /::destroyed\s*\(/, "QObject*") -event("QNetworkDiskCache", /::objectNameChanged\s*\(/, "QString") -event("QNetworkReply", /::destroyed\s*\(/, "QObject*") -event("QNetworkReply", /::objectNameChanged\s*\(/, "QString") -event("QNetworkReply", /::readyRead\s*\(/, "") -event("QNetworkReply", /::bytesWritten\s*\(/, "qlonglong") -event("QNetworkReply", /::aboutToClose\s*\(/, "") -event("QNetworkReply", /::readChannelFinished\s*\(/, "") -event("QNetworkReply", /::metaDataChanged\s*\(/, "") -event("QNetworkReply", /::finished\s*\(/, "") -event("QNetworkReply", /::error\s*\(/, "QNetworkReply::NetworkError") -event("QNetworkReply", /::encrypted\s*\(/, "") -event("QNetworkReply", /::sslErrors\s*\(/, "QList") -event("QNetworkReply", /::preSharedKeyAuthenticationRequired\s*\(/, "QSslPreSharedKeyAuthenticator*") -event("QNetworkReply", /::uploadProgress\s*\(/, "qlonglong, qlonglong") -event("QNetworkReply", /::downloadProgress\s*\(/, "qlonglong, qlonglong") -event("QNetworkSession", /::destroyed\s*\(/, "QObject*") -event("QNetworkSession", /::objectNameChanged\s*\(/, "QString") -event("QNetworkSession", /::stateChanged\s*\(/, "QNetworkSession::State") -event("QNetworkSession", /::opened\s*\(/, "") -event("QNetworkSession", /::closed\s*\(/, "") -event("QNetworkSession", /::error\s*\(/, "QNetworkSession::SessionError") -event("QNetworkSession", /::preferredConfigurationChanged\s*\(/, "QNetworkConfiguration, bool") -event("QNetworkSession", /::newConfigurationActivated\s*\(/, "") -event("QNetworkSession", /::usagePoliciesChanged\s*\(/, "QNetworkSession::UsagePolicies") -event("QOffscreenSurface", /::destroyed\s*\(/, "QObject*") -event("QOffscreenSurface", /::objectNameChanged\s*\(/, "QString") -event("QOffscreenSurface", /::screenChanged\s*\(/, "QScreen*") -event("QPaintDeviceWindow", /::destroyed\s*\(/, "QObject*") -event("QPaintDeviceWindow", /::objectNameChanged\s*\(/, "QString") -event("QPaintDeviceWindow", /::screenChanged\s*\(/, "QScreen*") -event("QPaintDeviceWindow", /::modalityChanged\s*\(/, "Qt::WindowModality") -event("QPaintDeviceWindow", /::windowStateChanged\s*\(/, "Qt::WindowState") -event("QPaintDeviceWindow", /::windowTitleChanged\s*\(/, "QString") -event("QPaintDeviceWindow", /::xChanged\s*\(/, "int") -event("QPaintDeviceWindow", /::yChanged\s*\(/, "int") -event("QPaintDeviceWindow", /::widthChanged\s*\(/, "int") -event("QPaintDeviceWindow", /::heightChanged\s*\(/, "int") -event("QPaintDeviceWindow", /::minimumWidthChanged\s*\(/, "int") -event("QPaintDeviceWindow", /::minimumHeightChanged\s*\(/, "int") -event("QPaintDeviceWindow", /::maximumWidthChanged\s*\(/, "int") -event("QPaintDeviceWindow", /::maximumHeightChanged\s*\(/, "int") -event("QPaintDeviceWindow", /::visibleChanged\s*\(/, "bool") -event("QPaintDeviceWindow", /::visibilityChanged\s*\(/, "QWindow::Visibility") -event("QPaintDeviceWindow", /::activeChanged\s*\(/, "") -event("QPaintDeviceWindow", /::contentOrientationChanged\s*\(/, "Qt::ScreenOrientation") -event("QPaintDeviceWindow", /::focusObjectChanged\s*\(/, "QObject*") -event("QPaintDeviceWindow", /::opacityChanged\s*\(/, "double") event("QPanGesture", /::destroyed\s*\(/, "QObject*") event("QPanGesture", /::objectNameChanged\s*\(/, "QString") -event("QParallelAnimationGroup", /::destroyed\s*\(/, "QObject*") -event("QParallelAnimationGroup", /::objectNameChanged\s*\(/, "QString") -event("QParallelAnimationGroup", /::finished\s*\(/, "") -event("QParallelAnimationGroup", /::stateChanged\s*\(/, "QAbstractAnimation::State, QAbstractAnimation::State") -event("QParallelAnimationGroup", /::currentLoopChanged\s*\(/, "int") -event("QParallelAnimationGroup", /::directionChanged\s*\(/, "QAbstractAnimation::Direction") -event("QPauseAnimation", /::destroyed\s*\(/, "QObject*") -event("QPauseAnimation", /::objectNameChanged\s*\(/, "QString") -event("QPauseAnimation", /::finished\s*\(/, "") -event("QPauseAnimation", /::stateChanged\s*\(/, "QAbstractAnimation::State, QAbstractAnimation::State") -event("QPauseAnimation", /::currentLoopChanged\s*\(/, "int") -event("QPauseAnimation", /::directionChanged\s*\(/, "QAbstractAnimation::Direction") -event("QPdfWriter", /::destroyed\s*\(/, "QObject*") -event("QPdfWriter", /::objectNameChanged\s*\(/, "QString") -event("QPictureFormatPlugin", /::destroyed\s*\(/, "QObject*") -event("QPictureFormatPlugin", /::objectNameChanged\s*\(/, "QString") event("QPinchGesture", /::destroyed\s*\(/, "QObject*") event("QPinchGesture", /::objectNameChanged\s*\(/, "QString") event("QPlainTextDocumentLayout", /::destroyed\s*\(/, "QObject*") @@ -1439,47 +1309,6 @@ event("QPlainTextEdit", /::cursorPositionChanged\s*\(/, "") event("QPlainTextEdit", /::updateRequest\s*\(/, "QRect, int") event("QPlainTextEdit", /::blockCountChanged\s*\(/, "int") event("QPlainTextEdit", /::modificationChanged\s*\(/, "bool") -event("QPluginLoader", /::destroyed\s*\(/, "QObject*") -event("QPluginLoader", /::objectNameChanged\s*\(/, "QString") -event("QPrintDialog", /::destroyed\s*\(/, "QObject*") -event("QPrintDialog", /::objectNameChanged\s*\(/, "QString") -event("QPrintDialog", /::windowTitleChanged\s*\(/, "QString") -event("QPrintDialog", /::windowIconChanged\s*\(/, "QIcon") -event("QPrintDialog", /::windowIconTextChanged\s*\(/, "QString") -event("QPrintDialog", /::customContextMenuRequested\s*\(/, "QPoint") -event("QPrintDialog", /::finished\s*\(/, "int") -event("QPrintDialog", /::accepted\s*\(/, "QPrinter*") -event("QPrintDialog", /::rejected\s*\(/, "") -event("QPrintPreviewDialog", /::destroyed\s*\(/, "QObject*") -event("QPrintPreviewDialog", /::objectNameChanged\s*\(/, "QString") -event("QPrintPreviewDialog", /::windowTitleChanged\s*\(/, "QString") -event("QPrintPreviewDialog", /::windowIconChanged\s*\(/, "QIcon") -event("QPrintPreviewDialog", /::windowIconTextChanged\s*\(/, "QString") -event("QPrintPreviewDialog", /::customContextMenuRequested\s*\(/, "QPoint") -event("QPrintPreviewDialog", /::finished\s*\(/, "int") -event("QPrintPreviewDialog", /::accepted\s*\(/, "") -event("QPrintPreviewDialog", /::rejected\s*\(/, "") -event("QPrintPreviewDialog", /::paintRequested\s*\(/, "QPrinter*") -event("QPrintPreviewWidget", /::destroyed\s*\(/, "QObject*") -event("QPrintPreviewWidget", /::objectNameChanged\s*\(/, "QString") -event("QPrintPreviewWidget", /::windowTitleChanged\s*\(/, "QString") -event("QPrintPreviewWidget", /::windowIconChanged\s*\(/, "QIcon") -event("QPrintPreviewWidget", /::windowIconTextChanged\s*\(/, "QString") -event("QPrintPreviewWidget", /::customContextMenuRequested\s*\(/, "QPoint") -event("QPrintPreviewWidget", /::paintRequested\s*\(/, "QPrinter*") -event("QPrintPreviewWidget", /::previewChanged\s*\(/, "") -event("QProcess", /::destroyed\s*\(/, "QObject*") -event("QProcess", /::objectNameChanged\s*\(/, "QString") -event("QProcess", /::readyRead\s*\(/, "") -event("QProcess", /::bytesWritten\s*\(/, "qlonglong") -event("QProcess", /::aboutToClose\s*\(/, "") -event("QProcess", /::readChannelFinished\s*\(/, "") -event("QProcess", /::started\s*\(/, "") -event("QProcess", /::finished\s*\(/, "int, QProcess::ExitStatus") -event("QProcess", /::error\s*\(/, "QProcess::ProcessError") -event("QProcess", /::stateChanged\s*\(/, "QProcess::ProcessState") -event("QProcess", /::readyReadStandardOutput\s*\(/, "") -event("QProcess", /::readyReadStandardError\s*\(/, "") event("QProgressBar", /::destroyed\s*\(/, "QObject*") event("QProgressBar", /::objectNameChanged\s*\(/, "QString") event("QProgressBar", /::windowTitleChanged\s*\(/, "QString") @@ -1497,13 +1326,6 @@ event("QProgressDialog", /::finished\s*\(/, "int") event("QProgressDialog", /::accepted\s*\(/, "") event("QProgressDialog", /::rejected\s*\(/, "") event("QProgressDialog", /::canceled\s*\(/, "") -event("QPropertyAnimation", /::destroyed\s*\(/, "QObject*") -event("QPropertyAnimation", /::objectNameChanged\s*\(/, "QString") -event("QPropertyAnimation", /::finished\s*\(/, "") -event("QPropertyAnimation", /::stateChanged\s*\(/, "QAbstractAnimation::State, QAbstractAnimation::State") -event("QPropertyAnimation", /::currentLoopChanged\s*\(/, "int") -event("QPropertyAnimation", /::directionChanged\s*\(/, "QAbstractAnimation::Direction") -event("QPropertyAnimation", /::valueChanged\s*\(/, "QVariant") event("QPushButton", /::destroyed\s*\(/, "QObject*") event("QPushButton", /::objectNameChanged\s*\(/, "QString") event("QPushButton", /::windowTitleChanged\s*\(/, "QString") @@ -1524,106 +1346,12 @@ event("QRadioButton", /::pressed\s*\(/, "") event("QRadioButton", /::released\s*\(/, "") event("QRadioButton", /::clicked\s*\(/, "bool") event("QRadioButton", /::toggled\s*\(/, "bool") -event("QRadioData", /::destroyed\s*\(/, "QObject*") -event("QRadioData", /::objectNameChanged\s*\(/, "QString") -event("QRadioData", /::stationIdChanged\s*\(/, "QString") -event("QRadioData", /::programTypeChanged\s*\(/, "QRadioData::ProgramType") -event("QRadioData", /::programTypeNameChanged\s*\(/, "QString") -event("QRadioData", /::stationNameChanged\s*\(/, "QString") -event("QRadioData", /::radioTextChanged\s*\(/, "QString") -event("QRadioData", /::alternativeFrequenciesEnabledChanged\s*\(/, "bool") -event("QRadioData", /::error\s*\(/, "QRadioData::Error") -event("QRadioDataControl", /::destroyed\s*\(/, "QObject*") -event("QRadioDataControl", /::objectNameChanged\s*\(/, "QString") -event("QRadioDataControl", /::stationIdChanged\s*\(/, "QString") -event("QRadioDataControl", /::programTypeChanged\s*\(/, "QRadioData::ProgramType") -event("QRadioDataControl", /::programTypeNameChanged\s*\(/, "QString") -event("QRadioDataControl", /::stationNameChanged\s*\(/, "QString") -event("QRadioDataControl", /::radioTextChanged\s*\(/, "QString") -event("QRadioDataControl", /::alternativeFrequenciesEnabledChanged\s*\(/, "bool") -event("QRadioDataControl", /::error\s*\(/, "QRadioData::Error") -event("QRadioTuner", /::destroyed\s*\(/, "QObject*") -event("QRadioTuner", /::objectNameChanged\s*\(/, "QString") -event("QRadioTuner", /::notifyIntervalChanged\s*\(/, "int") -event("QRadioTuner", /::metaDataAvailableChanged\s*\(/, "bool") -event("QRadioTuner", /::metaDataChanged\s*\(/, "QString, QVariant") -event("QRadioTuner", /::availabilityChanged\s*\(/, "bool") -event("QRadioTuner", /::availabilityChanged\s*\(/, "QMultimedia::AvailabilityStatus") -event("QRadioTuner", /::stateChanged\s*\(/, "QRadioTuner::State") -event("QRadioTuner", /::bandChanged\s*\(/, "QRadioTuner::Band") -event("QRadioTuner", /::frequencyChanged\s*\(/, "int") -event("QRadioTuner", /::stereoStatusChanged\s*\(/, "bool") -event("QRadioTuner", /::searchingChanged\s*\(/, "bool") -event("QRadioTuner", /::signalStrengthChanged\s*\(/, "int") -event("QRadioTuner", /::volumeChanged\s*\(/, "int") -event("QRadioTuner", /::mutedChanged\s*\(/, "bool") -event("QRadioTuner", /::stationFound\s*\(/, "int, QString") -event("QRadioTuner", /::antennaConnectedChanged\s*\(/, "bool") -event("QRadioTuner", /::error\s*\(/, "QRadioTuner::Error") -event("QRadioTunerControl", /::destroyed\s*\(/, "QObject*") -event("QRadioTunerControl", /::objectNameChanged\s*\(/, "QString") -event("QRadioTunerControl", /::stateChanged\s*\(/, "QRadioTuner::State") -event("QRadioTunerControl", /::bandChanged\s*\(/, "QRadioTuner::Band") -event("QRadioTunerControl", /::frequencyChanged\s*\(/, "int") -event("QRadioTunerControl", /::stereoStatusChanged\s*\(/, "bool") -event("QRadioTunerControl", /::searchingChanged\s*\(/, "bool") -event("QRadioTunerControl", /::signalStrengthChanged\s*\(/, "int") -event("QRadioTunerControl", /::volumeChanged\s*\(/, "int") -event("QRadioTunerControl", /::mutedChanged\s*\(/, "bool") -event("QRadioTunerControl", /::error\s*\(/, "QRadioTuner::Error") -event("QRadioTunerControl", /::stationFound\s*\(/, "int, QString") -event("QRadioTunerControl", /::antennaConnectedChanged\s*\(/, "bool") -event("QRasterWindow", /::destroyed\s*\(/, "QObject*") -event("QRasterWindow", /::objectNameChanged\s*\(/, "QString") -event("QRasterWindow", /::screenChanged\s*\(/, "QScreen*") -event("QRasterWindow", /::modalityChanged\s*\(/, "Qt::WindowModality") -event("QRasterWindow", /::windowStateChanged\s*\(/, "Qt::WindowState") -event("QRasterWindow", /::windowTitleChanged\s*\(/, "QString") -event("QRasterWindow", /::xChanged\s*\(/, "int") -event("QRasterWindow", /::yChanged\s*\(/, "int") -event("QRasterWindow", /::widthChanged\s*\(/, "int") -event("QRasterWindow", /::heightChanged\s*\(/, "int") -event("QRasterWindow", /::minimumWidthChanged\s*\(/, "int") -event("QRasterWindow", /::minimumHeightChanged\s*\(/, "int") -event("QRasterWindow", /::maximumWidthChanged\s*\(/, "int") -event("QRasterWindow", /::maximumHeightChanged\s*\(/, "int") -event("QRasterWindow", /::visibleChanged\s*\(/, "bool") -event("QRasterWindow", /::visibilityChanged\s*\(/, "QWindow::Visibility") -event("QRasterWindow", /::activeChanged\s*\(/, "") -event("QRasterWindow", /::contentOrientationChanged\s*\(/, "Qt::ScreenOrientation") -event("QRasterWindow", /::focusObjectChanged\s*\(/, "QObject*") -event("QRasterWindow", /::opacityChanged\s*\(/, "double") -event("QRegExpValidator", /::destroyed\s*\(/, "QObject*") -event("QRegExpValidator", /::objectNameChanged\s*\(/, "QString") -event("QRegExpValidator", /::changed\s*\(/, "") -event("QRegExpValidator", /::regExpChanged\s*\(/, "QRegExp") -event("QRegularExpressionValidator", /::destroyed\s*\(/, "QObject*") -event("QRegularExpressionValidator", /::objectNameChanged\s*\(/, "QString") -event("QRegularExpressionValidator", /::changed\s*\(/, "") -event("QRegularExpressionValidator", /::regularExpressionChanged\s*\(/, "QRegularExpression") event("QRubberBand", /::destroyed\s*\(/, "QObject*") event("QRubberBand", /::objectNameChanged\s*\(/, "QString") event("QRubberBand", /::windowTitleChanged\s*\(/, "QString") event("QRubberBand", /::windowIconChanged\s*\(/, "QIcon") event("QRubberBand", /::windowIconTextChanged\s*\(/, "QString") event("QRubberBand", /::customContextMenuRequested\s*\(/, "QPoint") -event("QSaveFile", /::destroyed\s*\(/, "QObject*") -event("QSaveFile", /::objectNameChanged\s*\(/, "QString") -event("QSaveFile", /::readyRead\s*\(/, "") -event("QSaveFile", /::bytesWritten\s*\(/, "qlonglong") -event("QSaveFile", /::aboutToClose\s*\(/, "") -event("QSaveFile", /::readChannelFinished\s*\(/, "") -event("QScreen", /::destroyed\s*\(/, "QObject*") -event("QScreen", /::objectNameChanged\s*\(/, "QString") -event("QScreen", /::geometryChanged\s*\(/, "QRect") -event("QScreen", /::availableGeometryChanged\s*\(/, "QRect") -event("QScreen", /::physicalSizeChanged\s*\(/, "QSizeF") -event("QScreen", /::physicalDotsPerInchChanged\s*\(/, "double") -event("QScreen", /::logicalDotsPerInchChanged\s*\(/, "double") -event("QScreen", /::virtualGeometryChanged\s*\(/, "QRect") -event("QScreen", /::primaryOrientationChanged\s*\(/, "Qt::ScreenOrientation") -event("QScreen", /::orientationChanged\s*\(/, "Qt::ScreenOrientation") -event("QScreen", /::refreshRateChanged\s*\(/, "double") event("QScrollArea", /::destroyed\s*\(/, "QObject*") event("QScrollArea", /::objectNameChanged\s*\(/, "QString") event("QScrollArea", /::windowTitleChanged\s*\(/, "QString") @@ -1646,39 +1374,10 @@ event("QScroller", /::destroyed\s*\(/, "QObject*") event("QScroller", /::objectNameChanged\s*\(/, "QString") event("QScroller", /::stateChanged\s*\(/, "QScroller::State") event("QScroller", /::scrollerPropertiesChanged\s*\(/, "QScrollerProperties") -event("QSequentialAnimationGroup", /::destroyed\s*\(/, "QObject*") -event("QSequentialAnimationGroup", /::objectNameChanged\s*\(/, "QString") -event("QSequentialAnimationGroup", /::finished\s*\(/, "") -event("QSequentialAnimationGroup", /::stateChanged\s*\(/, "QAbstractAnimation::State, QAbstractAnimation::State") -event("QSequentialAnimationGroup", /::currentLoopChanged\s*\(/, "int") -event("QSequentialAnimationGroup", /::directionChanged\s*\(/, "QAbstractAnimation::Direction") -event("QSequentialAnimationGroup", /::currentAnimationChanged\s*\(/, "QAbstractAnimation*") -event("QSessionManager", /::destroyed\s*\(/, "QObject*") -event("QSessionManager", /::objectNameChanged\s*\(/, "QString") -event("QSettings", /::destroyed\s*\(/, "QObject*") -event("QSettings", /::objectNameChanged\s*\(/, "QString") -event("QSharedMemory", /::destroyed\s*\(/, "QObject*") -event("QSharedMemory", /::objectNameChanged\s*\(/, "QString") event("QShortcut", /::destroyed\s*\(/, "QObject*") event("QShortcut", /::objectNameChanged\s*\(/, "QString") event("QShortcut", /::activated\s*\(/, "") event("QShortcut", /::activatedAmbiguously\s*\(/, "") -event("QSignalMapper", /::destroyed\s*\(/, "QObject*") -event("QSignalMapper", /::objectNameChanged\s*\(/, "QString") -event("QSignalMapper", /::mapped\s*\(.*int/, "int") -event("QSignalMapper", /::mapped\s*\(.*QString/, "QString") -rename("QSignalMapper", /::mapped\s*\(.*QString/, "mapped_qs") -event("QSignalMapper", /::mapped\s*\(.*QWidget/, "QWidget*") -rename("QSignalMapper", /::mapped\s*\(.*QWidget/, "mapped_qw") -event("QSignalMapper", /::mapped\s*\(.*QObject/, "QObject*") -rename("QSignalMapper", /::mapped\s*\(.*QObject/, "mapped_qo") -event("QSignalTransition", /::destroyed\s*\(/, "QObject*") -event("QSignalTransition", /::objectNameChanged\s*\(/, "QString") -event("QSignalTransition", /::triggered\s*\(/, "") -event("QSignalTransition", /::targetStateChanged\s*\(/, "") -event("QSignalTransition", /::targetStatesChanged\s*\(/, "") -event("QSignalTransition", /::senderObjectChanged\s*\(/, "") -event("QSignalTransition", /::signalChanged\s*\(/, "") event("QSizeGrip", /::destroyed\s*\(/, "QObject*") event("QSizeGrip", /::objectNameChanged\s*\(/, "QString") event("QSizeGrip", /::windowTitleChanged\s*\(/, "QString") @@ -1697,43 +1396,6 @@ event("QSlider", /::sliderMoved\s*\(/, "int") event("QSlider", /::sliderReleased\s*\(/, "") event("QSlider", /::rangeChanged\s*\(/, "int, int") event("QSlider", /::actionTriggered\s*\(/, "int") -event("QSocketNotifier", /::destroyed\s*\(/, "QObject*") -event("QSocketNotifier", /::objectNameChanged\s*\(/, "QString") -event("QSocketNotifier", /::activated\s*\(/, "int") -event("QSortFilterProxyModel", /::destroyed\s*\(/, "QObject*") -event("QSortFilterProxyModel", /::objectNameChanged\s*\(/, "QString") -event("QSortFilterProxyModel", /::dataChanged\s*\(/, "QModelIndex, QModelIndex, QVector") -event("QSortFilterProxyModel", /::headerDataChanged\s*\(/, "Qt::Orientation, int, int") -event("QSortFilterProxyModel", /::layoutChanged\s*\(/, "QList, QAbstractItemModel::LayoutChangeHint") -event("QSortFilterProxyModel", /::layoutAboutToBeChanged\s*\(/, "QList, QAbstractItemModel::LayoutChangeHint") -event("QSortFilterProxyModel", /::rowsAboutToBeInserted\s*\(/, "QModelIndex, int, int") -event("QSortFilterProxyModel", /::rowsInserted\s*\(/, "QModelIndex, int, int") -event("QSortFilterProxyModel", /::rowsAboutToBeRemoved\s*\(/, "QModelIndex, int, int") -event("QSortFilterProxyModel", /::rowsRemoved\s*\(/, "QModelIndex, int, int") -event("QSortFilterProxyModel", /::columnsAboutToBeInserted\s*\(/, "QModelIndex, int, int") -event("QSortFilterProxyModel", /::columnsInserted\s*\(/, "QModelIndex, int, int") -event("QSortFilterProxyModel", /::columnsAboutToBeRemoved\s*\(/, "QModelIndex, int, int") -event("QSortFilterProxyModel", /::columnsRemoved\s*\(/, "QModelIndex, int, int") -event("QSortFilterProxyModel", /::modelAboutToBeReset\s*\(/, "") -event("QSortFilterProxyModel", /::modelReset\s*\(/, "") -event("QSortFilterProxyModel", /::rowsAboutToBeMoved\s*\(/, "QModelIndex, int, int, QModelIndex, int") -event("QSortFilterProxyModel", /::rowsMoved\s*\(/, "QModelIndex, int, int, QModelIndex, int") -event("QSortFilterProxyModel", /::columnsAboutToBeMoved\s*\(/, "QModelIndex, int, int, QModelIndex, int") -event("QSortFilterProxyModel", /::columnsMoved\s*\(/, "QModelIndex, int, int, QModelIndex, int") -event("QSortFilterProxyModel", /::sourceModelChanged\s*\(/, "") -event("QSound", /::destroyed\s*\(/, "QObject*") -event("QSound", /::objectNameChanged\s*\(/, "QString") -event("QSoundEffect", /::destroyed\s*\(/, "QObject*") -event("QSoundEffect", /::objectNameChanged\s*\(/, "QString") -event("QSoundEffect", /::sourceChanged\s*\(/, "") -event("QSoundEffect", /::loopCountChanged\s*\(/, "") -event("QSoundEffect", /::loopsRemainingChanged\s*\(/, "") -event("QSoundEffect", /::volumeChanged\s*\(/, "") -event("QSoundEffect", /::mutedChanged\s*\(/, "") -event("QSoundEffect", /::loadedChanged\s*\(/, "") -event("QSoundEffect", /::playingChanged\s*\(/, "") -event("QSoundEffect", /::statusChanged\s*\(/, "") -event("QSoundEffect", /::categoryChanged\s*\(/, "") event("QSpinBox", /::destroyed\s*\(/, "QObject*") event("QSpinBox", /::objectNameChanged\s*\(/, "QString") event("QSpinBox", /::windowTitleChanged\s*\(/, "QString") @@ -1764,6 +1426,289 @@ event("QSplitterHandle", /::windowTitleChanged\s*\(/, "QString") event("QSplitterHandle", /::windowIconChanged\s*\(/, "QIcon") event("QSplitterHandle", /::windowIconTextChanged\s*\(/, "QString") event("QSplitterHandle", /::customContextMenuRequested\s*\(/, "QPoint") +event("QStackedLayout", /::destroyed\s*\(/, "QObject*") +event("QStackedLayout", /::objectNameChanged\s*\(/, "QString") +event("QStackedLayout", /::widgetRemoved\s*\(/, "int") +event("QStackedLayout", /::currentChanged\s*\(/, "int") +event("QStackedWidget", /::destroyed\s*\(/, "QObject*") +event("QStackedWidget", /::objectNameChanged\s*\(/, "QString") +event("QStackedWidget", /::windowTitleChanged\s*\(/, "QString") +event("QStackedWidget", /::windowIconChanged\s*\(/, "QIcon") +event("QStackedWidget", /::windowIconTextChanged\s*\(/, "QString") +event("QStackedWidget", /::customContextMenuRequested\s*\(/, "QPoint") +event("QStackedWidget", /::currentChanged\s*\(/, "int") +event("QStackedWidget", /::widgetRemoved\s*\(/, "int") +event("QStatusBar", /::destroyed\s*\(/, "QObject*") +event("QStatusBar", /::objectNameChanged\s*\(/, "QString") +event("QStatusBar", /::windowTitleChanged\s*\(/, "QString") +event("QStatusBar", /::windowIconChanged\s*\(/, "QIcon") +event("QStatusBar", /::windowIconTextChanged\s*\(/, "QString") +event("QStatusBar", /::customContextMenuRequested\s*\(/, "QPoint") +event("QStatusBar", /::messageChanged\s*\(/, "QString") +event("QStyle", /::destroyed\s*\(/, "QObject*") +event("QStyle", /::objectNameChanged\s*\(/, "QString") +event("QStylePlugin", /::destroyed\s*\(/, "QObject*") +event("QStylePlugin", /::objectNameChanged\s*\(/, "QString") +event("QStyledItemDelegate", /::destroyed\s*\(/, "QObject*") +event("QStyledItemDelegate", /::objectNameChanged\s*\(/, "QString") +event("QStyledItemDelegate", /::commitData\s*\(/, "QWidget*") +event("QStyledItemDelegate", /::closeEditor\s*\(/, "QWidget*, QAbstractItemDelegate::EndEditHint") +event("QStyledItemDelegate", /::sizeHintChanged\s*\(/, "QModelIndex") +event("QSwipeGesture", /::destroyed\s*\(/, "QObject*") +event("QSwipeGesture", /::objectNameChanged\s*\(/, "QString") +event("QSystemTrayIcon", /::destroyed\s*\(/, "QObject*") +event("QSystemTrayIcon", /::objectNameChanged\s*\(/, "QString") +event("QSystemTrayIcon", /::activated\s*\(/, "QSystemTrayIcon::ActivationReason") +event("QSystemTrayIcon", /::messageClicked\s*\(/, "") +event("QTabBar", /::destroyed\s*\(/, "QObject*") +event("QTabBar", /::objectNameChanged\s*\(/, "QString") +event("QTabBar", /::windowTitleChanged\s*\(/, "QString") +event("QTabBar", /::windowIconChanged\s*\(/, "QIcon") +event("QTabBar", /::windowIconTextChanged\s*\(/, "QString") +event("QTabBar", /::customContextMenuRequested\s*\(/, "QPoint") +event("QTabBar", /::currentChanged\s*\(/, "int") +event("QTabBar", /::tabCloseRequested\s*\(/, "int") +event("QTabBar", /::tabMoved\s*\(/, "int, int") +event("QTabBar", /::tabBarClicked\s*\(/, "int") +event("QTabBar", /::tabBarDoubleClicked\s*\(/, "int") +event("QTabWidget", /::destroyed\s*\(/, "QObject*") +event("QTabWidget", /::objectNameChanged\s*\(/, "QString") +event("QTabWidget", /::windowTitleChanged\s*\(/, "QString") +event("QTabWidget", /::windowIconChanged\s*\(/, "QIcon") +event("QTabWidget", /::windowIconTextChanged\s*\(/, "QString") +event("QTabWidget", /::customContextMenuRequested\s*\(/, "QPoint") +event("QTabWidget", /::currentChanged\s*\(.*int/, "int") +event("QTabWidget", /::tabCloseRequested\s*\(/, "int") +event("QTabWidget", /::tabBarClicked\s*\(/, "int") +event("QTabWidget", /::tabBarDoubleClicked\s*\(/, "int") +event("QTableView", /::destroyed\s*\(/, "QObject*") +event("QTableView", /::objectNameChanged\s*\(/, "QString") +event("QTableView", /::windowTitleChanged\s*\(/, "QString") +event("QTableView", /::windowIconChanged\s*\(/, "QIcon") +event("QTableView", /::windowIconTextChanged\s*\(/, "QString") +event("QTableView", /::customContextMenuRequested\s*\(/, "QPoint") +event("QTableView", /::pressed\s*\(/, "QModelIndex") +event("QTableView", /::clicked\s*\(/, "QModelIndex") +event("QTableView", /::doubleClicked\s*\(/, "QModelIndex") +event("QTableView", /::activated\s*\(/, "QModelIndex") +event("QTableView", /::entered\s*\(/, "QModelIndex") +event("QTableView", /::viewportEntered\s*\(/, "") +event("QTableView", /::iconSizeChanged\s*\(/, "QSize") +event("QTableWidget", /::destroyed\s*\(/, "QObject*") +event("QTableWidget", /::objectNameChanged\s*\(/, "QString") +event("QTableWidget", /::windowTitleChanged\s*\(/, "QString") +event("QTableWidget", /::windowIconChanged\s*\(/, "QIcon") +event("QTableWidget", /::windowIconTextChanged\s*\(/, "QString") +event("QTableWidget", /::customContextMenuRequested\s*\(/, "QPoint") +event("QTableWidget", /::pressed\s*\(/, "QModelIndex") +event("QTableWidget", /::clicked\s*\(/, "QModelIndex") +event("QTableWidget", /::doubleClicked\s*\(/, "QModelIndex") +event("QTableWidget", /::activated\s*\(/, "QModelIndex") +event("QTableWidget", /::entered\s*\(/, "QModelIndex") +event("QTableWidget", /::viewportEntered\s*\(/, "") +event("QTableWidget", /::iconSizeChanged\s*\(/, "QSize") +event("QTableWidget", /::itemPressed\s*\(/, "QTableWidgetItem*") +event("QTableWidget", /::itemClicked\s*\(/, "QTableWidgetItem*") +event("QTableWidget", /::itemDoubleClicked\s*\(/, "QTableWidgetItem*") +event("QTableWidget", /::itemActivated\s*\(/, "QTableWidgetItem*") +event("QTableWidget", /::itemEntered\s*\(/, "QTableWidgetItem*") +event("QTableWidget", /::itemChanged\s*\(/, "QTableWidgetItem*") +event("QTableWidget", /::currentItemChanged\s*\(/, "QTableWidgetItem*, QTableWidgetItem*") +event("QTableWidget", /::itemSelectionChanged\s*\(/, "") +event("QTableWidget", /::cellPressed\s*\(/, "int, int") +event("QTableWidget", /::cellClicked\s*\(/, "int, int") +event("QTableWidget", /::cellDoubleClicked\s*\(/, "int, int") +event("QTableWidget", /::cellActivated\s*\(/, "int, int") +event("QTableWidget", /::cellEntered\s*\(/, "int, int") +event("QTableWidget", /::cellChanged\s*\(/, "int, int") +event("QTableWidget", /::currentCellChanged\s*\(/, "int, int, int, int") +event("QTapAndHoldGesture", /::destroyed\s*\(/, "QObject*") +event("QTapAndHoldGesture", /::objectNameChanged\s*\(/, "QString") +event("QTapGesture", /::destroyed\s*\(/, "QObject*") +event("QTapGesture", /::objectNameChanged\s*\(/, "QString") +event("QTextBrowser", /::destroyed\s*\(/, "QObject*") +event("QTextBrowser", /::objectNameChanged\s*\(/, "QString") +event("QTextBrowser", /::windowTitleChanged\s*\(/, "QString") +event("QTextBrowser", /::windowIconChanged\s*\(/, "QIcon") +event("QTextBrowser", /::windowIconTextChanged\s*\(/, "QString") +event("QTextBrowser", /::customContextMenuRequested\s*\(/, "QPoint") +event("QTextBrowser", /::textChanged\s*\(/, "") +event("QTextBrowser", /::undoAvailable\s*\(/, "bool") +event("QTextBrowser", /::redoAvailable\s*\(/, "bool") +event("QTextBrowser", /::currentCharFormatChanged\s*\(/, "QTextCharFormat") +event("QTextBrowser", /::copyAvailable\s*\(/, "bool") +event("QTextBrowser", /::selectionChanged\s*\(/, "") +event("QTextBrowser", /::cursorPositionChanged\s*\(/, "") +event("QTextBrowser", /::backwardAvailable\s*\(/, "bool") +event("QTextBrowser", /::forwardAvailable\s*\(/, "bool") +event("QTextBrowser", /::historyChanged\s*\(/, "") +event("QTextBrowser", /::sourceChanged\s*\(/, "QUrl") +event("QTextBrowser", /::highlighted\s*\(.*QUrl/, "QUrl") +event("QTextBrowser", /::highlighted\s*\(.*QString/, "QString") +rename("QTextBrowser", /::highlighted\s*\(.*QString/, "highlighted_qs") +event("QTextBrowser", /::anchorClicked\s*\(/, "QUrl") +event("QTextEdit", /::destroyed\s*\(/, "QObject*") +event("QTextEdit", /::objectNameChanged\s*\(/, "QString") +event("QTextEdit", /::windowTitleChanged\s*\(/, "QString") +event("QTextEdit", /::windowIconChanged\s*\(/, "QIcon") +event("QTextEdit", /::windowIconTextChanged\s*\(/, "QString") +event("QTextEdit", /::customContextMenuRequested\s*\(/, "QPoint") +event("QTextEdit", /::textChanged\s*\(/, "") +event("QTextEdit", /::undoAvailable\s*\(/, "bool") +event("QTextEdit", /::redoAvailable\s*\(/, "bool") +event("QTextEdit", /::currentCharFormatChanged\s*\(/, "QTextCharFormat") +event("QTextEdit", /::copyAvailable\s*\(/, "bool") +event("QTextEdit", /::selectionChanged\s*\(/, "") +event("QTextEdit", /::cursorPositionChanged\s*\(/, "") +event("QTimeEdit", /::destroyed\s*\(/, "QObject*") +event("QTimeEdit", /::objectNameChanged\s*\(/, "QString") +event("QTimeEdit", /::windowTitleChanged\s*\(/, "QString") +event("QTimeEdit", /::windowIconChanged\s*\(/, "QIcon") +event("QTimeEdit", /::windowIconTextChanged\s*\(/, "QString") +event("QTimeEdit", /::customContextMenuRequested\s*\(/, "QPoint") +event("QTimeEdit", /::editingFinished\s*\(/, "") +event("QTimeEdit", /::dateTimeChanged\s*\(/, "QDateTime") +event("QTimeEdit", /::timeChanged\s*\(/, "QTime") +event("QTimeEdit", /::dateChanged\s*\(/, "QDate") +event("QTimeEdit", /::userTimeChanged\s*\(/, "QTime") +event("QToolBar", /::destroyed\s*\(/, "QObject*") +event("QToolBar", /::objectNameChanged\s*\(/, "QString") +event("QToolBar", /::windowTitleChanged\s*\(/, "QString") +event("QToolBar", /::windowIconChanged\s*\(/, "QIcon") +event("QToolBar", /::windowIconTextChanged\s*\(/, "QString") +event("QToolBar", /::customContextMenuRequested\s*\(/, "QPoint") +event("QToolBar", /::actionTriggered\s*\(/, "QAction*") +event("QToolBar", /::movableChanged\s*\(/, "bool") +event("QToolBar", /::allowedAreasChanged\s*\(/, "Qt::ToolBarAreas") +event("QToolBar", /::orientationChanged\s*\(/, "Qt::Orientation") +event("QToolBar", /::iconSizeChanged\s*\(/, "QSize") +event("QToolBar", /::toolButtonStyleChanged\s*\(/, "Qt::ToolButtonStyle") +event("QToolBar", /::topLevelChanged\s*\(/, "bool") +event("QToolBar", /::visibilityChanged\s*\(/, "bool") +event("QToolBox", /::destroyed\s*\(/, "QObject*") +event("QToolBox", /::objectNameChanged\s*\(/, "QString") +event("QToolBox", /::windowTitleChanged\s*\(/, "QString") +event("QToolBox", /::windowIconChanged\s*\(/, "QIcon") +event("QToolBox", /::windowIconTextChanged\s*\(/, "QString") +event("QToolBox", /::customContextMenuRequested\s*\(/, "QPoint") +event("QToolBox", /::currentChanged\s*\(/, "int") +event("QToolButton", /::destroyed\s*\(/, "QObject*") +event("QToolButton", /::objectNameChanged\s*\(/, "QString") +event("QToolButton", /::windowTitleChanged\s*\(/, "QString") +event("QToolButton", /::windowIconChanged\s*\(/, "QIcon") +event("QToolButton", /::windowIconTextChanged\s*\(/, "QString") +event("QToolButton", /::customContextMenuRequested\s*\(/, "QPoint") +event("QToolButton", /::pressed\s*\(/, "") +event("QToolButton", /::released\s*\(/, "") +event("QToolButton", /::clicked\s*\(/, "bool") +event("QToolButton", /::toggled\s*\(/, "bool") +event("QToolButton", /::triggered\s*\(/, "QAction*") +event("QTreeView", /::destroyed\s*\(/, "QObject*") +event("QTreeView", /::objectNameChanged\s*\(/, "QString") +event("QTreeView", /::windowTitleChanged\s*\(/, "QString") +event("QTreeView", /::windowIconChanged\s*\(/, "QIcon") +event("QTreeView", /::windowIconTextChanged\s*\(/, "QString") +event("QTreeView", /::customContextMenuRequested\s*\(/, "QPoint") +event("QTreeView", /::pressed\s*\(/, "QModelIndex") +event("QTreeView", /::clicked\s*\(/, "QModelIndex") +event("QTreeView", /::doubleClicked\s*\(/, "QModelIndex") +event("QTreeView", /::activated\s*\(/, "QModelIndex") +event("QTreeView", /::entered\s*\(/, "QModelIndex") +event("QTreeView", /::viewportEntered\s*\(/, "") +event("QTreeView", /::iconSizeChanged\s*\(/, "QSize") +event("QTreeView", /::expanded\s*\(/, "QModelIndex") +event("QTreeView", /::collapsed\s*\(/, "QModelIndex") +event("QTreeWidget", /::destroyed\s*\(/, "QObject*") +event("QTreeWidget", /::objectNameChanged\s*\(/, "QString") +event("QTreeWidget", /::windowTitleChanged\s*\(/, "QString") +event("QTreeWidget", /::windowIconChanged\s*\(/, "QIcon") +event("QTreeWidget", /::windowIconTextChanged\s*\(/, "QString") +event("QTreeWidget", /::customContextMenuRequested\s*\(/, "QPoint") +event("QTreeWidget", /::pressed\s*\(/, "QModelIndex") +event("QTreeWidget", /::clicked\s*\(/, "QModelIndex") +event("QTreeWidget", /::doubleClicked\s*\(/, "QModelIndex") +event("QTreeWidget", /::activated\s*\(/, "QModelIndex") +event("QTreeWidget", /::entered\s*\(/, "QModelIndex") +event("QTreeWidget", /::viewportEntered\s*\(/, "") +event("QTreeWidget", /::iconSizeChanged\s*\(/, "QSize") +event("QTreeWidget", /::expanded\s*\(/, "QModelIndex") +event("QTreeWidget", /::collapsed\s*\(/, "QModelIndex") +event("QTreeWidget", /::itemPressed\s*\(/, "QTreeWidgetItem*, int") +event("QTreeWidget", /::itemClicked\s*\(/, "QTreeWidgetItem*, int") +event("QTreeWidget", /::itemDoubleClicked\s*\(/, "QTreeWidgetItem*, int") +event("QTreeWidget", /::itemActivated\s*\(/, "QTreeWidgetItem*, int") +event("QTreeWidget", /::itemEntered\s*\(/, "QTreeWidgetItem*, int") +event("QTreeWidget", /::itemChanged\s*\(/, "QTreeWidgetItem*, int") +event("QTreeWidget", /::itemExpanded\s*\(/, "QTreeWidgetItem*") +event("QTreeWidget", /::itemCollapsed\s*\(/, "QTreeWidgetItem*") +event("QTreeWidget", /::currentItemChanged\s*\(/, "QTreeWidgetItem*, QTreeWidgetItem*") +event("QTreeWidget", /::itemSelectionChanged\s*\(/, "") +event("QUndoGroup", /::destroyed\s*\(/, "QObject*") +event("QUndoGroup", /::objectNameChanged\s*\(/, "QString") +event("QUndoGroup", /::activeStackChanged\s*\(/, "QUndoStack*") +event("QUndoGroup", /::indexChanged\s*\(/, "int") +event("QUndoGroup", /::cleanChanged\s*\(/, "bool") +event("QUndoGroup", /::canUndoChanged\s*\(/, "bool") +event("QUndoGroup", /::canRedoChanged\s*\(/, "bool") +event("QUndoGroup", /::undoTextChanged\s*\(/, "QString") +event("QUndoGroup", /::redoTextChanged\s*\(/, "QString") +event("QUndoStack", /::destroyed\s*\(/, "QObject*") +event("QUndoStack", /::objectNameChanged\s*\(/, "QString") +event("QUndoStack", /::indexChanged\s*\(/, "int") +event("QUndoStack", /::cleanChanged\s*\(/, "bool") +event("QUndoStack", /::canUndoChanged\s*\(/, "bool") +event("QUndoStack", /::canRedoChanged\s*\(/, "bool") +event("QUndoStack", /::undoTextChanged\s*\(/, "QString") +event("QUndoStack", /::redoTextChanged\s*\(/, "QString") +event("QUndoView", /::destroyed\s*\(/, "QObject*") +event("QUndoView", /::objectNameChanged\s*\(/, "QString") +event("QUndoView", /::windowTitleChanged\s*\(/, "QString") +event("QUndoView", /::windowIconChanged\s*\(/, "QIcon") +event("QUndoView", /::windowIconTextChanged\s*\(/, "QString") +event("QUndoView", /::customContextMenuRequested\s*\(/, "QPoint") +event("QUndoView", /::pressed\s*\(/, "QModelIndex") +event("QUndoView", /::clicked\s*\(/, "QModelIndex") +event("QUndoView", /::doubleClicked\s*\(/, "QModelIndex") +event("QUndoView", /::activated\s*\(/, "QModelIndex") +event("QUndoView", /::entered\s*\(/, "QModelIndex") +event("QUndoView", /::viewportEntered\s*\(/, "") +event("QUndoView", /::iconSizeChanged\s*\(/, "QSize") +event("QUndoView", /::indexesMoved\s*\(/, "QModelIndexList") +event("QVBoxLayout", /::destroyed\s*\(/, "QObject*") +event("QVBoxLayout", /::objectNameChanged\s*\(/, "QString") +event("QWidget", /::destroyed\s*\(/, "QObject*") +event("QWidget", /::objectNameChanged\s*\(/, "QString") +event("QWidget", /::windowTitleChanged\s*\(/, "QString") +event("QWidget", /::windowIconChanged\s*\(/, "QIcon") +event("QWidget", /::windowIconTextChanged\s*\(/, "QString") +event("QWidget", /::customContextMenuRequested\s*\(/, "QPoint") +event("QWidgetAction", /::destroyed\s*\(/, "QObject*") +event("QWidgetAction", /::objectNameChanged\s*\(/, "QString") +event("QWidgetAction", /::changed\s*\(/, "") +event("QWidgetAction", /::triggered\s*\(/, "bool") +event("QWidgetAction", /::hovered\s*\(/, "") +event("QWidgetAction", /::toggled\s*\(/, "bool") +event("QWizard", /::destroyed\s*\(/, "QObject*") +event("QWizard", /::objectNameChanged\s*\(/, "QString") +event("QWizard", /::windowTitleChanged\s*\(/, "QString") +event("QWizard", /::windowIconChanged\s*\(/, "QIcon") +event("QWizard", /::windowIconTextChanged\s*\(/, "QString") +event("QWizard", /::customContextMenuRequested\s*\(/, "QPoint") +event("QWizard", /::finished\s*\(/, "int") +event("QWizard", /::accepted\s*\(/, "") +event("QWizard", /::rejected\s*\(/, "") +event("QWizard", /::currentIdChanged\s*\(/, "int") +event("QWizard", /::helpRequested\s*\(/, "") +event("QWizard", /::customButtonClicked\s*\(/, "int") +event("QWizard", /::pageAdded\s*\(/, "int") +event("QWizard", /::pageRemoved\s*\(/, "int") +event("QWizardPage", /::destroyed\s*\(/, "QObject*") +event("QWizardPage", /::objectNameChanged\s*\(/, "QString") +event("QWizardPage", /::windowTitleChanged\s*\(/, "QString") +event("QWizardPage", /::windowIconChanged\s*\(/, "QIcon") +event("QWizardPage", /::windowIconTextChanged\s*\(/, "QString") +event("QWizardPage", /::customContextMenuRequested\s*\(/, "QPoint") +event("QWizardPage", /::completeChanged\s*\(/, "") event("QSqlDriver", /::destroyed\s*\(/, "QObject*") event("QSqlDriver", /::objectNameChanged\s*\(/, "QString") event("QSqlDriver", /::notification\s*\(/, "QString, QSqlDriver::NotificationSource, QVariant") @@ -1835,10 +1780,99 @@ event("QSqlTableModel", /::primeInsert\s*\(/, "int, QSqlRecord&") event("QSqlTableModel", /::beforeInsert\s*\(/, "QSqlRecord&") event("QSqlTableModel", /::beforeUpdate\s*\(/, "int, QSqlRecord&") event("QSqlTableModel", /::beforeDelete\s*\(/, "int") +event("QAbstractNetworkCache", /::destroyed\s*\(/, "QObject*") +event("QAbstractNetworkCache", /::objectNameChanged\s*\(/, "QString") +event("QAbstractSocket", /::destroyed\s*\(/, "QObject*") +event("QAbstractSocket", /::objectNameChanged\s*\(/, "QString") +event("QAbstractSocket", /::readyRead\s*\(/, "") +event("QAbstractSocket", /::channelReadyRead\s*\(/, "int") +event("QAbstractSocket", /::bytesWritten\s*\(/, "qlonglong") +event("QAbstractSocket", /::channelBytesWritten\s*\(/, "int, qlonglong") +event("QAbstractSocket", /::aboutToClose\s*\(/, "") +event("QAbstractSocket", /::readChannelFinished\s*\(/, "") +event("QAbstractSocket", /::hostFound\s*\(/, "") +event("QAbstractSocket", /::connected\s*\(/, "") +event("QAbstractSocket", /::disconnected\s*\(/, "") +event("QAbstractSocket", /::stateChanged\s*\(/, "QAbstractSocket::SocketState") +event("QAbstractSocket", /::error\s*\(/, "QAbstractSocket::SocketError") +event("QAbstractSocket", /::proxyAuthenticationRequired\s*\(/, "QNetworkProxy, QAuthenticator*") +event("QDnsLookup", /::destroyed\s*\(/, "QObject*") +event("QDnsLookup", /::objectNameChanged\s*\(/, "QString") +event("QDnsLookup", /::finished\s*\(/, "") +event("QDnsLookup", /::nameChanged\s*\(/, "QString") +event("QDnsLookup", /::typeChanged\s*\(/, "Type") +event("QDnsLookup", /::nameserverChanged\s*\(/, "QHostAddress") +event("QHttpMultiPart", /::destroyed\s*\(/, "QObject*") +event("QHttpMultiPart", /::objectNameChanged\s*\(/, "QString") +event("QLocalServer", /::destroyed\s*\(/, "QObject*") +event("QLocalServer", /::objectNameChanged\s*\(/, "QString") +event("QLocalServer", /::newConnection\s*\(/, "") +event("QLocalSocket", /::destroyed\s*\(/, "QObject*") +event("QLocalSocket", /::objectNameChanged\s*\(/, "QString") +event("QLocalSocket", /::readyRead\s*\(/, "") +event("QLocalSocket", /::channelReadyRead\s*\(/, "int") +event("QLocalSocket", /::bytesWritten\s*\(/, "qlonglong") +event("QLocalSocket", /::channelBytesWritten\s*\(/, "int, qlonglong") +event("QLocalSocket", /::aboutToClose\s*\(/, "") +event("QLocalSocket", /::readChannelFinished\s*\(/, "") +event("QLocalSocket", /::connected\s*\(/, "") +event("QLocalSocket", /::disconnected\s*\(/, "") +event("QLocalSocket", /::error\s*\(/, "QLocalSocket::LocalSocketError") +event("QLocalSocket", /::stateChanged\s*\(/, "QLocalSocket::LocalSocketState") +event("QNetworkAccessManager", /::destroyed\s*\(/, "QObject*") +event("QNetworkAccessManager", /::objectNameChanged\s*\(/, "QString") +event("QNetworkAccessManager", /::proxyAuthenticationRequired\s*\(/, "QNetworkProxy, QAuthenticator*") +event("QNetworkAccessManager", /::authenticationRequired\s*\(/, "QNetworkReply*, QAuthenticator*") +event("QNetworkAccessManager", /::finished\s*\(/, "QNetworkReply*") +event("QNetworkAccessManager", /::encrypted\s*\(/, "QNetworkReply*") +event("QNetworkAccessManager", /::sslErrors\s*\(/, "QNetworkReply*, QList") +event("QNetworkAccessManager", /::preSharedKeyAuthenticationRequired\s*\(/, "QNetworkReply*, QSslPreSharedKeyAuthenticator*") +event("QNetworkAccessManager", /::networkSessionConnected\s*\(/, "") +event("QNetworkAccessManager", /::networkAccessibleChanged\s*\(/, "QNetworkAccessManager::NetworkAccessibility") +event("QNetworkConfigurationManager", /::destroyed\s*\(/, "QObject*") +event("QNetworkConfigurationManager", /::objectNameChanged\s*\(/, "QString") +event("QNetworkConfigurationManager", /::configurationAdded\s*\(/, "QNetworkConfiguration") +event("QNetworkConfigurationManager", /::configurationRemoved\s*\(/, "QNetworkConfiguration") +event("QNetworkConfigurationManager", /::configurationChanged\s*\(/, "QNetworkConfiguration") +event("QNetworkConfigurationManager", /::onlineStateChanged\s*\(/, "bool") +event("QNetworkConfigurationManager", /::updateCompleted\s*\(/, "") +event("QNetworkCookieJar", /::destroyed\s*\(/, "QObject*") +event("QNetworkCookieJar", /::objectNameChanged\s*\(/, "QString") +event("QNetworkDiskCache", /::destroyed\s*\(/, "QObject*") +event("QNetworkDiskCache", /::objectNameChanged\s*\(/, "QString") +event("QNetworkReply", /::destroyed\s*\(/, "QObject*") +event("QNetworkReply", /::objectNameChanged\s*\(/, "QString") +event("QNetworkReply", /::readyRead\s*\(/, "") +event("QNetworkReply", /::channelReadyRead\s*\(/, "int") +event("QNetworkReply", /::bytesWritten\s*\(/, "qlonglong") +event("QNetworkReply", /::channelBytesWritten\s*\(/, "int, qlonglong") +event("QNetworkReply", /::aboutToClose\s*\(/, "") +event("QNetworkReply", /::readChannelFinished\s*\(/, "") +event("QNetworkReply", /::metaDataChanged\s*\(/, "") +event("QNetworkReply", /::finished\s*\(/, "") +event("QNetworkReply", /::error\s*\(/, "QNetworkReply::NetworkError") +event("QNetworkReply", /::encrypted\s*\(/, "") +event("QNetworkReply", /::sslErrors\s*\(/, "QList") +event("QNetworkReply", /::preSharedKeyAuthenticationRequired\s*\(/, "QSslPreSharedKeyAuthenticator*") +event("QNetworkReply", /::redirected\s*\(/, "QUrl") +event("QNetworkReply", /::redirectAllowed\s*\(/, "") +event("QNetworkReply", /::uploadProgress\s*\(/, "qlonglong, qlonglong") +event("QNetworkReply", /::downloadProgress\s*\(/, "qlonglong, qlonglong") +event("QNetworkSession", /::destroyed\s*\(/, "QObject*") +event("QNetworkSession", /::objectNameChanged\s*\(/, "QString") +event("QNetworkSession", /::stateChanged\s*\(/, "QNetworkSession::State") +event("QNetworkSession", /::opened\s*\(/, "") +event("QNetworkSession", /::closed\s*\(/, "") +event("QNetworkSession", /::error\s*\(/, "QNetworkSession::SessionError") +event("QNetworkSession", /::preferredConfigurationChanged\s*\(/, "QNetworkConfiguration, bool") +event("QNetworkSession", /::newConfigurationActivated\s*\(/, "") +event("QNetworkSession", /::usagePoliciesChanged\s*\(/, "QNetworkSession::UsagePolicies") event("QSslSocket", /::destroyed\s*\(/, "QObject*") event("QSslSocket", /::objectNameChanged\s*\(/, "QString") event("QSslSocket", /::readyRead\s*\(/, "") +event("QSslSocket", /::channelReadyRead\s*\(/, "int") event("QSslSocket", /::bytesWritten\s*\(/, "qlonglong") +event("QSslSocket", /::channelBytesWritten\s*\(/, "int, qlonglong") event("QSslSocket", /::aboutToClose\s*\(/, "") event("QSslSocket", /::readChannelFinished\s*\(/, "") event("QSslSocket", /::hostFound\s*\(/, "") @@ -1853,188 +1887,6 @@ event("QSslSocket", /::sslErrors\s*\(/, "QList") event("QSslSocket", /::modeChanged\s*\(/, "QSslSocket::SslMode") event("QSslSocket", /::encryptedBytesWritten\s*\(/, "qlonglong") event("QSslSocket", /::preSharedKeyAuthenticationRequired\s*\(/, "QSslPreSharedKeyAuthenticator*") -event("QStackedLayout", /::destroyed\s*\(/, "QObject*") -event("QStackedLayout", /::objectNameChanged\s*\(/, "QString") -event("QStackedLayout", /::widgetRemoved\s*\(/, "int") -event("QStackedLayout", /::currentChanged\s*\(/, "int") -event("QStackedWidget", /::destroyed\s*\(/, "QObject*") -event("QStackedWidget", /::objectNameChanged\s*\(/, "QString") -event("QStackedWidget", /::windowTitleChanged\s*\(/, "QString") -event("QStackedWidget", /::windowIconChanged\s*\(/, "QIcon") -event("QStackedWidget", /::windowIconTextChanged\s*\(/, "QString") -event("QStackedWidget", /::customContextMenuRequested\s*\(/, "QPoint") -event("QStackedWidget", /::currentChanged\s*\(/, "int") -event("QStackedWidget", /::widgetRemoved\s*\(/, "int") -event("QStandardItemModel", /::destroyed\s*\(/, "QObject*") -event("QStandardItemModel", /::objectNameChanged\s*\(/, "QString") -event("QStandardItemModel", /::dataChanged\s*\(/, "QModelIndex, QModelIndex, QVector") -event("QStandardItemModel", /::headerDataChanged\s*\(/, "Qt::Orientation, int, int") -event("QStandardItemModel", /::layoutChanged\s*\(/, "QList, QAbstractItemModel::LayoutChangeHint") -event("QStandardItemModel", /::layoutAboutToBeChanged\s*\(/, "QList, QAbstractItemModel::LayoutChangeHint") -event("QStandardItemModel", /::rowsAboutToBeInserted\s*\(/, "QModelIndex, int, int") -event("QStandardItemModel", /::rowsInserted\s*\(/, "QModelIndex, int, int") -event("QStandardItemModel", /::rowsAboutToBeRemoved\s*\(/, "QModelIndex, int, int") -event("QStandardItemModel", /::rowsRemoved\s*\(/, "QModelIndex, int, int") -event("QStandardItemModel", /::columnsAboutToBeInserted\s*\(/, "QModelIndex, int, int") -event("QStandardItemModel", /::columnsInserted\s*\(/, "QModelIndex, int, int") -event("QStandardItemModel", /::columnsAboutToBeRemoved\s*\(/, "QModelIndex, int, int") -event("QStandardItemModel", /::columnsRemoved\s*\(/, "QModelIndex, int, int") -event("QStandardItemModel", /::modelAboutToBeReset\s*\(/, "") -event("QStandardItemModel", /::modelReset\s*\(/, "") -event("QStandardItemModel", /::rowsAboutToBeMoved\s*\(/, "QModelIndex, int, int, QModelIndex, int") -event("QStandardItemModel", /::rowsMoved\s*\(/, "QModelIndex, int, int, QModelIndex, int") -event("QStandardItemModel", /::columnsAboutToBeMoved\s*\(/, "QModelIndex, int, int, QModelIndex, int") -event("QStandardItemModel", /::columnsMoved\s*\(/, "QModelIndex, int, int, QModelIndex, int") -event("QStandardItemModel", /::itemChanged\s*\(/, "QStandardItem*") -event("QState", /::destroyed\s*\(/, "QObject*") -event("QState", /::objectNameChanged\s*\(/, "QString") -event("QState", /::entered\s*\(/, "") -event("QState", /::exited\s*\(/, "") -event("QState", /::activeChanged\s*\(/, "bool") -event("QState", /::finished\s*\(/, "") -event("QState", /::propertiesAssigned\s*\(/, "") -event("QState", /::childModeChanged\s*\(/, "") -event("QState", /::initialStateChanged\s*\(/, "") -event("QState", /::errorStateChanged\s*\(/, "") -event("QStateMachine", /::destroyed\s*\(/, "QObject*") -event("QStateMachine", /::objectNameChanged\s*\(/, "QString") -event("QStateMachine", /::entered\s*\(/, "") -event("QStateMachine", /::exited\s*\(/, "") -event("QStateMachine", /::activeChanged\s*\(/, "bool") -event("QStateMachine", /::finished\s*\(/, "") -event("QStateMachine", /::propertiesAssigned\s*\(/, "") -event("QStateMachine", /::childModeChanged\s*\(/, "") -event("QStateMachine", /::initialStateChanged\s*\(/, "") -event("QStateMachine", /::errorStateChanged\s*\(/, "") -event("QStateMachine", /::started\s*\(/, "") -event("QStateMachine", /::stopped\s*\(/, "") -event("QStateMachine", /::runningChanged\s*\(/, "bool") -event("QStatusBar", /::destroyed\s*\(/, "QObject*") -event("QStatusBar", /::objectNameChanged\s*\(/, "QString") -event("QStatusBar", /::windowTitleChanged\s*\(/, "QString") -event("QStatusBar", /::windowIconChanged\s*\(/, "QIcon") -event("QStatusBar", /::windowIconTextChanged\s*\(/, "QString") -event("QStatusBar", /::customContextMenuRequested\s*\(/, "QPoint") -event("QStatusBar", /::messageChanged\s*\(/, "QString") -event("QStringListModel", /::destroyed\s*\(/, "QObject*") -event("QStringListModel", /::objectNameChanged\s*\(/, "QString") -event("QStringListModel", /::dataChanged\s*\(/, "QModelIndex, QModelIndex, QVector") -event("QStringListModel", /::headerDataChanged\s*\(/, "Qt::Orientation, int, int") -event("QStringListModel", /::layoutChanged\s*\(/, "QList, QAbstractItemModel::LayoutChangeHint") -event("QStringListModel", /::layoutAboutToBeChanged\s*\(/, "QList, QAbstractItemModel::LayoutChangeHint") -event("QStringListModel", /::rowsAboutToBeInserted\s*\(/, "QModelIndex, int, int") -event("QStringListModel", /::rowsInserted\s*\(/, "QModelIndex, int, int") -event("QStringListModel", /::rowsAboutToBeRemoved\s*\(/, "QModelIndex, int, int") -event("QStringListModel", /::rowsRemoved\s*\(/, "QModelIndex, int, int") -event("QStringListModel", /::columnsAboutToBeInserted\s*\(/, "QModelIndex, int, int") -event("QStringListModel", /::columnsInserted\s*\(/, "QModelIndex, int, int") -event("QStringListModel", /::columnsAboutToBeRemoved\s*\(/, "QModelIndex, int, int") -event("QStringListModel", /::columnsRemoved\s*\(/, "QModelIndex, int, int") -event("QStringListModel", /::modelAboutToBeReset\s*\(/, "") -event("QStringListModel", /::modelReset\s*\(/, "") -event("QStringListModel", /::rowsAboutToBeMoved\s*\(/, "QModelIndex, int, int, QModelIndex, int") -event("QStringListModel", /::rowsMoved\s*\(/, "QModelIndex, int, int, QModelIndex, int") -event("QStringListModel", /::columnsAboutToBeMoved\s*\(/, "QModelIndex, int, int, QModelIndex, int") -event("QStringListModel", /::columnsMoved\s*\(/, "QModelIndex, int, int, QModelIndex, int") -event("QStyle", /::destroyed\s*\(/, "QObject*") -event("QStyle", /::objectNameChanged\s*\(/, "QString") -event("QStyleHints", /::destroyed\s*\(/, "QObject*") -event("QStyleHints", /::objectNameChanged\s*\(/, "QString") -event("QStyleHints", /::cursorFlashTimeChanged\s*\(/, "int") -event("QStyleHints", /::keyboardInputIntervalChanged\s*\(/, "int") -event("QStyleHints", /::mouseDoubleClickIntervalChanged\s*\(/, "int") -event("QStyleHints", /::startDragDistanceChanged\s*\(/, "int") -event("QStyleHints", /::startDragTimeChanged\s*\(/, "int") -event("QStylePlugin", /::destroyed\s*\(/, "QObject*") -event("QStylePlugin", /::objectNameChanged\s*\(/, "QString") -event("QStyledItemDelegate", /::destroyed\s*\(/, "QObject*") -event("QStyledItemDelegate", /::objectNameChanged\s*\(/, "QString") -event("QStyledItemDelegate", /::commitData\s*\(/, "QWidget*") -event("QStyledItemDelegate", /::closeEditor\s*\(/, "QWidget*, QAbstractItemDelegate::EndEditHint") -event("QStyledItemDelegate", /::sizeHintChanged\s*\(/, "QModelIndex") -event("QSvgRenderer", /::destroyed\s*\(/, "QObject*") -event("QSvgRenderer", /::objectNameChanged\s*\(/, "QString") -event("QSvgRenderer", /::repaintNeeded\s*\(/, "") -event("QSvgWidget", /::destroyed\s*\(/, "QObject*") -event("QSvgWidget", /::objectNameChanged\s*\(/, "QString") -event("QSvgWidget", /::windowTitleChanged\s*\(/, "QString") -event("QSvgWidget", /::windowIconChanged\s*\(/, "QIcon") -event("QSvgWidget", /::windowIconTextChanged\s*\(/, "QString") -event("QSvgWidget", /::customContextMenuRequested\s*\(/, "QPoint") -event("QSwipeGesture", /::destroyed\s*\(/, "QObject*") -event("QSwipeGesture", /::objectNameChanged\s*\(/, "QString") -event("QSyntaxHighlighter", /::destroyed\s*\(/, "QObject*") -event("QSyntaxHighlighter", /::objectNameChanged\s*\(/, "QString") -event("QSystemTrayIcon", /::destroyed\s*\(/, "QObject*") -event("QSystemTrayIcon", /::objectNameChanged\s*\(/, "QString") -event("QSystemTrayIcon", /::activated\s*\(/, "QSystemTrayIcon::ActivationReason") -event("QSystemTrayIcon", /::messageClicked\s*\(/, "") -event("QTabBar", /::destroyed\s*\(/, "QObject*") -event("QTabBar", /::objectNameChanged\s*\(/, "QString") -event("QTabBar", /::windowTitleChanged\s*\(/, "QString") -event("QTabBar", /::windowIconChanged\s*\(/, "QIcon") -event("QTabBar", /::windowIconTextChanged\s*\(/, "QString") -event("QTabBar", /::customContextMenuRequested\s*\(/, "QPoint") -event("QTabBar", /::currentChanged\s*\(/, "int") -event("QTabBar", /::tabCloseRequested\s*\(/, "int") -event("QTabBar", /::tabMoved\s*\(/, "int, int") -event("QTabBar", /::tabBarClicked\s*\(/, "int") -event("QTabBar", /::tabBarDoubleClicked\s*\(/, "int") -event("QTabWidget", /::destroyed\s*\(/, "QObject*") -event("QTabWidget", /::objectNameChanged\s*\(/, "QString") -event("QTabWidget", /::windowTitleChanged\s*\(/, "QString") -event("QTabWidget", /::windowIconChanged\s*\(/, "QIcon") -event("QTabWidget", /::windowIconTextChanged\s*\(/, "QString") -event("QTabWidget", /::customContextMenuRequested\s*\(/, "QPoint") -event("QTabWidget", /::currentChanged\s*\(.*int/, "int") -event("QTabWidget", /::tabCloseRequested\s*\(/, "int") -event("QTabWidget", /::tabBarClicked\s*\(/, "int") -event("QTabWidget", /::tabBarDoubleClicked\s*\(/, "int") -event("QTableView", /::destroyed\s*\(/, "QObject*") -event("QTableView", /::objectNameChanged\s*\(/, "QString") -event("QTableView", /::windowTitleChanged\s*\(/, "QString") -event("QTableView", /::windowIconChanged\s*\(/, "QIcon") -event("QTableView", /::windowIconTextChanged\s*\(/, "QString") -event("QTableView", /::customContextMenuRequested\s*\(/, "QPoint") -event("QTableView", /::pressed\s*\(/, "QModelIndex") -event("QTableView", /::clicked\s*\(/, "QModelIndex") -event("QTableView", /::doubleClicked\s*\(/, "QModelIndex") -event("QTableView", /::activated\s*\(/, "QModelIndex") -event("QTableView", /::entered\s*\(/, "QModelIndex") -event("QTableView", /::viewportEntered\s*\(/, "") -event("QTableView", /::iconSizeChanged\s*\(/, "QSize") -event("QTableWidget", /::destroyed\s*\(/, "QObject*") -event("QTableWidget", /::objectNameChanged\s*\(/, "QString") -event("QTableWidget", /::windowTitleChanged\s*\(/, "QString") -event("QTableWidget", /::windowIconChanged\s*\(/, "QIcon") -event("QTableWidget", /::windowIconTextChanged\s*\(/, "QString") -event("QTableWidget", /::customContextMenuRequested\s*\(/, "QPoint") -event("QTableWidget", /::pressed\s*\(/, "QModelIndex") -event("QTableWidget", /::clicked\s*\(/, "QModelIndex") -event("QTableWidget", /::doubleClicked\s*\(/, "QModelIndex") -event("QTableWidget", /::activated\s*\(/, "QModelIndex") -event("QTableWidget", /::entered\s*\(/, "QModelIndex") -event("QTableWidget", /::viewportEntered\s*\(/, "") -event("QTableWidget", /::iconSizeChanged\s*\(/, "QSize") -event("QTableWidget", /::itemPressed\s*\(/, "QTableWidgetItem*") -event("QTableWidget", /::itemClicked\s*\(/, "QTableWidgetItem*") -event("QTableWidget", /::itemDoubleClicked\s*\(/, "QTableWidgetItem*") -event("QTableWidget", /::itemActivated\s*\(/, "QTableWidgetItem*") -event("QTableWidget", /::itemEntered\s*\(/, "QTableWidgetItem*") -event("QTableWidget", /::itemChanged\s*\(/, "QTableWidgetItem*") -event("QTableWidget", /::currentItemChanged\s*\(/, "QTableWidgetItem*, QTableWidgetItem*") -event("QTableWidget", /::itemSelectionChanged\s*\(/, "") -event("QTableWidget", /::cellPressed\s*\(/, "int, int") -event("QTableWidget", /::cellClicked\s*\(/, "int, int") -event("QTableWidget", /::cellDoubleClicked\s*\(/, "int, int") -event("QTableWidget", /::cellActivated\s*\(/, "int, int") -event("QTableWidget", /::cellEntered\s*\(/, "int, int") -event("QTableWidget", /::cellChanged\s*\(/, "int, int") -event("QTableWidget", /::currentCellChanged\s*\(/, "int, int, int, int") -event("QTapAndHoldGesture", /::destroyed\s*\(/, "QObject*") -event("QTapAndHoldGesture", /::objectNameChanged\s*\(/, "QString") -event("QTapGesture", /::destroyed\s*\(/, "QObject*") -event("QTapGesture", /::objectNameChanged\s*\(/, "QString") event("QTcpServer", /::destroyed\s*\(/, "QObject*") event("QTcpServer", /::objectNameChanged\s*\(/, "QString") event("QTcpServer", /::newConnection\s*\(/, "") @@ -2042,7 +1894,9 @@ event("QTcpServer", /::acceptError\s*\(/, "QAbstractSocket::SocketError") event("QTcpSocket", /::destroyed\s*\(/, "QObject*") event("QTcpSocket", /::objectNameChanged\s*\(/, "QString") event("QTcpSocket", /::readyRead\s*\(/, "") +event("QTcpSocket", /::channelReadyRead\s*\(/, "int") event("QTcpSocket", /::bytesWritten\s*\(/, "qlonglong") +event("QTcpSocket", /::channelBytesWritten\s*\(/, "int, qlonglong") event("QTcpSocket", /::aboutToClose\s*\(/, "") event("QTcpSocket", /::readChannelFinished\s*\(/, "") event("QTcpSocket", /::hostFound\s*\(/, "") @@ -2051,172 +1905,12 @@ event("QTcpSocket", /::disconnected\s*\(/, "") event("QTcpSocket", /::stateChanged\s*\(/, "QAbstractSocket::SocketState") event("QTcpSocket", /::error\s*\(/, "QAbstractSocket::SocketError") event("QTcpSocket", /::proxyAuthenticationRequired\s*\(/, "QNetworkProxy, QAuthenticator*") -event("QTemporaryFile", /::destroyed\s*\(/, "QObject*") -event("QTemporaryFile", /::objectNameChanged\s*\(/, "QString") -event("QTemporaryFile", /::readyRead\s*\(/, "") -event("QTemporaryFile", /::bytesWritten\s*\(/, "qlonglong") -event("QTemporaryFile", /::aboutToClose\s*\(/, "") -event("QTemporaryFile", /::readChannelFinished\s*\(/, "") -event("QTextBlockGroup", /::destroyed\s*\(/, "QObject*") -event("QTextBlockGroup", /::objectNameChanged\s*\(/, "QString") -event("QTextBrowser", /::destroyed\s*\(/, "QObject*") -event("QTextBrowser", /::objectNameChanged\s*\(/, "QString") -event("QTextBrowser", /::windowTitleChanged\s*\(/, "QString") -event("QTextBrowser", /::windowIconChanged\s*\(/, "QIcon") -event("QTextBrowser", /::windowIconTextChanged\s*\(/, "QString") -event("QTextBrowser", /::customContextMenuRequested\s*\(/, "QPoint") -event("QTextBrowser", /::textChanged\s*\(/, "") -event("QTextBrowser", /::undoAvailable\s*\(/, "bool") -event("QTextBrowser", /::redoAvailable\s*\(/, "bool") -event("QTextBrowser", /::currentCharFormatChanged\s*\(/, "QTextCharFormat") -event("QTextBrowser", /::copyAvailable\s*\(/, "bool") -event("QTextBrowser", /::selectionChanged\s*\(/, "") -event("QTextBrowser", /::cursorPositionChanged\s*\(/, "") -event("QTextBrowser", /::backwardAvailable\s*\(/, "bool") -event("QTextBrowser", /::forwardAvailable\s*\(/, "bool") -event("QTextBrowser", /::historyChanged\s*\(/, "") -event("QTextBrowser", /::sourceChanged\s*\(/, "QUrl") -event("QTextBrowser", /::highlighted\s*\(.*QUrl/, "QUrl") -event("QTextBrowser", /::highlighted\s*\(.*QString/, "QString") -rename("QTextBrowser", /::highlighted\s*\(.*QString/, "highlighted_qs") -event("QTextBrowser", /::anchorClicked\s*\(/, "QUrl") -event("QTextDocument", /::destroyed\s*\(/, "QObject*") -event("QTextDocument", /::objectNameChanged\s*\(/, "QString") -event("QTextDocument", /::contentsChange\s*\(/, "int, int, int") -event("QTextDocument", /::contentsChanged\s*\(/, "") -event("QTextDocument", /::undoAvailable\s*\(/, "bool") -event("QTextDocument", /::redoAvailable\s*\(/, "bool") -event("QTextDocument", /::undoCommandAdded\s*\(/, "") -event("QTextDocument", /::modificationChanged\s*\(/, "bool") -event("QTextDocument", /::cursorPositionChanged\s*\(/, "QTextCursor") -event("QTextDocument", /::blockCountChanged\s*\(/, "int") -event("QTextDocument", /::baseUrlChanged\s*\(/, "QUrl") -event("QTextDocument", /::documentLayoutChanged\s*\(/, "") -event("QTextEdit", /::destroyed\s*\(/, "QObject*") -event("QTextEdit", /::objectNameChanged\s*\(/, "QString") -event("QTextEdit", /::windowTitleChanged\s*\(/, "QString") -event("QTextEdit", /::windowIconChanged\s*\(/, "QIcon") -event("QTextEdit", /::windowIconTextChanged\s*\(/, "QString") -event("QTextEdit", /::customContextMenuRequested\s*\(/, "QPoint") -event("QTextEdit", /::textChanged\s*\(/, "") -event("QTextEdit", /::undoAvailable\s*\(/, "bool") -event("QTextEdit", /::redoAvailable\s*\(/, "bool") -event("QTextEdit", /::currentCharFormatChanged\s*\(/, "QTextCharFormat") -event("QTextEdit", /::copyAvailable\s*\(/, "bool") -event("QTextEdit", /::selectionChanged\s*\(/, "") -event("QTextEdit", /::cursorPositionChanged\s*\(/, "") -event("QTextFrame", /::destroyed\s*\(/, "QObject*") -event("QTextFrame", /::objectNameChanged\s*\(/, "QString") -event("QTextList", /::destroyed\s*\(/, "QObject*") -event("QTextList", /::objectNameChanged\s*\(/, "QString") -event("QTextObject", /::destroyed\s*\(/, "QObject*") -event("QTextObject", /::objectNameChanged\s*\(/, "QString") -event("QTextTable", /::destroyed\s*\(/, "QObject*") -event("QTextTable", /::objectNameChanged\s*\(/, "QString") -event("QThread", /::destroyed\s*\(/, "QObject*") -event("QThread", /::objectNameChanged\s*\(/, "QString") -event("QThread", /::started\s*\(/, "") -event("QThread", /::finished\s*\(/, "") -event("QThreadPool", /::destroyed\s*\(/, "QObject*") -event("QThreadPool", /::objectNameChanged\s*\(/, "QString") -event("QTimeEdit", /::destroyed\s*\(/, "QObject*") -event("QTimeEdit", /::objectNameChanged\s*\(/, "QString") -event("QTimeEdit", /::windowTitleChanged\s*\(/, "QString") -event("QTimeEdit", /::windowIconChanged\s*\(/, "QIcon") -event("QTimeEdit", /::windowIconTextChanged\s*\(/, "QString") -event("QTimeEdit", /::customContextMenuRequested\s*\(/, "QPoint") -event("QTimeEdit", /::editingFinished\s*\(/, "") -event("QTimeEdit", /::dateTimeChanged\s*\(/, "QDateTime") -event("QTimeEdit", /::timeChanged\s*\(/, "QTime") -event("QTimeEdit", /::dateChanged\s*\(/, "QDate") -event("QTimeEdit", /::userTimeChanged\s*\(/, "QTime") -event("QTimeLine", /::destroyed\s*\(/, "QObject*") -event("QTimeLine", /::objectNameChanged\s*\(/, "QString") -event("QTimeLine", /::valueChanged\s*\(/, "double") -event("QTimeLine", /::frameChanged\s*\(/, "int") -event("QTimeLine", /::stateChanged\s*\(/, "QTimeLine::State") -event("QTimeLine", /::finished\s*\(/, "") -event("QTimer", /::destroyed\s*\(/, "QObject*") -event("QTimer", /::objectNameChanged\s*\(/, "QString") -event("QTimer", /::timeout\s*\(/, "") -event("QToolBar", /::destroyed\s*\(/, "QObject*") -event("QToolBar", /::objectNameChanged\s*\(/, "QString") -event("QToolBar", /::windowTitleChanged\s*\(/, "QString") -event("QToolBar", /::windowIconChanged\s*\(/, "QIcon") -event("QToolBar", /::windowIconTextChanged\s*\(/, "QString") -event("QToolBar", /::customContextMenuRequested\s*\(/, "QPoint") -event("QToolBar", /::actionTriggered\s*\(/, "QAction*") -event("QToolBar", /::movableChanged\s*\(/, "bool") -event("QToolBar", /::allowedAreasChanged\s*\(/, "Qt::ToolBarAreas") -event("QToolBar", /::orientationChanged\s*\(/, "Qt::Orientation") -event("QToolBar", /::iconSizeChanged\s*\(/, "QSize") -event("QToolBar", /::toolButtonStyleChanged\s*\(/, "Qt::ToolButtonStyle") -event("QToolBar", /::topLevelChanged\s*\(/, "bool") -event("QToolBar", /::visibilityChanged\s*\(/, "bool") -event("QToolBox", /::destroyed\s*\(/, "QObject*") -event("QToolBox", /::objectNameChanged\s*\(/, "QString") -event("QToolBox", /::windowTitleChanged\s*\(/, "QString") -event("QToolBox", /::windowIconChanged\s*\(/, "QIcon") -event("QToolBox", /::windowIconTextChanged\s*\(/, "QString") -event("QToolBox", /::customContextMenuRequested\s*\(/, "QPoint") -event("QToolBox", /::currentChanged\s*\(/, "int") -event("QToolButton", /::destroyed\s*\(/, "QObject*") -event("QToolButton", /::objectNameChanged\s*\(/, "QString") -event("QToolButton", /::windowTitleChanged\s*\(/, "QString") -event("QToolButton", /::windowIconChanged\s*\(/, "QIcon") -event("QToolButton", /::windowIconTextChanged\s*\(/, "QString") -event("QToolButton", /::customContextMenuRequested\s*\(/, "QPoint") -event("QToolButton", /::pressed\s*\(/, "") -event("QToolButton", /::released\s*\(/, "") -event("QToolButton", /::clicked\s*\(/, "bool") -event("QToolButton", /::toggled\s*\(/, "bool") -event("QToolButton", /::triggered\s*\(/, "QAction*") -event("QTranslator", /::destroyed\s*\(/, "QObject*") -event("QTranslator", /::objectNameChanged\s*\(/, "QString") -event("QTreeView", /::destroyed\s*\(/, "QObject*") -event("QTreeView", /::objectNameChanged\s*\(/, "QString") -event("QTreeView", /::windowTitleChanged\s*\(/, "QString") -event("QTreeView", /::windowIconChanged\s*\(/, "QIcon") -event("QTreeView", /::windowIconTextChanged\s*\(/, "QString") -event("QTreeView", /::customContextMenuRequested\s*\(/, "QPoint") -event("QTreeView", /::pressed\s*\(/, "QModelIndex") -event("QTreeView", /::clicked\s*\(/, "QModelIndex") -event("QTreeView", /::doubleClicked\s*\(/, "QModelIndex") -event("QTreeView", /::activated\s*\(/, "QModelIndex") -event("QTreeView", /::entered\s*\(/, "QModelIndex") -event("QTreeView", /::viewportEntered\s*\(/, "") -event("QTreeView", /::iconSizeChanged\s*\(/, "QSize") -event("QTreeView", /::expanded\s*\(/, "QModelIndex") -event("QTreeView", /::collapsed\s*\(/, "QModelIndex") -event("QTreeWidget", /::destroyed\s*\(/, "QObject*") -event("QTreeWidget", /::objectNameChanged\s*\(/, "QString") -event("QTreeWidget", /::windowTitleChanged\s*\(/, "QString") -event("QTreeWidget", /::windowIconChanged\s*\(/, "QIcon") -event("QTreeWidget", /::windowIconTextChanged\s*\(/, "QString") -event("QTreeWidget", /::customContextMenuRequested\s*\(/, "QPoint") -event("QTreeWidget", /::pressed\s*\(/, "QModelIndex") -event("QTreeWidget", /::clicked\s*\(/, "QModelIndex") -event("QTreeWidget", /::doubleClicked\s*\(/, "QModelIndex") -event("QTreeWidget", /::activated\s*\(/, "QModelIndex") -event("QTreeWidget", /::entered\s*\(/, "QModelIndex") -event("QTreeWidget", /::viewportEntered\s*\(/, "") -event("QTreeWidget", /::iconSizeChanged\s*\(/, "QSize") -event("QTreeWidget", /::expanded\s*\(/, "QModelIndex") -event("QTreeWidget", /::collapsed\s*\(/, "QModelIndex") -event("QTreeWidget", /::itemPressed\s*\(/, "QTreeWidgetItem*, int") -event("QTreeWidget", /::itemClicked\s*\(/, "QTreeWidgetItem*, int") -event("QTreeWidget", /::itemDoubleClicked\s*\(/, "QTreeWidgetItem*, int") -event("QTreeWidget", /::itemActivated\s*\(/, "QTreeWidgetItem*, int") -event("QTreeWidget", /::itemEntered\s*\(/, "QTreeWidgetItem*, int") -event("QTreeWidget", /::itemChanged\s*\(/, "QTreeWidgetItem*, int") -event("QTreeWidget", /::itemExpanded\s*\(/, "QTreeWidgetItem*") -event("QTreeWidget", /::itemCollapsed\s*\(/, "QTreeWidgetItem*") -event("QTreeWidget", /::currentItemChanged\s*\(/, "QTreeWidgetItem*, QTreeWidgetItem*") -event("QTreeWidget", /::itemSelectionChanged\s*\(/, "") event("QUdpSocket", /::destroyed\s*\(/, "QObject*") event("QUdpSocket", /::objectNameChanged\s*\(/, "QString") event("QUdpSocket", /::readyRead\s*\(/, "") +event("QUdpSocket", /::channelReadyRead\s*\(/, "int") event("QUdpSocket", /::bytesWritten\s*\(/, "qlonglong") +event("QUdpSocket", /::channelBytesWritten\s*\(/, "int, qlonglong") event("QUdpSocket", /::aboutToClose\s*\(/, "") event("QUdpSocket", /::readChannelFinished\s*\(/, "") event("QUdpSocket", /::hostFound\s*\(/, "") @@ -2225,131 +1919,3 @@ event("QUdpSocket", /::disconnected\s*\(/, "") event("QUdpSocket", /::stateChanged\s*\(/, "QAbstractSocket::SocketState") event("QUdpSocket", /::error\s*\(/, "QAbstractSocket::SocketError") event("QUdpSocket", /::proxyAuthenticationRequired\s*\(/, "QNetworkProxy, QAuthenticator*") -event("QUndoGroup", /::destroyed\s*\(/, "QObject*") -event("QUndoGroup", /::objectNameChanged\s*\(/, "QString") -event("QUndoGroup", /::activeStackChanged\s*\(/, "QUndoStack*") -event("QUndoGroup", /::indexChanged\s*\(/, "int") -event("QUndoGroup", /::cleanChanged\s*\(/, "bool") -event("QUndoGroup", /::canUndoChanged\s*\(/, "bool") -event("QUndoGroup", /::canRedoChanged\s*\(/, "bool") -event("QUndoGroup", /::undoTextChanged\s*\(/, "QString") -event("QUndoGroup", /::redoTextChanged\s*\(/, "QString") -event("QUndoStack", /::destroyed\s*\(/, "QObject*") -event("QUndoStack", /::objectNameChanged\s*\(/, "QString") -event("QUndoStack", /::indexChanged\s*\(/, "int") -event("QUndoStack", /::cleanChanged\s*\(/, "bool") -event("QUndoStack", /::canUndoChanged\s*\(/, "bool") -event("QUndoStack", /::canRedoChanged\s*\(/, "bool") -event("QUndoStack", /::undoTextChanged\s*\(/, "QString") -event("QUndoStack", /::redoTextChanged\s*\(/, "QString") -event("QUndoView", /::destroyed\s*\(/, "QObject*") -event("QUndoView", /::objectNameChanged\s*\(/, "QString") -event("QUndoView", /::windowTitleChanged\s*\(/, "QString") -event("QUndoView", /::windowIconChanged\s*\(/, "QIcon") -event("QUndoView", /::windowIconTextChanged\s*\(/, "QString") -event("QUndoView", /::customContextMenuRequested\s*\(/, "QPoint") -event("QUndoView", /::pressed\s*\(/, "QModelIndex") -event("QUndoView", /::clicked\s*\(/, "QModelIndex") -event("QUndoView", /::doubleClicked\s*\(/, "QModelIndex") -event("QUndoView", /::activated\s*\(/, "QModelIndex") -event("QUndoView", /::entered\s*\(/, "QModelIndex") -event("QUndoView", /::viewportEntered\s*\(/, "") -event("QUndoView", /::iconSizeChanged\s*\(/, "QSize") -event("QUndoView", /::indexesMoved\s*\(/, "QModelIndexList") -event("QVBoxLayout", /::destroyed\s*\(/, "QObject*") -event("QVBoxLayout", /::objectNameChanged\s*\(/, "QString") -event("QValidator", /::destroyed\s*\(/, "QObject*") -event("QValidator", /::objectNameChanged\s*\(/, "QString") -event("QValidator", /::changed\s*\(/, "") -event("QVariantAnimation", /::destroyed\s*\(/, "QObject*") -event("QVariantAnimation", /::objectNameChanged\s*\(/, "QString") -event("QVariantAnimation", /::finished\s*\(/, "") -event("QVariantAnimation", /::stateChanged\s*\(/, "QAbstractAnimation::State, QAbstractAnimation::State") -event("QVariantAnimation", /::currentLoopChanged\s*\(/, "int") -event("QVariantAnimation", /::directionChanged\s*\(/, "QAbstractAnimation::Direction") -event("QVariantAnimation", /::valueChanged\s*\(/, "QVariant") -event("QVideoDeviceSelectorControl", /::destroyed\s*\(/, "QObject*") -event("QVideoDeviceSelectorControl", /::objectNameChanged\s*\(/, "QString") -event("QVideoDeviceSelectorControl", /::selectedDeviceChanged\s*\(/, "int") -event("QVideoDeviceSelectorControl", /::selectedDeviceChanged\s*\(/, "QString") -event("QVideoDeviceSelectorControl", /::devicesChanged\s*\(/, "") -event("QVideoEncoderSettingsControl", /::destroyed\s*\(/, "QObject*") -event("QVideoEncoderSettingsControl", /::objectNameChanged\s*\(/, "QString") -event("QVideoProbe", /::destroyed\s*\(/, "QObject*") -event("QVideoProbe", /::objectNameChanged\s*\(/, "QString") -event("QVideoProbe", /::videoFrameProbed\s*\(/, "QVideoFrame") -event("QVideoProbe", /::flush\s*\(/, "") -event("QVideoRendererControl", /::destroyed\s*\(/, "QObject*") -event("QVideoRendererControl", /::objectNameChanged\s*\(/, "QString") -event("QVideoWidget", /::destroyed\s*\(/, "QObject*") -event("QVideoWidget", /::objectNameChanged\s*\(/, "QString") -event("QVideoWidget", /::windowTitleChanged\s*\(/, "QString") -event("QVideoWidget", /::windowIconChanged\s*\(/, "QIcon") -event("QVideoWidget", /::windowIconTextChanged\s*\(/, "QString") -event("QVideoWidget", /::customContextMenuRequested\s*\(/, "QPoint") -event("QVideoWidget", /::fullScreenChanged\s*\(/, "bool") -event("QVideoWidget", /::brightnessChanged\s*\(/, "int") -event("QVideoWidget", /::contrastChanged\s*\(/, "int") -event("QVideoWidget", /::hueChanged\s*\(/, "int") -event("QVideoWidget", /::saturationChanged\s*\(/, "int") -event("QVideoWindowControl", /::destroyed\s*\(/, "QObject*") -event("QVideoWindowControl", /::objectNameChanged\s*\(/, "QString") -event("QVideoWindowControl", /::fullScreenChanged\s*\(/, "bool") -event("QVideoWindowControl", /::brightnessChanged\s*\(/, "int") -event("QVideoWindowControl", /::contrastChanged\s*\(/, "int") -event("QVideoWindowControl", /::hueChanged\s*\(/, "int") -event("QVideoWindowControl", /::saturationChanged\s*\(/, "int") -event("QVideoWindowControl", /::nativeSizeChanged\s*\(/, "") -event("QWidget", /::destroyed\s*\(/, "QObject*") -event("QWidget", /::objectNameChanged\s*\(/, "QString") -event("QWidget", /::windowTitleChanged\s*\(/, "QString") -event("QWidget", /::windowIconChanged\s*\(/, "QIcon") -event("QWidget", /::windowIconTextChanged\s*\(/, "QString") -event("QWidget", /::customContextMenuRequested\s*\(/, "QPoint") -event("QWidgetAction", /::destroyed\s*\(/, "QObject*") -event("QWidgetAction", /::objectNameChanged\s*\(/, "QString") -event("QWidgetAction", /::changed\s*\(/, "") -event("QWidgetAction", /::triggered\s*\(/, "bool") -event("QWidgetAction", /::hovered\s*\(/, "") -event("QWidgetAction", /::toggled\s*\(/, "bool") -event("QWindow", /::destroyed\s*\(/, "QObject*") -event("QWindow", /::objectNameChanged\s*\(/, "QString") -event("QWindow", /::screenChanged\s*\(/, "QScreen*") -event("QWindow", /::modalityChanged\s*\(/, "Qt::WindowModality") -event("QWindow", /::windowStateChanged\s*\(/, "Qt::WindowState") -event("QWindow", /::windowTitleChanged\s*\(/, "QString") -event("QWindow", /::xChanged\s*\(/, "int") -event("QWindow", /::yChanged\s*\(/, "int") -event("QWindow", /::widthChanged\s*\(/, "int") -event("QWindow", /::heightChanged\s*\(/, "int") -event("QWindow", /::minimumWidthChanged\s*\(/, "int") -event("QWindow", /::minimumHeightChanged\s*\(/, "int") -event("QWindow", /::maximumWidthChanged\s*\(/, "int") -event("QWindow", /::maximumHeightChanged\s*\(/, "int") -event("QWindow", /::visibleChanged\s*\(/, "bool") -event("QWindow", /::visibilityChanged\s*\(/, "QWindow::Visibility") -event("QWindow", /::activeChanged\s*\(/, "") -event("QWindow", /::contentOrientationChanged\s*\(/, "Qt::ScreenOrientation") -event("QWindow", /::focusObjectChanged\s*\(/, "QObject*") -event("QWindow", /::opacityChanged\s*\(/, "double") -event("QWizard", /::destroyed\s*\(/, "QObject*") -event("QWizard", /::objectNameChanged\s*\(/, "QString") -event("QWizard", /::windowTitleChanged\s*\(/, "QString") -event("QWizard", /::windowIconChanged\s*\(/, "QIcon") -event("QWizard", /::windowIconTextChanged\s*\(/, "QString") -event("QWizard", /::customContextMenuRequested\s*\(/, "QPoint") -event("QWizard", /::finished\s*\(/, "int") -event("QWizard", /::accepted\s*\(/, "") -event("QWizard", /::rejected\s*\(/, "") -event("QWizard", /::currentIdChanged\s*\(/, "int") -event("QWizard", /::helpRequested\s*\(/, "") -event("QWizard", /::customButtonClicked\s*\(/, "int") -event("QWizard", /::pageAdded\s*\(/, "int") -event("QWizard", /::pageRemoved\s*\(/, "int") -event("QWizardPage", /::destroyed\s*\(/, "QObject*") -event("QWizardPage", /::objectNameChanged\s*\(/, "QString") -event("QWizardPage", /::windowTitleChanged\s*\(/, "QString") -event("QWizardPage", /::windowIconChanged\s*\(/, "QIcon") -event("QWizardPage", /::windowIconTextChanged\s*\(/, "QString") -event("QWizardPage", /::customContextMenuRequested\s*\(/, "QPoint") -event("QWizardPage", /::completeChanged\s*\(/, "") diff --git a/scripts/mkqtdecl_common/cpp_parser_classes.rb b/scripts/mkqtdecl_common/cpp_parser_classes.rb index 9ed4d769b..0cb096649 100644 --- a/scripts/mkqtdecl_common/cpp_parser_classes.rb +++ b/scripts/mkqtdecl_common/cpp_parser_classes.rb @@ -452,7 +452,7 @@ end module PExternBlock def cpp - self.get_cpp.collect do |d| + (self.get_cpp || []).collect do |d| if d.is_a?(CPPDeclaration) d.storage_class = :extern end diff --git a/scripts/mkqtdecl_common/mkqtdecl_extract_signals.rb b/scripts/mkqtdecl_common/mkqtdecl_extract_signals.rb index b0c8e045f..f11ad275f 100644 --- a/scripts/mkqtdecl_common/mkqtdecl_extract_signals.rb +++ b/scripts/mkqtdecl_common/mkqtdecl_extract_signals.rb @@ -33,7 +33,7 @@ RBA::Class::each_class do |cls| if cls.name =~ /^Q/ && (cls.name =~ /_Native$/ || !classes[cls.name + "_Native"]) - b = cls.base + b = cls while b && b.name != "QObject_Native" b = b.base end diff --git a/scripts/mkqtdecl_common/produce.rb b/scripts/mkqtdecl_common/produce.rb index 89484364c..2b3231414 100755 --- a/scripts/mkqtdecl_common/produce.rb +++ b/scripts/mkqtdecl_common/produce.rb @@ -1032,6 +1032,9 @@ class Configurator if cls != :all_classes && cls !~ /^Q\w+$/ # don't consider classes which are not plain Qt classes (i.e. templates, internal ones etc.) return true + elsif cls != :all_classes && cls =~ /^QPrivateSignal$/ + # drop QPrivateSignal because that's just a marker + return true else dc = (@dropped_classes[:all_classes] || []) + (@dropped_classes[cls] || []) if sig != :whole_class @@ -2052,12 +2055,18 @@ END next end - sig = bd.sig(cls) - func = bd.type.func + if conf.event_args(cls, bd.sig(cls)) - if conf.event_args(cls, sig) + # strip QPrivateSignal argument if present + bd_short = bd.dup + func = bd_short.type.func + if func.args.size > 0 && func.args[-1].anonymous_type.to_s =~ /QPrivateSignal/ + func.args.pop + end + + sig = bd_short.sig(cls) - hk = bd.hash_str + hk = bd_short.hash_str n_args = func.max_args argnames = n_args.times.collect { |ia| (func.args[ia].name || "arg#{ia + 1}") } ant = n_args.times.collect { |ia| func.args[ia].anonymous_type } @@ -2484,6 +2493,18 @@ END if is_qobject && conf.event_args(cls, sig) && bd.storage_class != :static && rt.is_void? + # if the last argument is a QPrivateSignal we cannot emit + + is_private = false + bd_short = bd.dup + func = bd_short.type.func + if func.args.size > 0 && func.args[-1].anonymous_type.to_s =~ /QPrivateSignal/ + func.args.pop + is_private = true + end + + sig = bd_short.sig(cls) + # for events produce an emitter function i_var = func.max_args - func.min_args # for backward compatibility @@ -2499,8 +2520,15 @@ END ofile.puts(" // [emitter impl] #{sig}") ofile.puts(" #{rt.to_s} emitter_#{clsn}_#{mn}_#{hk}(#{raw_args})") ofile.puts(" {") - ofile.puts(" emit #{cls}::#{mid}(#{call_args});"); - ofile.puts(" }"); + if is_private + argnames.each do |a| + ofile.puts(" __SUPPRESS_UNUSED_WARNING (#{a});") + end + ofile.puts(" throw tl::Exception (\"Can't emit private signal '#{sig}'\");") + else + ofile.puts(" emit #{cls}::#{mid}(#{call_args});") + end + ofile.puts(" }") elsif bd.virtual @@ -2663,6 +2691,14 @@ END # for events produce the emitter + bd_short = bd.dup + func = bd_short.type.func + if func.args.size > 0 && func.args[-1].anonymous_type.to_s =~ /QPrivateSignal/ + func.args.pop + end + + sig = bd_short.sig(cls) + n_args = func.max_args n_min_args = func.min_args @@ -2676,20 +2712,20 @@ END ofile.puts("static void _init_emitter_#{mn}_#{hk} (qt_gsi::#{ifc_obj} *decl)") ofile.puts("{") produce_arg_init(ofile, decl_obj, func) - rpf = (conf.returns_new(bd) ? "_new" : "") + rpf = (conf.returns_new(bd_short) ? "_new" : "") ofile.puts(" decl->set_return#{rpf}<#{rt.gsi_decl_return(decl_obj)} > ();") ofile.puts("}") ofile.puts("") ofile.puts("static void _call_emitter_#{mn}_#{hk} (const qt_gsi::#{ifc_obj} * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) ") ofile.puts("{") ofile.puts(" __SUPPRESS_UNUSED_WARNING(args);") - produce_arg_read(ofile, decl_obj, func, alist, conf.kept_args(bd)) + produce_arg_read(ofile, decl_obj, func, alist, conf.kept_args(bd_short)) ofile.puts(" ((#{clsn}_Adaptor *)cls)->emitter_#{clsn}_#{mn}_#{hk} (#{alist.join(', ')});") ofile.puts("}") ofile.puts("") const_flag = "" - if bd.storage_class != :static + if bd_short.storage_class != :static const_flag = ", " + const.to_s end mdecl << "new qt_gsi::#{ifc_obj} (\"emit_#{mn_name}\", \"@brief Emitter for signal #{sig}\\nCall this method to emit this signal.\"#{const_flag}, &_init_emitter_#{mn}_#{hk}, &_call_emitter_#{mn}_#{hk});" diff --git a/src/gsiqt/qt4/QtCore/gsiDeclQObject.cc b/src/gsiqt/qt4/QtCore/gsiDeclQObject.cc index 3ede77987..48d4cb694 100644 --- a/src/gsiqt/qt4/QtCore/gsiDeclQObject.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQObject.cc @@ -746,6 +746,7 @@ static gsi::Methods methods_QObject () { methods += new qt_gsi::GenericMethod ("signalsBlocked", "@brief Method bool QObject::signalsBlocked()\n", true, &_init_f_signalsBlocked_c0, &_call_f_signalsBlocked_c0); methods += new qt_gsi::GenericMethod ("startTimer", "@brief Method int QObject::startTimer(int interval)\n", false, &_init_f_startTimer_767, &_call_f_startTimer_767); methods += new qt_gsi::GenericMethod ("thread", "@brief Method QThread *QObject::thread()\n", true, &_init_f_thread_c0, &_call_f_thread_c0); + methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QObject::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("connect", "@brief Static method bool QObject::connect(const QObject *sender, const char *signal, const QObject *receiver, const char *member, Qt::ConnectionType)\nThis method is static and can be called without an instance.", &_init_f_connect_9231, &_call_f_connect_9231); methods += new qt_gsi::GenericStaticMethod ("disconnect", "@brief Static method bool QObject::disconnect(const QObject *sender, const char *signal, const QObject *receiver, const char *member)\nThis method is static and can be called without an instance.", &_init_f_disconnect_7132, &_call_f_disconnect_7132); methods += new qt_gsi::GenericStaticMethod ("registerUserData", "@brief Static method unsigned int QObject::registerUserData()\nThis method is static and can be called without an instance.", &_init_f_registerUserData_0, &_call_f_registerUserData_0); @@ -785,11 +786,6 @@ public: qt_gsi::QtObjectBase::init (this); } - // [expose] void QObject::destroyed(QObject *) - void fp_QObject_destroyed_1302 (QObject *arg1) { - QObject::destroyed(arg1); - } - // [expose] int QObject::receivers(const char *signal) int fp_QObject_receivers_c1731 (const char *signal) const { return QObject::receivers(signal); @@ -860,6 +856,12 @@ public: } } + // [emitter impl] void QObject::destroyed(QObject *) + void emitter_QObject_destroyed_1302(QObject *arg1) + { + emit QObject::destroyed(arg1); + } + // [adaptor impl] void QObject::disconnectNotify(const char *signal) void cbs_disconnectNotify_1731_0(const char *signal) { @@ -966,22 +968,21 @@ static void _set_callback_cbs_customEvent_1217_0 (void *cls, const gsi::Callback } -// exposed void QObject::destroyed(QObject *) +// emitter void QObject::destroyed(QObject *) -static void _init_fp_destroyed_1302 (qt_gsi::GenericMethod *decl) +static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) { static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); decl->add_arg (argspec_0); decl->set_return (); } -static void _call_fp_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) { __SUPPRESS_UNUSED_WARNING(args); tl::Heap heap; QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - __SUPPRESS_UNUSED_WARNING(ret); - ((QObject_Adaptor *)cls)->fp_QObject_destroyed_1302 (arg1); + ((QObject_Adaptor *)cls)->emitter_QObject_destroyed_1302 (arg1); } @@ -1126,7 +1127,7 @@ static gsi::Methods methods_QObject_Adaptor () { methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QObject::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); - methods += new qt_gsi::GenericMethod ("*destroyed", "@brief Method void QObject::destroyed(QObject *)\nThis method is protected and can only be called from inside a derived class.", false, &_init_fp_destroyed_1302, &_call_fp_destroyed_1302); + methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QObject::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QObject::disconnectNotify(const char *signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_1731_0, &_call_cbs_disconnectNotify_1731_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_1731_0, &_call_cbs_disconnectNotify_1731_0, &_set_callback_cbs_disconnectNotify_1731_0); methods += new qt_gsi::GenericMethod ("event", "@brief Virtual method bool QObject::event(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0); diff --git a/src/gsiqt/qt5/QtCore/gsiDeclQAbstractAnimation.cc b/src/gsiqt/qt5/QtCore/gsiDeclQAbstractAnimation.cc index d03472499..d952a81b8 100644 --- a/src/gsiqt/qt5/QtCore/gsiDeclQAbstractAnimation.cc +++ b/src/gsiqt/qt5/QtCore/gsiDeclQAbstractAnimation.cc @@ -416,6 +416,7 @@ static gsi::Methods methods_QAbstractAnimation () { methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QAbstractAnimation::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal::target_type & > ("directionChanged(QAbstractAnimation::Direction)", "directionChanged", gsi::arg("arg1"), "@brief Signal declaration for QAbstractAnimation::directionChanged(QAbstractAnimation::Direction)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("finished()", "finished", "@brief Signal declaration for QAbstractAnimation::finished()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QAbstractAnimation::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal::target_type &, const qt_gsi::Converter::target_type & > ("stateChanged(QAbstractAnimation::State, QAbstractAnimation::State)", "stateChanged", gsi::arg("newState"), gsi::arg("oldState"), "@brief Signal declaration for QAbstractAnimation::stateChanged(QAbstractAnimation::State newState, QAbstractAnimation::State oldState)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QAbstractAnimation::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QAbstractAnimation::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); @@ -525,6 +526,13 @@ public: emit QAbstractAnimation::finished(); } + // [emitter impl] void QAbstractAnimation::objectNameChanged(const QString &objectName) + void emitter_QAbstractAnimation_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QAbstractAnimation::objectNameChanged(const QString &objectName)'"); + } + // [emitter impl] void QAbstractAnimation::stateChanged(QAbstractAnimation::State newState, QAbstractAnimation::State oldState) void emitter_QAbstractAnimation_stateChanged_5680(QAbstractAnimation::State newState, QAbstractAnimation::State oldState) { @@ -910,6 +918,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QAbstractAnimation::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QAbstractAnimation_Adaptor *)cls)->emitter_QAbstractAnimation_objectNameChanged_4567 (arg1); +} + + // exposed int QAbstractAnimation::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -1101,6 +1127,7 @@ static gsi::Methods methods_QAbstractAnimation_Adaptor () { methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("emit_finished", "@brief Emitter for signal void QAbstractAnimation::finished()\nCall this method to emit this signal.", false, &_init_emitter_finished_0, &_call_emitter_finished_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QAbstractAnimation::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QAbstractAnimation::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QAbstractAnimation::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QAbstractAnimation::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QAbstractAnimation::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); diff --git a/src/gsiqt/qt5/QtCore/gsiDeclQAbstractEventDispatcher.cc b/src/gsiqt/qt5/QtCore/gsiDeclQAbstractEventDispatcher.cc index 70d7d9ba9..785a314ac 100644 --- a/src/gsiqt/qt5/QtCore/gsiDeclQAbstractEventDispatcher.cc +++ b/src/gsiqt/qt5/QtCore/gsiDeclQAbstractEventDispatcher.cc @@ -502,6 +502,7 @@ static gsi::Methods methods_QAbstractEventDispatcher () { methods += gsi::qt_signal ("aboutToBlock()", "aboutToBlock", "@brief Signal declaration for QAbstractEventDispatcher::aboutToBlock()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("awake()", "awake", "@brief Signal declaration for QAbstractEventDispatcher::awake()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QAbstractEventDispatcher::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QAbstractEventDispatcher::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("instance", "@brief Static method QAbstractEventDispatcher *QAbstractEventDispatcher::instance(QThread *thread)\nThis method is static and can be called without an instance.", &_init_f_instance_1303, &_call_f_instance_1303); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QAbstractEventDispatcher::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QAbstractEventDispatcher::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); @@ -669,6 +670,13 @@ public: } } + // [emitter impl] void QAbstractEventDispatcher::objectNameChanged(const QString &objectName) + void emitter_QAbstractEventDispatcher_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QAbstractEventDispatcher::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] bool QAbstractEventDispatcher::processEvents(QFlags flags) bool cbs_processEvents_3995_0(QFlags flags) { @@ -1196,6 +1204,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QAbstractEventDispatcher::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QAbstractEventDispatcher_Adaptor *)cls)->emitter_QAbstractEventDispatcher_objectNameChanged_4567 (arg1); +} + + // bool QAbstractEventDispatcher::processEvents(QFlags flags) static void _init_cbs_processEvents_3995_0 (qt_gsi::GenericMethod *decl) @@ -1532,6 +1558,7 @@ static gsi::Methods methods_QAbstractEventDispatcher_Adaptor () { methods += new qt_gsi::GenericMethod ("interrupt", "@brief Virtual method void QAbstractEventDispatcher::interrupt()\nThis method can be reimplemented in a derived class.", false, &_init_cbs_interrupt_0_0, &_call_cbs_interrupt_0_0); methods += new qt_gsi::GenericMethod ("interrupt", "@hide", false, &_init_cbs_interrupt_0_0, &_call_cbs_interrupt_0_0, &_set_callback_cbs_interrupt_0_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QAbstractEventDispatcher::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QAbstractEventDispatcher::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("processEvents", "@brief Virtual method bool QAbstractEventDispatcher::processEvents(QFlags flags)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_processEvents_3995_0, &_call_cbs_processEvents_3995_0); methods += new qt_gsi::GenericMethod ("processEvents", "@hide", false, &_init_cbs_processEvents_3995_0, &_call_cbs_processEvents_3995_0, &_set_callback_cbs_processEvents_3995_0); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QAbstractEventDispatcher::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); diff --git a/src/gsiqt/qt5/QtCore/gsiDeclQAbstractItemModel.cc b/src/gsiqt/qt5/QtCore/gsiDeclQAbstractItemModel.cc index e0bcf3f2b..3bf4f913c 100644 --- a/src/gsiqt/qt5/QtCore/gsiDeclQAbstractItemModel.cc +++ b/src/gsiqt/qt5/QtCore/gsiDeclQAbstractItemModel.cc @@ -1093,11 +1093,26 @@ static gsi::Methods methods_QAbstractItemModel () { methods += new qt_gsi::GenericMethod ("submit", "@brief Method bool QAbstractItemModel::submit()\n", false, &_init_f_submit_0, &_call_f_submit_0); methods += new qt_gsi::GenericMethod ("supportedDragActions", "@brief Method QFlags QAbstractItemModel::supportedDragActions()\n", true, &_init_f_supportedDragActions_c0, &_call_f_supportedDragActions_c0); methods += new qt_gsi::GenericMethod ("supportedDropActions", "@brief Method QFlags QAbstractItemModel::supportedDropActions()\n", true, &_init_f_supportedDropActions_c0, &_call_f_supportedDropActions_c0); + methods += gsi::qt_signal ("columnsAboutToBeInserted(const QModelIndex &, int, int)", "columnsAboutToBeInserted", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QAbstractItemModel::columnsAboutToBeInserted(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("columnsAboutToBeMoved(const QModelIndex &, int, int, const QModelIndex &, int)", "columnsAboutToBeMoved", gsi::arg("sourceParent"), gsi::arg("sourceStart"), gsi::arg("sourceEnd"), gsi::arg("destinationParent"), gsi::arg("destinationColumn"), "@brief Signal declaration for QAbstractItemModel::columnsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("columnsAboutToBeRemoved(const QModelIndex &, int, int)", "columnsAboutToBeRemoved", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QAbstractItemModel::columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("columnsInserted(const QModelIndex &, int, int)", "columnsInserted", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QAbstractItemModel::columnsInserted(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("columnsMoved(const QModelIndex &, int, int, const QModelIndex &, int)", "columnsMoved", gsi::arg("parent"), gsi::arg("start"), gsi::arg("end"), gsi::arg("destination"), gsi::arg("column"), "@brief Signal declaration for QAbstractItemModel::columnsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("columnsRemoved(const QModelIndex &, int, int)", "columnsRemoved", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QAbstractItemModel::columnsRemoved(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal & > ("dataChanged(const QModelIndex &, const QModelIndex &, const QVector &)", "dataChanged", gsi::arg("topLeft"), gsi::arg("bottomRight"), gsi::arg("roles"), "@brief Signal declaration for QAbstractItemModel::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector &roles)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QAbstractItemModel::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal::target_type &, int, int > ("headerDataChanged(Qt::Orientation, int, int)", "headerDataChanged", gsi::arg("orientation"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QAbstractItemModel::headerDataChanged(Qt::Orientation orientation, int first, int last)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal &, const qt_gsi::Converter::target_type & > ("layoutAboutToBeChanged(const QList &, QAbstractItemModel::LayoutChangeHint)", "layoutAboutToBeChanged", gsi::arg("parents"), gsi::arg("hint"), "@brief Signal declaration for QAbstractItemModel::layoutAboutToBeChanged(const QList &parents, QAbstractItemModel::LayoutChangeHint hint)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal &, const qt_gsi::Converter::target_type & > ("layoutChanged(const QList &, QAbstractItemModel::LayoutChangeHint)", "layoutChanged", gsi::arg("parents"), gsi::arg("hint"), "@brief Signal declaration for QAbstractItemModel::layoutChanged(const QList &parents, QAbstractItemModel::LayoutChangeHint hint)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("modelAboutToBeReset()", "modelAboutToBeReset", "@brief Signal declaration for QAbstractItemModel::modelAboutToBeReset()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("modelReset()", "modelReset", "@brief Signal declaration for QAbstractItemModel::modelReset()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QAbstractItemModel::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsAboutToBeInserted(const QModelIndex &, int, int)", "rowsAboutToBeInserted", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QAbstractItemModel::rowsAboutToBeInserted(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsAboutToBeMoved(const QModelIndex &, int, int, const QModelIndex &, int)", "rowsAboutToBeMoved", gsi::arg("sourceParent"), gsi::arg("sourceStart"), gsi::arg("sourceEnd"), gsi::arg("destinationParent"), gsi::arg("destinationRow"), "@brief Signal declaration for QAbstractItemModel::rowsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsAboutToBeRemoved(const QModelIndex &, int, int)", "rowsAboutToBeRemoved", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QAbstractItemModel::rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsInserted(const QModelIndex &, int, int)", "rowsInserted", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QAbstractItemModel::rowsInserted(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsMoved(const QModelIndex &, int, int, const QModelIndex &, int)", "rowsMoved", gsi::arg("parent"), gsi::arg("start"), gsi::arg("end"), gsi::arg("destination"), gsi::arg("row"), "@brief Signal declaration for QAbstractItemModel::rowsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsRemoved(const QModelIndex &, int, int)", "rowsRemoved", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QAbstractItemModel::rowsRemoved(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QAbstractItemModel::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QAbstractItemModel::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -1323,6 +1338,64 @@ public: } } + // [emitter impl] void QAbstractItemModel::columnsAboutToBeInserted(const QModelIndex &parent, int first, int last) + void emitter_QAbstractItemModel_columnsAboutToBeInserted_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QAbstractItemModel::columnsAboutToBeInserted(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QAbstractItemModel::columnsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn) + void emitter_QAbstractItemModel_columnsAboutToBeMoved_10318(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn) + { + __SUPPRESS_UNUSED_WARNING (sourceParent); + __SUPPRESS_UNUSED_WARNING (sourceStart); + __SUPPRESS_UNUSED_WARNING (sourceEnd); + __SUPPRESS_UNUSED_WARNING (destinationParent); + __SUPPRESS_UNUSED_WARNING (destinationColumn); + throw tl::Exception ("Can't emit private signal 'void QAbstractItemModel::columnsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn)'"); + } + + // [emitter impl] void QAbstractItemModel::columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last) + void emitter_QAbstractItemModel_columnsAboutToBeRemoved_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QAbstractItemModel::columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QAbstractItemModel::columnsInserted(const QModelIndex &parent, int first, int last) + void emitter_QAbstractItemModel_columnsInserted_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QAbstractItemModel::columnsInserted(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QAbstractItemModel::columnsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column) + void emitter_QAbstractItemModel_columnsMoved_10318(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (start); + __SUPPRESS_UNUSED_WARNING (end); + __SUPPRESS_UNUSED_WARNING (destination); + __SUPPRESS_UNUSED_WARNING (column); + throw tl::Exception ("Can't emit private signal 'void QAbstractItemModel::columnsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column)'"); + } + + // [emitter impl] void QAbstractItemModel::columnsRemoved(const QModelIndex &parent, int first, int last) + void emitter_QAbstractItemModel_columnsRemoved_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QAbstractItemModel::columnsRemoved(const QModelIndex &parent, int first, int last)'"); + } + // [adaptor impl] QVariant QAbstractItemModel::data(const QModelIndex &index, int role) QVariant cbs_data_c3054_1(const QModelIndex &index, int role) const { @@ -1583,6 +1656,18 @@ public: } } + // [emitter impl] void QAbstractItemModel::modelAboutToBeReset() + void emitter_QAbstractItemModel_modelAboutToBeReset_3767() + { + throw tl::Exception ("Can't emit private signal 'void QAbstractItemModel::modelAboutToBeReset()'"); + } + + // [emitter impl] void QAbstractItemModel::modelReset() + void emitter_QAbstractItemModel_modelReset_3767() + { + throw tl::Exception ("Can't emit private signal 'void QAbstractItemModel::modelReset()'"); + } + // [adaptor impl] bool QAbstractItemModel::moveColumns(const QModelIndex &sourceParent, int sourceColumn, int count, const QModelIndex &destinationParent, int destinationChild) bool cbs_moveColumns_6659_0(const QModelIndex &sourceParent, int sourceColumn, int count, const QModelIndex &destinationParent, int destinationChild) { @@ -1613,6 +1698,13 @@ public: } } + // [emitter impl] void QAbstractItemModel::objectNameChanged(const QString &objectName) + void emitter_QAbstractItemModel_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QAbstractItemModel::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QModelIndex QAbstractItemModel::parent(const QModelIndex &child) QModelIndex cbs_parent_c2395_0(const QModelIndex &child) const { @@ -1705,6 +1797,64 @@ public: } } + // [emitter impl] void QAbstractItemModel::rowsAboutToBeInserted(const QModelIndex &parent, int first, int last) + void emitter_QAbstractItemModel_rowsAboutToBeInserted_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QAbstractItemModel::rowsAboutToBeInserted(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QAbstractItemModel::rowsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow) + void emitter_QAbstractItemModel_rowsAboutToBeMoved_10318(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow) + { + __SUPPRESS_UNUSED_WARNING (sourceParent); + __SUPPRESS_UNUSED_WARNING (sourceStart); + __SUPPRESS_UNUSED_WARNING (sourceEnd); + __SUPPRESS_UNUSED_WARNING (destinationParent); + __SUPPRESS_UNUSED_WARNING (destinationRow); + throw tl::Exception ("Can't emit private signal 'void QAbstractItemModel::rowsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow)'"); + } + + // [emitter impl] void QAbstractItemModel::rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last) + void emitter_QAbstractItemModel_rowsAboutToBeRemoved_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QAbstractItemModel::rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QAbstractItemModel::rowsInserted(const QModelIndex &parent, int first, int last) + void emitter_QAbstractItemModel_rowsInserted_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QAbstractItemModel::rowsInserted(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QAbstractItemModel::rowsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row) + void emitter_QAbstractItemModel_rowsMoved_10318(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (start); + __SUPPRESS_UNUSED_WARNING (end); + __SUPPRESS_UNUSED_WARNING (destination); + __SUPPRESS_UNUSED_WARNING (row); + throw tl::Exception ("Can't emit private signal 'void QAbstractItemModel::rowsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row)'"); + } + + // [emitter impl] void QAbstractItemModel::rowsRemoved(const QModelIndex &parent, int first, int last) + void emitter_QAbstractItemModel_rowsRemoved_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QAbstractItemModel::rowsRemoved(const QModelIndex &parent, int first, int last)'"); + } + // [adaptor impl] bool QAbstractItemModel::setData(const QModelIndex &index, const QVariant &value, int role) bool cbs_setData_5065_1(const QModelIndex &index, const QVariant &value, int role) { @@ -2309,6 +2459,162 @@ static void _set_callback_cbs_columnCount_c2395_1 (void *cls, const gsi::Callbac } +// emitter void QAbstractItemModel::columnsAboutToBeInserted(const QModelIndex &parent, int first, int last) + +static void _init_emitter_columnsAboutToBeInserted_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_columnsAboutToBeInserted_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QAbstractItemModel_Adaptor *)cls)->emitter_QAbstractItemModel_columnsAboutToBeInserted_7372 (arg1, arg2, arg3); +} + + +// emitter void QAbstractItemModel::columnsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn) + +static void _init_emitter_columnsAboutToBeMoved_10318 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("sourceParent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("sourceStart"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("sourceEnd"); + decl->add_arg (argspec_2); + static gsi::ArgSpecBase argspec_3 ("destinationParent"); + decl->add_arg (argspec_3); + static gsi::ArgSpecBase argspec_4 ("destinationColumn"); + decl->add_arg (argspec_4); + decl->set_return (); +} + +static void _call_emitter_columnsAboutToBeMoved_10318 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + const QModelIndex &arg4 = gsi::arg_reader() (args, heap); + int arg5 = gsi::arg_reader() (args, heap); + ((QAbstractItemModel_Adaptor *)cls)->emitter_QAbstractItemModel_columnsAboutToBeMoved_10318 (arg1, arg2, arg3, arg4, arg5); +} + + +// emitter void QAbstractItemModel::columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last) + +static void _init_emitter_columnsAboutToBeRemoved_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_columnsAboutToBeRemoved_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QAbstractItemModel_Adaptor *)cls)->emitter_QAbstractItemModel_columnsAboutToBeRemoved_7372 (arg1, arg2, arg3); +} + + +// emitter void QAbstractItemModel::columnsInserted(const QModelIndex &parent, int first, int last) + +static void _init_emitter_columnsInserted_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_columnsInserted_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QAbstractItemModel_Adaptor *)cls)->emitter_QAbstractItemModel_columnsInserted_7372 (arg1, arg2, arg3); +} + + +// emitter void QAbstractItemModel::columnsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column) + +static void _init_emitter_columnsMoved_10318 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("start"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("end"); + decl->add_arg (argspec_2); + static gsi::ArgSpecBase argspec_3 ("destination"); + decl->add_arg (argspec_3); + static gsi::ArgSpecBase argspec_4 ("column"); + decl->add_arg (argspec_4); + decl->set_return (); +} + +static void _call_emitter_columnsMoved_10318 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + const QModelIndex &arg4 = gsi::arg_reader() (args, heap); + int arg5 = gsi::arg_reader() (args, heap); + ((QAbstractItemModel_Adaptor *)cls)->emitter_QAbstractItemModel_columnsMoved_10318 (arg1, arg2, arg3, arg4, arg5); +} + + +// emitter void QAbstractItemModel::columnsRemoved(const QModelIndex &parent, int first, int last) + +static void _init_emitter_columnsRemoved_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_columnsRemoved_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QAbstractItemModel_Adaptor *)cls)->emitter_QAbstractItemModel_columnsRemoved_7372 (arg1, arg2, arg3); +} + + // exposed QModelIndex QAbstractItemModel::createIndex(int row, int column, void *data) static void _init_fp_createIndex_c2374 (qt_gsi::GenericMethod *decl) @@ -3081,6 +3387,34 @@ static void _set_callback_cbs_mimeTypes_c0_0 (void *cls, const gsi::Callback &cb } +// emitter void QAbstractItemModel::modelAboutToBeReset() + +static void _init_emitter_modelAboutToBeReset_3767 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_emitter_modelAboutToBeReset_3767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + ((QAbstractItemModel_Adaptor *)cls)->emitter_QAbstractItemModel_modelAboutToBeReset_3767 (); +} + + +// emitter void QAbstractItemModel::modelReset() + +static void _init_emitter_modelReset_3767 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_emitter_modelReset_3767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + ((QAbstractItemModel_Adaptor *)cls)->emitter_QAbstractItemModel_modelReset_3767 (); +} + + // bool QAbstractItemModel::moveColumns(const QModelIndex &sourceParent, int sourceColumn, int count, const QModelIndex &destinationParent, int destinationChild) static void _init_cbs_moveColumns_6659_0 (qt_gsi::GenericMethod *decl) @@ -3151,6 +3485,24 @@ static void _set_callback_cbs_moveRows_6659_0 (void *cls, const gsi::Callback &c } +// emitter void QAbstractItemModel::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QAbstractItemModel_Adaptor *)cls)->emitter_QAbstractItemModel_objectNameChanged_4567 (arg1); +} + + // QModelIndex QAbstractItemModel::parent(const QModelIndex &child) static void _init_cbs_parent_c2395_0 (qt_gsi::GenericMethod *decl) @@ -3341,6 +3693,162 @@ static void _set_callback_cbs_rowCount_c2395_1 (void *cls, const gsi::Callback & } +// emitter void QAbstractItemModel::rowsAboutToBeInserted(const QModelIndex &parent, int first, int last) + +static void _init_emitter_rowsAboutToBeInserted_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_rowsAboutToBeInserted_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QAbstractItemModel_Adaptor *)cls)->emitter_QAbstractItemModel_rowsAboutToBeInserted_7372 (arg1, arg2, arg3); +} + + +// emitter void QAbstractItemModel::rowsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow) + +static void _init_emitter_rowsAboutToBeMoved_10318 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("sourceParent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("sourceStart"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("sourceEnd"); + decl->add_arg (argspec_2); + static gsi::ArgSpecBase argspec_3 ("destinationParent"); + decl->add_arg (argspec_3); + static gsi::ArgSpecBase argspec_4 ("destinationRow"); + decl->add_arg (argspec_4); + decl->set_return (); +} + +static void _call_emitter_rowsAboutToBeMoved_10318 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + const QModelIndex &arg4 = gsi::arg_reader() (args, heap); + int arg5 = gsi::arg_reader() (args, heap); + ((QAbstractItemModel_Adaptor *)cls)->emitter_QAbstractItemModel_rowsAboutToBeMoved_10318 (arg1, arg2, arg3, arg4, arg5); +} + + +// emitter void QAbstractItemModel::rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last) + +static void _init_emitter_rowsAboutToBeRemoved_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_rowsAboutToBeRemoved_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QAbstractItemModel_Adaptor *)cls)->emitter_QAbstractItemModel_rowsAboutToBeRemoved_7372 (arg1, arg2, arg3); +} + + +// emitter void QAbstractItemModel::rowsInserted(const QModelIndex &parent, int first, int last) + +static void _init_emitter_rowsInserted_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_rowsInserted_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QAbstractItemModel_Adaptor *)cls)->emitter_QAbstractItemModel_rowsInserted_7372 (arg1, arg2, arg3); +} + + +// emitter void QAbstractItemModel::rowsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row) + +static void _init_emitter_rowsMoved_10318 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("start"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("end"); + decl->add_arg (argspec_2); + static gsi::ArgSpecBase argspec_3 ("destination"); + decl->add_arg (argspec_3); + static gsi::ArgSpecBase argspec_4 ("row"); + decl->add_arg (argspec_4); + decl->set_return (); +} + +static void _call_emitter_rowsMoved_10318 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + const QModelIndex &arg4 = gsi::arg_reader() (args, heap); + int arg5 = gsi::arg_reader() (args, heap); + ((QAbstractItemModel_Adaptor *)cls)->emitter_QAbstractItemModel_rowsMoved_10318 (arg1, arg2, arg3, arg4, arg5); +} + + +// emitter void QAbstractItemModel::rowsRemoved(const QModelIndex &parent, int first, int last) + +static void _init_emitter_rowsRemoved_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_rowsRemoved_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QAbstractItemModel_Adaptor *)cls)->emitter_QAbstractItemModel_rowsRemoved_7372 (arg1, arg2, arg3); +} + + // exposed QObject *QAbstractItemModel::sender() static void _init_fp_sender_c0 (qt_gsi::GenericMethod *decl) @@ -3643,6 +4151,12 @@ static gsi::Methods methods_QAbstractItemModel_Adaptor () { methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("columnCount", "@brief Virtual method int QAbstractItemModel::columnCount(const QModelIndex &parent)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_columnCount_c2395_1, &_call_cbs_columnCount_c2395_1); methods += new qt_gsi::GenericMethod ("columnCount", "@hide", true, &_init_cbs_columnCount_c2395_1, &_call_cbs_columnCount_c2395_1, &_set_callback_cbs_columnCount_c2395_1); + methods += new qt_gsi::GenericMethod ("emit_columnsAboutToBeInserted", "@brief Emitter for signal void QAbstractItemModel::columnsAboutToBeInserted(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_columnsAboutToBeInserted_7372, &_call_emitter_columnsAboutToBeInserted_7372); + methods += new qt_gsi::GenericMethod ("emit_columnsAboutToBeMoved", "@brief Emitter for signal void QAbstractItemModel::columnsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn)\nCall this method to emit this signal.", false, &_init_emitter_columnsAboutToBeMoved_10318, &_call_emitter_columnsAboutToBeMoved_10318); + methods += new qt_gsi::GenericMethod ("emit_columnsAboutToBeRemoved", "@brief Emitter for signal void QAbstractItemModel::columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_columnsAboutToBeRemoved_7372, &_call_emitter_columnsAboutToBeRemoved_7372); + methods += new qt_gsi::GenericMethod ("emit_columnsInserted", "@brief Emitter for signal void QAbstractItemModel::columnsInserted(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_columnsInserted_7372, &_call_emitter_columnsInserted_7372); + methods += new qt_gsi::GenericMethod ("emit_columnsMoved", "@brief Emitter for signal void QAbstractItemModel::columnsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column)\nCall this method to emit this signal.", false, &_init_emitter_columnsMoved_10318, &_call_emitter_columnsMoved_10318); + methods += new qt_gsi::GenericMethod ("emit_columnsRemoved", "@brief Emitter for signal void QAbstractItemModel::columnsRemoved(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_columnsRemoved_7372, &_call_emitter_columnsRemoved_7372); methods += new qt_gsi::GenericMethod ("*createIndex", "@brief Method QModelIndex QAbstractItemModel::createIndex(int row, int column, void *data)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_createIndex_c2374, &_call_fp_createIndex_c2374); methods += new qt_gsi::GenericMethod ("*createIndex", "@brief Method QModelIndex QAbstractItemModel::createIndex(int row, int column, quintptr id)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_createIndex_c2657, &_call_fp_createIndex_c2657); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QAbstractItemModel::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); @@ -3694,10 +4208,13 @@ static gsi::Methods methods_QAbstractItemModel_Adaptor () { methods += new qt_gsi::GenericMethod ("mimeData", "@hide", true, &_init_cbs_mimeData_c3010_0, &_call_cbs_mimeData_c3010_0, &_set_callback_cbs_mimeData_c3010_0); methods += new qt_gsi::GenericMethod ("mimeTypes", "@brief Virtual method QStringList QAbstractItemModel::mimeTypes()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_mimeTypes_c0_0, &_call_cbs_mimeTypes_c0_0); methods += new qt_gsi::GenericMethod ("mimeTypes", "@hide", true, &_init_cbs_mimeTypes_c0_0, &_call_cbs_mimeTypes_c0_0, &_set_callback_cbs_mimeTypes_c0_0); + methods += new qt_gsi::GenericMethod ("emit_modelAboutToBeReset", "@brief Emitter for signal void QAbstractItemModel::modelAboutToBeReset()\nCall this method to emit this signal.", false, &_init_emitter_modelAboutToBeReset_3767, &_call_emitter_modelAboutToBeReset_3767); + methods += new qt_gsi::GenericMethod ("emit_modelReset", "@brief Emitter for signal void QAbstractItemModel::modelReset()\nCall this method to emit this signal.", false, &_init_emitter_modelReset_3767, &_call_emitter_modelReset_3767); methods += new qt_gsi::GenericMethod ("moveColumns", "@brief Virtual method bool QAbstractItemModel::moveColumns(const QModelIndex &sourceParent, int sourceColumn, int count, const QModelIndex &destinationParent, int destinationChild)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_moveColumns_6659_0, &_call_cbs_moveColumns_6659_0); methods += new qt_gsi::GenericMethod ("moveColumns", "@hide", false, &_init_cbs_moveColumns_6659_0, &_call_cbs_moveColumns_6659_0, &_set_callback_cbs_moveColumns_6659_0); methods += new qt_gsi::GenericMethod ("moveRows", "@brief Virtual method bool QAbstractItemModel::moveRows(const QModelIndex &sourceParent, int sourceRow, int count, const QModelIndex &destinationParent, int destinationChild)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_moveRows_6659_0, &_call_cbs_moveRows_6659_0); methods += new qt_gsi::GenericMethod ("moveRows", "@hide", false, &_init_cbs_moveRows_6659_0, &_call_cbs_moveRows_6659_0, &_set_callback_cbs_moveRows_6659_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QAbstractItemModel::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("parent", "@brief Virtual method QModelIndex QAbstractItemModel::parent(const QModelIndex &child)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_parent_c2395_0, &_call_cbs_parent_c2395_0); methods += new qt_gsi::GenericMethod ("parent", "@hide", true, &_init_cbs_parent_c2395_0, &_call_cbs_parent_c2395_0, &_set_callback_cbs_parent_c2395_0); methods += new qt_gsi::GenericMethod ("*persistentIndexList", "@brief Method QList QAbstractItemModel::persistentIndexList()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_persistentIndexList_c0, &_call_fp_persistentIndexList_c0); @@ -3713,6 +4230,12 @@ static gsi::Methods methods_QAbstractItemModel_Adaptor () { methods += new qt_gsi::GenericMethod ("roleNames", "@hide", true, &_init_cbs_roleNames_c0_0, &_call_cbs_roleNames_c0_0, &_set_callback_cbs_roleNames_c0_0); methods += new qt_gsi::GenericMethod ("rowCount", "@brief Virtual method int QAbstractItemModel::rowCount(const QModelIndex &parent)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_rowCount_c2395_1, &_call_cbs_rowCount_c2395_1); methods += new qt_gsi::GenericMethod ("rowCount", "@hide", true, &_init_cbs_rowCount_c2395_1, &_call_cbs_rowCount_c2395_1, &_set_callback_cbs_rowCount_c2395_1); + methods += new qt_gsi::GenericMethod ("emit_rowsAboutToBeInserted", "@brief Emitter for signal void QAbstractItemModel::rowsAboutToBeInserted(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_rowsAboutToBeInserted_7372, &_call_emitter_rowsAboutToBeInserted_7372); + methods += new qt_gsi::GenericMethod ("emit_rowsAboutToBeMoved", "@brief Emitter for signal void QAbstractItemModel::rowsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow)\nCall this method to emit this signal.", false, &_init_emitter_rowsAboutToBeMoved_10318, &_call_emitter_rowsAboutToBeMoved_10318); + methods += new qt_gsi::GenericMethod ("emit_rowsAboutToBeRemoved", "@brief Emitter for signal void QAbstractItemModel::rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_rowsAboutToBeRemoved_7372, &_call_emitter_rowsAboutToBeRemoved_7372); + methods += new qt_gsi::GenericMethod ("emit_rowsInserted", "@brief Emitter for signal void QAbstractItemModel::rowsInserted(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_rowsInserted_7372, &_call_emitter_rowsInserted_7372); + methods += new qt_gsi::GenericMethod ("emit_rowsMoved", "@brief Emitter for signal void QAbstractItemModel::rowsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row)\nCall this method to emit this signal.", false, &_init_emitter_rowsMoved_10318, &_call_emitter_rowsMoved_10318); + methods += new qt_gsi::GenericMethod ("emit_rowsRemoved", "@brief Emitter for signal void QAbstractItemModel::rowsRemoved(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_rowsRemoved_7372, &_call_emitter_rowsRemoved_7372); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QAbstractItemModel::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QAbstractItemModel::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); methods += new qt_gsi::GenericMethod ("setData", "@brief Virtual method bool QAbstractItemModel::setData(const QModelIndex &index, const QVariant &value, int role)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_setData_5065_1, &_call_cbs_setData_5065_1); diff --git a/src/gsiqt/qt5/QtCore/gsiDeclQAbstractListModel.cc b/src/gsiqt/qt5/QtCore/gsiDeclQAbstractListModel.cc index e82fcf11b..1e5a33e29 100644 --- a/src/gsiqt/qt5/QtCore/gsiDeclQAbstractListModel.cc +++ b/src/gsiqt/qt5/QtCore/gsiDeclQAbstractListModel.cc @@ -236,11 +236,26 @@ static gsi::Methods methods_QAbstractListModel () { methods += new qt_gsi::GenericMethod ("index", "@brief Method QModelIndex QAbstractListModel::index(int row, int column, const QModelIndex &parent)\nThis is a reimplementation of QAbstractItemModel::index", true, &_init_f_index_c3713, &_call_f_index_c3713); methods += new qt_gsi::GenericMethod (":parent", "@brief Method QObject *QAbstractListModel::parent()\n", true, &_init_f_parent_c0, &_call_f_parent_c0); methods += new qt_gsi::GenericMethod ("sibling", "@brief Method QModelIndex QAbstractListModel::sibling(int row, int column, const QModelIndex &idx)\nThis is a reimplementation of QAbstractItemModel::sibling", true, &_init_f_sibling_c3713, &_call_f_sibling_c3713); + methods += gsi::qt_signal ("columnsAboutToBeInserted(const QModelIndex &, int, int)", "columnsAboutToBeInserted", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QAbstractListModel::columnsAboutToBeInserted(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("columnsAboutToBeMoved(const QModelIndex &, int, int, const QModelIndex &, int)", "columnsAboutToBeMoved", gsi::arg("sourceParent"), gsi::arg("sourceStart"), gsi::arg("sourceEnd"), gsi::arg("destinationParent"), gsi::arg("destinationColumn"), "@brief Signal declaration for QAbstractListModel::columnsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("columnsAboutToBeRemoved(const QModelIndex &, int, int)", "columnsAboutToBeRemoved", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QAbstractListModel::columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("columnsInserted(const QModelIndex &, int, int)", "columnsInserted", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QAbstractListModel::columnsInserted(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("columnsMoved(const QModelIndex &, int, int, const QModelIndex &, int)", "columnsMoved", gsi::arg("parent"), gsi::arg("start"), gsi::arg("end"), gsi::arg("destination"), gsi::arg("column"), "@brief Signal declaration for QAbstractListModel::columnsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("columnsRemoved(const QModelIndex &, int, int)", "columnsRemoved", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QAbstractListModel::columnsRemoved(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal & > ("dataChanged(const QModelIndex &, const QModelIndex &, const QVector &)", "dataChanged", gsi::arg("topLeft"), gsi::arg("bottomRight"), gsi::arg("roles"), "@brief Signal declaration for QAbstractListModel::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector &roles)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QAbstractListModel::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal::target_type &, int, int > ("headerDataChanged(Qt::Orientation, int, int)", "headerDataChanged", gsi::arg("orientation"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QAbstractListModel::headerDataChanged(Qt::Orientation orientation, int first, int last)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal &, const qt_gsi::Converter::target_type & > ("layoutAboutToBeChanged(const QList &, QAbstractItemModel::LayoutChangeHint)", "layoutAboutToBeChanged", gsi::arg("parents"), gsi::arg("hint"), "@brief Signal declaration for QAbstractListModel::layoutAboutToBeChanged(const QList &parents, QAbstractItemModel::LayoutChangeHint hint)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal &, const qt_gsi::Converter::target_type & > ("layoutChanged(const QList &, QAbstractItemModel::LayoutChangeHint)", "layoutChanged", gsi::arg("parents"), gsi::arg("hint"), "@brief Signal declaration for QAbstractListModel::layoutChanged(const QList &parents, QAbstractItemModel::LayoutChangeHint hint)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("modelAboutToBeReset()", "modelAboutToBeReset", "@brief Signal declaration for QAbstractListModel::modelAboutToBeReset()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("modelReset()", "modelReset", "@brief Signal declaration for QAbstractListModel::modelReset()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QAbstractListModel::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsAboutToBeInserted(const QModelIndex &, int, int)", "rowsAboutToBeInserted", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QAbstractListModel::rowsAboutToBeInserted(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsAboutToBeMoved(const QModelIndex &, int, int, const QModelIndex &, int)", "rowsAboutToBeMoved", gsi::arg("sourceParent"), gsi::arg("sourceStart"), gsi::arg("sourceEnd"), gsi::arg("destinationParent"), gsi::arg("destinationRow"), "@brief Signal declaration for QAbstractListModel::rowsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsAboutToBeRemoved(const QModelIndex &, int, int)", "rowsAboutToBeRemoved", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QAbstractListModel::rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsInserted(const QModelIndex &, int, int)", "rowsInserted", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QAbstractListModel::rowsInserted(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsMoved(const QModelIndex &, int, int, const QModelIndex &, int)", "rowsMoved", gsi::arg("parent"), gsi::arg("start"), gsi::arg("end"), gsi::arg("destination"), gsi::arg("row"), "@brief Signal declaration for QAbstractListModel::rowsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsRemoved(const QModelIndex &, int, int)", "rowsRemoved", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QAbstractListModel::rowsRemoved(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QAbstractListModel::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QAbstractListModel::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -450,6 +465,64 @@ public: } } + // [emitter impl] void QAbstractListModel::columnsAboutToBeInserted(const QModelIndex &parent, int first, int last) + void emitter_QAbstractListModel_columnsAboutToBeInserted_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QAbstractListModel::columnsAboutToBeInserted(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QAbstractListModel::columnsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn) + void emitter_QAbstractListModel_columnsAboutToBeMoved_10318(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn) + { + __SUPPRESS_UNUSED_WARNING (sourceParent); + __SUPPRESS_UNUSED_WARNING (sourceStart); + __SUPPRESS_UNUSED_WARNING (sourceEnd); + __SUPPRESS_UNUSED_WARNING (destinationParent); + __SUPPRESS_UNUSED_WARNING (destinationColumn); + throw tl::Exception ("Can't emit private signal 'void QAbstractListModel::columnsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn)'"); + } + + // [emitter impl] void QAbstractListModel::columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last) + void emitter_QAbstractListModel_columnsAboutToBeRemoved_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QAbstractListModel::columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QAbstractListModel::columnsInserted(const QModelIndex &parent, int first, int last) + void emitter_QAbstractListModel_columnsInserted_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QAbstractListModel::columnsInserted(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QAbstractListModel::columnsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column) + void emitter_QAbstractListModel_columnsMoved_10318(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (start); + __SUPPRESS_UNUSED_WARNING (end); + __SUPPRESS_UNUSED_WARNING (destination); + __SUPPRESS_UNUSED_WARNING (column); + throw tl::Exception ("Can't emit private signal 'void QAbstractListModel::columnsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column)'"); + } + + // [emitter impl] void QAbstractListModel::columnsRemoved(const QModelIndex &parent, int first, int last) + void emitter_QAbstractListModel_columnsRemoved_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QAbstractListModel::columnsRemoved(const QModelIndex &parent, int first, int last)'"); + } + // [adaptor impl] QVariant QAbstractListModel::data(const QModelIndex &index, int role) QVariant cbs_data_c3054_1(const QModelIndex &index, int role) const { @@ -692,6 +765,18 @@ public: } } + // [emitter impl] void QAbstractListModel::modelAboutToBeReset() + void emitter_QAbstractListModel_modelAboutToBeReset_3767() + { + throw tl::Exception ("Can't emit private signal 'void QAbstractListModel::modelAboutToBeReset()'"); + } + + // [emitter impl] void QAbstractListModel::modelReset() + void emitter_QAbstractListModel_modelReset_3767() + { + throw tl::Exception ("Can't emit private signal 'void QAbstractListModel::modelReset()'"); + } + // [adaptor impl] bool QAbstractListModel::moveColumns(const QModelIndex &sourceParent, int sourceColumn, int count, const QModelIndex &destinationParent, int destinationChild) bool cbs_moveColumns_6659_0(const QModelIndex &sourceParent, int sourceColumn, int count, const QModelIndex &destinationParent, int destinationChild) { @@ -722,6 +807,13 @@ public: } } + // [emitter impl] void QAbstractListModel::objectNameChanged(const QString &objectName) + void emitter_QAbstractListModel_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QAbstractListModel::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] bool QAbstractListModel::removeColumns(int column, int count, const QModelIndex &parent) bool cbs_removeColumns_3713_1(int column, int count, const QModelIndex &parent) { @@ -798,6 +890,64 @@ public: } } + // [emitter impl] void QAbstractListModel::rowsAboutToBeInserted(const QModelIndex &parent, int first, int last) + void emitter_QAbstractListModel_rowsAboutToBeInserted_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QAbstractListModel::rowsAboutToBeInserted(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QAbstractListModel::rowsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow) + void emitter_QAbstractListModel_rowsAboutToBeMoved_10318(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow) + { + __SUPPRESS_UNUSED_WARNING (sourceParent); + __SUPPRESS_UNUSED_WARNING (sourceStart); + __SUPPRESS_UNUSED_WARNING (sourceEnd); + __SUPPRESS_UNUSED_WARNING (destinationParent); + __SUPPRESS_UNUSED_WARNING (destinationRow); + throw tl::Exception ("Can't emit private signal 'void QAbstractListModel::rowsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow)'"); + } + + // [emitter impl] void QAbstractListModel::rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last) + void emitter_QAbstractListModel_rowsAboutToBeRemoved_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QAbstractListModel::rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QAbstractListModel::rowsInserted(const QModelIndex &parent, int first, int last) + void emitter_QAbstractListModel_rowsInserted_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QAbstractListModel::rowsInserted(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QAbstractListModel::rowsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row) + void emitter_QAbstractListModel_rowsMoved_10318(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (start); + __SUPPRESS_UNUSED_WARNING (end); + __SUPPRESS_UNUSED_WARNING (destination); + __SUPPRESS_UNUSED_WARNING (row); + throw tl::Exception ("Can't emit private signal 'void QAbstractListModel::rowsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row)'"); + } + + // [emitter impl] void QAbstractListModel::rowsRemoved(const QModelIndex &parent, int first, int last) + void emitter_QAbstractListModel_rowsRemoved_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QAbstractListModel::rowsRemoved(const QModelIndex &parent, int first, int last)'"); + } + // [adaptor impl] bool QAbstractListModel::setData(const QModelIndex &index, const QVariant &value, int role) bool cbs_setData_5065_1(const QModelIndex &index, const QVariant &value, int role) { @@ -1376,6 +1526,162 @@ static void _set_callback_cbs_childEvent_1701_0 (void *cls, const gsi::Callback } +// emitter void QAbstractListModel::columnsAboutToBeInserted(const QModelIndex &parent, int first, int last) + +static void _init_emitter_columnsAboutToBeInserted_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_columnsAboutToBeInserted_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QAbstractListModel_Adaptor *)cls)->emitter_QAbstractListModel_columnsAboutToBeInserted_7372 (arg1, arg2, arg3); +} + + +// emitter void QAbstractListModel::columnsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn) + +static void _init_emitter_columnsAboutToBeMoved_10318 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("sourceParent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("sourceStart"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("sourceEnd"); + decl->add_arg (argspec_2); + static gsi::ArgSpecBase argspec_3 ("destinationParent"); + decl->add_arg (argspec_3); + static gsi::ArgSpecBase argspec_4 ("destinationColumn"); + decl->add_arg (argspec_4); + decl->set_return (); +} + +static void _call_emitter_columnsAboutToBeMoved_10318 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + const QModelIndex &arg4 = gsi::arg_reader() (args, heap); + int arg5 = gsi::arg_reader() (args, heap); + ((QAbstractListModel_Adaptor *)cls)->emitter_QAbstractListModel_columnsAboutToBeMoved_10318 (arg1, arg2, arg3, arg4, arg5); +} + + +// emitter void QAbstractListModel::columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last) + +static void _init_emitter_columnsAboutToBeRemoved_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_columnsAboutToBeRemoved_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QAbstractListModel_Adaptor *)cls)->emitter_QAbstractListModel_columnsAboutToBeRemoved_7372 (arg1, arg2, arg3); +} + + +// emitter void QAbstractListModel::columnsInserted(const QModelIndex &parent, int first, int last) + +static void _init_emitter_columnsInserted_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_columnsInserted_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QAbstractListModel_Adaptor *)cls)->emitter_QAbstractListModel_columnsInserted_7372 (arg1, arg2, arg3); +} + + +// emitter void QAbstractListModel::columnsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column) + +static void _init_emitter_columnsMoved_10318 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("start"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("end"); + decl->add_arg (argspec_2); + static gsi::ArgSpecBase argspec_3 ("destination"); + decl->add_arg (argspec_3); + static gsi::ArgSpecBase argspec_4 ("column"); + decl->add_arg (argspec_4); + decl->set_return (); +} + +static void _call_emitter_columnsMoved_10318 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + const QModelIndex &arg4 = gsi::arg_reader() (args, heap); + int arg5 = gsi::arg_reader() (args, heap); + ((QAbstractListModel_Adaptor *)cls)->emitter_QAbstractListModel_columnsMoved_10318 (arg1, arg2, arg3, arg4, arg5); +} + + +// emitter void QAbstractListModel::columnsRemoved(const QModelIndex &parent, int first, int last) + +static void _init_emitter_columnsRemoved_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_columnsRemoved_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QAbstractListModel_Adaptor *)cls)->emitter_QAbstractListModel_columnsRemoved_7372 (arg1, arg2, arg3); +} + + // exposed QModelIndex QAbstractListModel::createIndex(int row, int column, void *data) static void _init_fp_createIndex_c2374 (qt_gsi::GenericMethod *decl) @@ -2125,6 +2431,34 @@ static void _set_callback_cbs_mimeTypes_c0_0 (void *cls, const gsi::Callback &cb } +// emitter void QAbstractListModel::modelAboutToBeReset() + +static void _init_emitter_modelAboutToBeReset_3767 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_emitter_modelAboutToBeReset_3767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + ((QAbstractListModel_Adaptor *)cls)->emitter_QAbstractListModel_modelAboutToBeReset_3767 (); +} + + +// emitter void QAbstractListModel::modelReset() + +static void _init_emitter_modelReset_3767 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_emitter_modelReset_3767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + ((QAbstractListModel_Adaptor *)cls)->emitter_QAbstractListModel_modelReset_3767 (); +} + + // bool QAbstractListModel::moveColumns(const QModelIndex &sourceParent, int sourceColumn, int count, const QModelIndex &destinationParent, int destinationChild) static void _init_cbs_moveColumns_6659_0 (qt_gsi::GenericMethod *decl) @@ -2195,6 +2529,24 @@ static void _set_callback_cbs_moveRows_6659_0 (void *cls, const gsi::Callback &c } +// emitter void QAbstractListModel::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QAbstractListModel_Adaptor *)cls)->emitter_QAbstractListModel_objectNameChanged_4567 (arg1); +} + + // exposed QList QAbstractListModel::persistentIndexList() static void _init_fp_persistentIndexList_c0 (qt_gsi::GenericMethod *decl) @@ -2362,6 +2714,162 @@ static void _set_callback_cbs_rowCount_c2395_1 (void *cls, const gsi::Callback & } +// emitter void QAbstractListModel::rowsAboutToBeInserted(const QModelIndex &parent, int first, int last) + +static void _init_emitter_rowsAboutToBeInserted_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_rowsAboutToBeInserted_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QAbstractListModel_Adaptor *)cls)->emitter_QAbstractListModel_rowsAboutToBeInserted_7372 (arg1, arg2, arg3); +} + + +// emitter void QAbstractListModel::rowsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow) + +static void _init_emitter_rowsAboutToBeMoved_10318 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("sourceParent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("sourceStart"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("sourceEnd"); + decl->add_arg (argspec_2); + static gsi::ArgSpecBase argspec_3 ("destinationParent"); + decl->add_arg (argspec_3); + static gsi::ArgSpecBase argspec_4 ("destinationRow"); + decl->add_arg (argspec_4); + decl->set_return (); +} + +static void _call_emitter_rowsAboutToBeMoved_10318 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + const QModelIndex &arg4 = gsi::arg_reader() (args, heap); + int arg5 = gsi::arg_reader() (args, heap); + ((QAbstractListModel_Adaptor *)cls)->emitter_QAbstractListModel_rowsAboutToBeMoved_10318 (arg1, arg2, arg3, arg4, arg5); +} + + +// emitter void QAbstractListModel::rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last) + +static void _init_emitter_rowsAboutToBeRemoved_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_rowsAboutToBeRemoved_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QAbstractListModel_Adaptor *)cls)->emitter_QAbstractListModel_rowsAboutToBeRemoved_7372 (arg1, arg2, arg3); +} + + +// emitter void QAbstractListModel::rowsInserted(const QModelIndex &parent, int first, int last) + +static void _init_emitter_rowsInserted_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_rowsInserted_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QAbstractListModel_Adaptor *)cls)->emitter_QAbstractListModel_rowsInserted_7372 (arg1, arg2, arg3); +} + + +// emitter void QAbstractListModel::rowsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row) + +static void _init_emitter_rowsMoved_10318 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("start"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("end"); + decl->add_arg (argspec_2); + static gsi::ArgSpecBase argspec_3 ("destination"); + decl->add_arg (argspec_3); + static gsi::ArgSpecBase argspec_4 ("row"); + decl->add_arg (argspec_4); + decl->set_return (); +} + +static void _call_emitter_rowsMoved_10318 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + const QModelIndex &arg4 = gsi::arg_reader() (args, heap); + int arg5 = gsi::arg_reader() (args, heap); + ((QAbstractListModel_Adaptor *)cls)->emitter_QAbstractListModel_rowsMoved_10318 (arg1, arg2, arg3, arg4, arg5); +} + + +// emitter void QAbstractListModel::rowsRemoved(const QModelIndex &parent, int first, int last) + +static void _init_emitter_rowsRemoved_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_rowsRemoved_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QAbstractListModel_Adaptor *)cls)->emitter_QAbstractListModel_rowsRemoved_7372 (arg1, arg2, arg3); +} + + // exposed QObject *QAbstractListModel::sender() static void _init_fp_sender_c0 (qt_gsi::GenericMethod *decl) @@ -2662,6 +3170,12 @@ static gsi::Methods methods_QAbstractListModel_Adaptor () { methods += new qt_gsi::GenericMethod ("*changePersistentIndexList", "@brief Method void QAbstractListModel::changePersistentIndexList(const QList &from, const QList &to)\nThis method is protected and can only be called from inside a derived class.", false, &_init_fp_changePersistentIndexList_5912, &_call_fp_changePersistentIndexList_5912); methods += new qt_gsi::GenericMethod ("*childEvent", "@brief Virtual method void QAbstractListModel::childEvent(QChildEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); + methods += new qt_gsi::GenericMethod ("emit_columnsAboutToBeInserted", "@brief Emitter for signal void QAbstractListModel::columnsAboutToBeInserted(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_columnsAboutToBeInserted_7372, &_call_emitter_columnsAboutToBeInserted_7372); + methods += new qt_gsi::GenericMethod ("emit_columnsAboutToBeMoved", "@brief Emitter for signal void QAbstractListModel::columnsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn)\nCall this method to emit this signal.", false, &_init_emitter_columnsAboutToBeMoved_10318, &_call_emitter_columnsAboutToBeMoved_10318); + methods += new qt_gsi::GenericMethod ("emit_columnsAboutToBeRemoved", "@brief Emitter for signal void QAbstractListModel::columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_columnsAboutToBeRemoved_7372, &_call_emitter_columnsAboutToBeRemoved_7372); + methods += new qt_gsi::GenericMethod ("emit_columnsInserted", "@brief Emitter for signal void QAbstractListModel::columnsInserted(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_columnsInserted_7372, &_call_emitter_columnsInserted_7372); + methods += new qt_gsi::GenericMethod ("emit_columnsMoved", "@brief Emitter for signal void QAbstractListModel::columnsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column)\nCall this method to emit this signal.", false, &_init_emitter_columnsMoved_10318, &_call_emitter_columnsMoved_10318); + methods += new qt_gsi::GenericMethod ("emit_columnsRemoved", "@brief Emitter for signal void QAbstractListModel::columnsRemoved(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_columnsRemoved_7372, &_call_emitter_columnsRemoved_7372); methods += new qt_gsi::GenericMethod ("*createIndex", "@brief Method QModelIndex QAbstractListModel::createIndex(int row, int column, void *data)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_createIndex_c2374, &_call_fp_createIndex_c2374); methods += new qt_gsi::GenericMethod ("*createIndex", "@brief Method QModelIndex QAbstractListModel::createIndex(int row, int column, quintptr id)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_createIndex_c2657, &_call_fp_createIndex_c2657); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QAbstractListModel::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); @@ -2711,10 +3225,13 @@ static gsi::Methods methods_QAbstractListModel_Adaptor () { methods += new qt_gsi::GenericMethod ("mimeData", "@hide", true, &_init_cbs_mimeData_c3010_0, &_call_cbs_mimeData_c3010_0, &_set_callback_cbs_mimeData_c3010_0); methods += new qt_gsi::GenericMethod ("mimeTypes", "@brief Virtual method QStringList QAbstractListModel::mimeTypes()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_mimeTypes_c0_0, &_call_cbs_mimeTypes_c0_0); methods += new qt_gsi::GenericMethod ("mimeTypes", "@hide", true, &_init_cbs_mimeTypes_c0_0, &_call_cbs_mimeTypes_c0_0, &_set_callback_cbs_mimeTypes_c0_0); + methods += new qt_gsi::GenericMethod ("emit_modelAboutToBeReset", "@brief Emitter for signal void QAbstractListModel::modelAboutToBeReset()\nCall this method to emit this signal.", false, &_init_emitter_modelAboutToBeReset_3767, &_call_emitter_modelAboutToBeReset_3767); + methods += new qt_gsi::GenericMethod ("emit_modelReset", "@brief Emitter for signal void QAbstractListModel::modelReset()\nCall this method to emit this signal.", false, &_init_emitter_modelReset_3767, &_call_emitter_modelReset_3767); methods += new qt_gsi::GenericMethod ("moveColumns", "@brief Virtual method bool QAbstractListModel::moveColumns(const QModelIndex &sourceParent, int sourceColumn, int count, const QModelIndex &destinationParent, int destinationChild)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_moveColumns_6659_0, &_call_cbs_moveColumns_6659_0); methods += new qt_gsi::GenericMethod ("moveColumns", "@hide", false, &_init_cbs_moveColumns_6659_0, &_call_cbs_moveColumns_6659_0, &_set_callback_cbs_moveColumns_6659_0); methods += new qt_gsi::GenericMethod ("moveRows", "@brief Virtual method bool QAbstractListModel::moveRows(const QModelIndex &sourceParent, int sourceRow, int count, const QModelIndex &destinationParent, int destinationChild)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_moveRows_6659_0, &_call_cbs_moveRows_6659_0); methods += new qt_gsi::GenericMethod ("moveRows", "@hide", false, &_init_cbs_moveRows_6659_0, &_call_cbs_moveRows_6659_0, &_set_callback_cbs_moveRows_6659_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QAbstractListModel::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*persistentIndexList", "@brief Method QList QAbstractListModel::persistentIndexList()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_persistentIndexList_c0, &_call_fp_persistentIndexList_c0); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QAbstractListModel::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("removeColumns", "@brief Virtual method bool QAbstractListModel::removeColumns(int column, int count, const QModelIndex &parent)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_removeColumns_3713_1, &_call_cbs_removeColumns_3713_1); @@ -2728,6 +3245,12 @@ static gsi::Methods methods_QAbstractListModel_Adaptor () { methods += new qt_gsi::GenericMethod ("roleNames", "@hide", true, &_init_cbs_roleNames_c0_0, &_call_cbs_roleNames_c0_0, &_set_callback_cbs_roleNames_c0_0); methods += new qt_gsi::GenericMethod ("rowCount", "@brief Virtual method int QAbstractListModel::rowCount(const QModelIndex &parent)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_rowCount_c2395_1, &_call_cbs_rowCount_c2395_1); methods += new qt_gsi::GenericMethod ("rowCount", "@hide", true, &_init_cbs_rowCount_c2395_1, &_call_cbs_rowCount_c2395_1, &_set_callback_cbs_rowCount_c2395_1); + methods += new qt_gsi::GenericMethod ("emit_rowsAboutToBeInserted", "@brief Emitter for signal void QAbstractListModel::rowsAboutToBeInserted(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_rowsAboutToBeInserted_7372, &_call_emitter_rowsAboutToBeInserted_7372); + methods += new qt_gsi::GenericMethod ("emit_rowsAboutToBeMoved", "@brief Emitter for signal void QAbstractListModel::rowsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow)\nCall this method to emit this signal.", false, &_init_emitter_rowsAboutToBeMoved_10318, &_call_emitter_rowsAboutToBeMoved_10318); + methods += new qt_gsi::GenericMethod ("emit_rowsAboutToBeRemoved", "@brief Emitter for signal void QAbstractListModel::rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_rowsAboutToBeRemoved_7372, &_call_emitter_rowsAboutToBeRemoved_7372); + methods += new qt_gsi::GenericMethod ("emit_rowsInserted", "@brief Emitter for signal void QAbstractListModel::rowsInserted(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_rowsInserted_7372, &_call_emitter_rowsInserted_7372); + methods += new qt_gsi::GenericMethod ("emit_rowsMoved", "@brief Emitter for signal void QAbstractListModel::rowsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row)\nCall this method to emit this signal.", false, &_init_emitter_rowsMoved_10318, &_call_emitter_rowsMoved_10318); + methods += new qt_gsi::GenericMethod ("emit_rowsRemoved", "@brief Emitter for signal void QAbstractListModel::rowsRemoved(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_rowsRemoved_7372, &_call_emitter_rowsRemoved_7372); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QAbstractListModel::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QAbstractListModel::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); methods += new qt_gsi::GenericMethod ("setData", "@brief Virtual method bool QAbstractListModel::setData(const QModelIndex &index, const QVariant &value, int role)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_setData_5065_1, &_call_cbs_setData_5065_1); diff --git a/src/gsiqt/qt5/QtCore/gsiDeclQAbstractProxyModel.cc b/src/gsiqt/qt5/QtCore/gsiDeclQAbstractProxyModel.cc index dd7067943..20a2add4a 100644 --- a/src/gsiqt/qt5/QtCore/gsiDeclQAbstractProxyModel.cc +++ b/src/gsiqt/qt5/QtCore/gsiDeclQAbstractProxyModel.cc @@ -718,11 +718,27 @@ static gsi::Methods methods_QAbstractProxyModel () { methods += new qt_gsi::GenericMethod ("submit", "@brief Method bool QAbstractProxyModel::submit()\nThis is a reimplementation of QAbstractItemModel::submit", false, &_init_f_submit_0, &_call_f_submit_0); methods += new qt_gsi::GenericMethod ("supportedDragActions", "@brief Method QFlags QAbstractProxyModel::supportedDragActions()\nThis is a reimplementation of QAbstractItemModel::supportedDragActions", true, &_init_f_supportedDragActions_c0, &_call_f_supportedDragActions_c0); methods += new qt_gsi::GenericMethod ("supportedDropActions", "@brief Method QFlags QAbstractProxyModel::supportedDropActions()\nThis is a reimplementation of QAbstractItemModel::supportedDropActions", true, &_init_f_supportedDropActions_c0, &_call_f_supportedDropActions_c0); + methods += gsi::qt_signal ("columnsAboutToBeInserted(const QModelIndex &, int, int)", "columnsAboutToBeInserted", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QAbstractProxyModel::columnsAboutToBeInserted(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("columnsAboutToBeMoved(const QModelIndex &, int, int, const QModelIndex &, int)", "columnsAboutToBeMoved", gsi::arg("sourceParent"), gsi::arg("sourceStart"), gsi::arg("sourceEnd"), gsi::arg("destinationParent"), gsi::arg("destinationColumn"), "@brief Signal declaration for QAbstractProxyModel::columnsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("columnsAboutToBeRemoved(const QModelIndex &, int, int)", "columnsAboutToBeRemoved", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QAbstractProxyModel::columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("columnsInserted(const QModelIndex &, int, int)", "columnsInserted", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QAbstractProxyModel::columnsInserted(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("columnsMoved(const QModelIndex &, int, int, const QModelIndex &, int)", "columnsMoved", gsi::arg("parent"), gsi::arg("start"), gsi::arg("end"), gsi::arg("destination"), gsi::arg("column"), "@brief Signal declaration for QAbstractProxyModel::columnsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("columnsRemoved(const QModelIndex &, int, int)", "columnsRemoved", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QAbstractProxyModel::columnsRemoved(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal & > ("dataChanged(const QModelIndex &, const QModelIndex &, const QVector &)", "dataChanged", gsi::arg("topLeft"), gsi::arg("bottomRight"), gsi::arg("roles"), "@brief Signal declaration for QAbstractProxyModel::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector &roles)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QAbstractProxyModel::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal::target_type &, int, int > ("headerDataChanged(Qt::Orientation, int, int)", "headerDataChanged", gsi::arg("orientation"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QAbstractProxyModel::headerDataChanged(Qt::Orientation orientation, int first, int last)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal &, const qt_gsi::Converter::target_type & > ("layoutAboutToBeChanged(const QList &, QAbstractItemModel::LayoutChangeHint)", "layoutAboutToBeChanged", gsi::arg("parents"), gsi::arg("hint"), "@brief Signal declaration for QAbstractProxyModel::layoutAboutToBeChanged(const QList &parents, QAbstractItemModel::LayoutChangeHint hint)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal &, const qt_gsi::Converter::target_type & > ("layoutChanged(const QList &, QAbstractItemModel::LayoutChangeHint)", "layoutChanged", gsi::arg("parents"), gsi::arg("hint"), "@brief Signal declaration for QAbstractProxyModel::layoutChanged(const QList &parents, QAbstractItemModel::LayoutChangeHint hint)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("modelAboutToBeReset()", "modelAboutToBeReset", "@brief Signal declaration for QAbstractProxyModel::modelAboutToBeReset()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("modelReset()", "modelReset", "@brief Signal declaration for QAbstractProxyModel::modelReset()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QAbstractProxyModel::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsAboutToBeInserted(const QModelIndex &, int, int)", "rowsAboutToBeInserted", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QAbstractProxyModel::rowsAboutToBeInserted(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsAboutToBeMoved(const QModelIndex &, int, int, const QModelIndex &, int)", "rowsAboutToBeMoved", gsi::arg("sourceParent"), gsi::arg("sourceStart"), gsi::arg("sourceEnd"), gsi::arg("destinationParent"), gsi::arg("destinationRow"), "@brief Signal declaration for QAbstractProxyModel::rowsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsAboutToBeRemoved(const QModelIndex &, int, int)", "rowsAboutToBeRemoved", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QAbstractProxyModel::rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsInserted(const QModelIndex &, int, int)", "rowsInserted", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QAbstractProxyModel::rowsInserted(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsMoved(const QModelIndex &, int, int, const QModelIndex &, int)", "rowsMoved", gsi::arg("parent"), gsi::arg("start"), gsi::arg("end"), gsi::arg("destination"), gsi::arg("row"), "@brief Signal declaration for QAbstractProxyModel::rowsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsRemoved(const QModelIndex &, int, int)", "rowsRemoved", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QAbstractProxyModel::rowsRemoved(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("sourceModelChanged()", "sourceModelChanged", "@brief Signal declaration for QAbstractProxyModel::sourceModelChanged()\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QAbstractProxyModel::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QAbstractProxyModel::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -948,6 +964,64 @@ public: } } + // [emitter impl] void QAbstractProxyModel::columnsAboutToBeInserted(const QModelIndex &parent, int first, int last) + void emitter_QAbstractProxyModel_columnsAboutToBeInserted_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QAbstractProxyModel::columnsAboutToBeInserted(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QAbstractProxyModel::columnsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn) + void emitter_QAbstractProxyModel_columnsAboutToBeMoved_10318(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn) + { + __SUPPRESS_UNUSED_WARNING (sourceParent); + __SUPPRESS_UNUSED_WARNING (sourceStart); + __SUPPRESS_UNUSED_WARNING (sourceEnd); + __SUPPRESS_UNUSED_WARNING (destinationParent); + __SUPPRESS_UNUSED_WARNING (destinationColumn); + throw tl::Exception ("Can't emit private signal 'void QAbstractProxyModel::columnsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn)'"); + } + + // [emitter impl] void QAbstractProxyModel::columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last) + void emitter_QAbstractProxyModel_columnsAboutToBeRemoved_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QAbstractProxyModel::columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QAbstractProxyModel::columnsInserted(const QModelIndex &parent, int first, int last) + void emitter_QAbstractProxyModel_columnsInserted_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QAbstractProxyModel::columnsInserted(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QAbstractProxyModel::columnsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column) + void emitter_QAbstractProxyModel_columnsMoved_10318(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (start); + __SUPPRESS_UNUSED_WARNING (end); + __SUPPRESS_UNUSED_WARNING (destination); + __SUPPRESS_UNUSED_WARNING (column); + throw tl::Exception ("Can't emit private signal 'void QAbstractProxyModel::columnsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column)'"); + } + + // [emitter impl] void QAbstractProxyModel::columnsRemoved(const QModelIndex &parent, int first, int last) + void emitter_QAbstractProxyModel_columnsRemoved_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QAbstractProxyModel::columnsRemoved(const QModelIndex &parent, int first, int last)'"); + } + // [adaptor impl] QVariant QAbstractProxyModel::data(const QModelIndex &proxyIndex, int role) QVariant cbs_data_c3054_1(const QModelIndex &proxyIndex, int role) const { @@ -1268,6 +1342,18 @@ public: } } + // [emitter impl] void QAbstractProxyModel::modelAboutToBeReset() + void emitter_QAbstractProxyModel_modelAboutToBeReset_3767() + { + throw tl::Exception ("Can't emit private signal 'void QAbstractProxyModel::modelAboutToBeReset()'"); + } + + // [emitter impl] void QAbstractProxyModel::modelReset() + void emitter_QAbstractProxyModel_modelReset_3767() + { + throw tl::Exception ("Can't emit private signal 'void QAbstractProxyModel::modelReset()'"); + } + // [adaptor impl] bool QAbstractProxyModel::moveColumns(const QModelIndex &sourceParent, int sourceColumn, int count, const QModelIndex &destinationParent, int destinationChild) bool cbs_moveColumns_6659_0(const QModelIndex &sourceParent, int sourceColumn, int count, const QModelIndex &destinationParent, int destinationChild) { @@ -1298,6 +1384,13 @@ public: } } + // [emitter impl] void QAbstractProxyModel::objectNameChanged(const QString &objectName) + void emitter_QAbstractProxyModel_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QAbstractProxyModel::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QModelIndex QAbstractProxyModel::parent(const QModelIndex &child) QModelIndex cbs_parent_c2395_0(const QModelIndex &child) const { @@ -1390,6 +1483,64 @@ public: } } + // [emitter impl] void QAbstractProxyModel::rowsAboutToBeInserted(const QModelIndex &parent, int first, int last) + void emitter_QAbstractProxyModel_rowsAboutToBeInserted_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QAbstractProxyModel::rowsAboutToBeInserted(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QAbstractProxyModel::rowsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow) + void emitter_QAbstractProxyModel_rowsAboutToBeMoved_10318(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow) + { + __SUPPRESS_UNUSED_WARNING (sourceParent); + __SUPPRESS_UNUSED_WARNING (sourceStart); + __SUPPRESS_UNUSED_WARNING (sourceEnd); + __SUPPRESS_UNUSED_WARNING (destinationParent); + __SUPPRESS_UNUSED_WARNING (destinationRow); + throw tl::Exception ("Can't emit private signal 'void QAbstractProxyModel::rowsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow)'"); + } + + // [emitter impl] void QAbstractProxyModel::rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last) + void emitter_QAbstractProxyModel_rowsAboutToBeRemoved_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QAbstractProxyModel::rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QAbstractProxyModel::rowsInserted(const QModelIndex &parent, int first, int last) + void emitter_QAbstractProxyModel_rowsInserted_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QAbstractProxyModel::rowsInserted(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QAbstractProxyModel::rowsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row) + void emitter_QAbstractProxyModel_rowsMoved_10318(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (start); + __SUPPRESS_UNUSED_WARNING (end); + __SUPPRESS_UNUSED_WARNING (destination); + __SUPPRESS_UNUSED_WARNING (row); + throw tl::Exception ("Can't emit private signal 'void QAbstractProxyModel::rowsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row)'"); + } + + // [emitter impl] void QAbstractProxyModel::rowsRemoved(const QModelIndex &parent, int first, int last) + void emitter_QAbstractProxyModel_rowsRemoved_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QAbstractProxyModel::rowsRemoved(const QModelIndex &parent, int first, int last)'"); + } + // [adaptor impl] bool QAbstractProxyModel::setData(const QModelIndex &index, const QVariant &value, int role) bool cbs_setData_5065_1(const QModelIndex &index, const QVariant &value, int role) { @@ -1480,6 +1631,12 @@ public: } } + // [emitter impl] void QAbstractProxyModel::sourceModelChanged() + void emitter_QAbstractProxyModel_sourceModelChanged_3914() + { + throw tl::Exception ("Can't emit private signal 'void QAbstractProxyModel::sourceModelChanged()'"); + } + // [adaptor impl] QSize QAbstractProxyModel::span(const QModelIndex &index) QSize cbs_span_c2395_0(const QModelIndex &index) const { @@ -2014,6 +2171,162 @@ static void _set_callback_cbs_columnCount_c2395_1 (void *cls, const gsi::Callbac } +// emitter void QAbstractProxyModel::columnsAboutToBeInserted(const QModelIndex &parent, int first, int last) + +static void _init_emitter_columnsAboutToBeInserted_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_columnsAboutToBeInserted_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QAbstractProxyModel_Adaptor *)cls)->emitter_QAbstractProxyModel_columnsAboutToBeInserted_7372 (arg1, arg2, arg3); +} + + +// emitter void QAbstractProxyModel::columnsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn) + +static void _init_emitter_columnsAboutToBeMoved_10318 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("sourceParent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("sourceStart"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("sourceEnd"); + decl->add_arg (argspec_2); + static gsi::ArgSpecBase argspec_3 ("destinationParent"); + decl->add_arg (argspec_3); + static gsi::ArgSpecBase argspec_4 ("destinationColumn"); + decl->add_arg (argspec_4); + decl->set_return (); +} + +static void _call_emitter_columnsAboutToBeMoved_10318 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + const QModelIndex &arg4 = gsi::arg_reader() (args, heap); + int arg5 = gsi::arg_reader() (args, heap); + ((QAbstractProxyModel_Adaptor *)cls)->emitter_QAbstractProxyModel_columnsAboutToBeMoved_10318 (arg1, arg2, arg3, arg4, arg5); +} + + +// emitter void QAbstractProxyModel::columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last) + +static void _init_emitter_columnsAboutToBeRemoved_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_columnsAboutToBeRemoved_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QAbstractProxyModel_Adaptor *)cls)->emitter_QAbstractProxyModel_columnsAboutToBeRemoved_7372 (arg1, arg2, arg3); +} + + +// emitter void QAbstractProxyModel::columnsInserted(const QModelIndex &parent, int first, int last) + +static void _init_emitter_columnsInserted_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_columnsInserted_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QAbstractProxyModel_Adaptor *)cls)->emitter_QAbstractProxyModel_columnsInserted_7372 (arg1, arg2, arg3); +} + + +// emitter void QAbstractProxyModel::columnsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column) + +static void _init_emitter_columnsMoved_10318 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("start"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("end"); + decl->add_arg (argspec_2); + static gsi::ArgSpecBase argspec_3 ("destination"); + decl->add_arg (argspec_3); + static gsi::ArgSpecBase argspec_4 ("column"); + decl->add_arg (argspec_4); + decl->set_return (); +} + +static void _call_emitter_columnsMoved_10318 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + const QModelIndex &arg4 = gsi::arg_reader() (args, heap); + int arg5 = gsi::arg_reader() (args, heap); + ((QAbstractProxyModel_Adaptor *)cls)->emitter_QAbstractProxyModel_columnsMoved_10318 (arg1, arg2, arg3, arg4, arg5); +} + + +// emitter void QAbstractProxyModel::columnsRemoved(const QModelIndex &parent, int first, int last) + +static void _init_emitter_columnsRemoved_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_columnsRemoved_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QAbstractProxyModel_Adaptor *)cls)->emitter_QAbstractProxyModel_columnsRemoved_7372 (arg1, arg2, arg3); +} + + // exposed QModelIndex QAbstractProxyModel::createIndex(int row, int column, void *data) static void _init_fp_createIndex_c2374 (qt_gsi::GenericMethod *decl) @@ -2878,6 +3191,34 @@ static void _set_callback_cbs_mimeTypes_c0_0 (void *cls, const gsi::Callback &cb } +// emitter void QAbstractProxyModel::modelAboutToBeReset() + +static void _init_emitter_modelAboutToBeReset_3767 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_emitter_modelAboutToBeReset_3767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + ((QAbstractProxyModel_Adaptor *)cls)->emitter_QAbstractProxyModel_modelAboutToBeReset_3767 (); +} + + +// emitter void QAbstractProxyModel::modelReset() + +static void _init_emitter_modelReset_3767 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_emitter_modelReset_3767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + ((QAbstractProxyModel_Adaptor *)cls)->emitter_QAbstractProxyModel_modelReset_3767 (); +} + + // bool QAbstractProxyModel::moveColumns(const QModelIndex &sourceParent, int sourceColumn, int count, const QModelIndex &destinationParent, int destinationChild) static void _init_cbs_moveColumns_6659_0 (qt_gsi::GenericMethod *decl) @@ -2948,6 +3289,24 @@ static void _set_callback_cbs_moveRows_6659_0 (void *cls, const gsi::Callback &c } +// emitter void QAbstractProxyModel::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QAbstractProxyModel_Adaptor *)cls)->emitter_QAbstractProxyModel_objectNameChanged_4567 (arg1); +} + + // QModelIndex QAbstractProxyModel::parent(const QModelIndex &child) static void _init_cbs_parent_c2395_0 (qt_gsi::GenericMethod *decl) @@ -3138,6 +3497,162 @@ static void _set_callback_cbs_rowCount_c2395_1 (void *cls, const gsi::Callback & } +// emitter void QAbstractProxyModel::rowsAboutToBeInserted(const QModelIndex &parent, int first, int last) + +static void _init_emitter_rowsAboutToBeInserted_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_rowsAboutToBeInserted_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QAbstractProxyModel_Adaptor *)cls)->emitter_QAbstractProxyModel_rowsAboutToBeInserted_7372 (arg1, arg2, arg3); +} + + +// emitter void QAbstractProxyModel::rowsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow) + +static void _init_emitter_rowsAboutToBeMoved_10318 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("sourceParent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("sourceStart"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("sourceEnd"); + decl->add_arg (argspec_2); + static gsi::ArgSpecBase argspec_3 ("destinationParent"); + decl->add_arg (argspec_3); + static gsi::ArgSpecBase argspec_4 ("destinationRow"); + decl->add_arg (argspec_4); + decl->set_return (); +} + +static void _call_emitter_rowsAboutToBeMoved_10318 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + const QModelIndex &arg4 = gsi::arg_reader() (args, heap); + int arg5 = gsi::arg_reader() (args, heap); + ((QAbstractProxyModel_Adaptor *)cls)->emitter_QAbstractProxyModel_rowsAboutToBeMoved_10318 (arg1, arg2, arg3, arg4, arg5); +} + + +// emitter void QAbstractProxyModel::rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last) + +static void _init_emitter_rowsAboutToBeRemoved_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_rowsAboutToBeRemoved_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QAbstractProxyModel_Adaptor *)cls)->emitter_QAbstractProxyModel_rowsAboutToBeRemoved_7372 (arg1, arg2, arg3); +} + + +// emitter void QAbstractProxyModel::rowsInserted(const QModelIndex &parent, int first, int last) + +static void _init_emitter_rowsInserted_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_rowsInserted_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QAbstractProxyModel_Adaptor *)cls)->emitter_QAbstractProxyModel_rowsInserted_7372 (arg1, arg2, arg3); +} + + +// emitter void QAbstractProxyModel::rowsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row) + +static void _init_emitter_rowsMoved_10318 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("start"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("end"); + decl->add_arg (argspec_2); + static gsi::ArgSpecBase argspec_3 ("destination"); + decl->add_arg (argspec_3); + static gsi::ArgSpecBase argspec_4 ("row"); + decl->add_arg (argspec_4); + decl->set_return (); +} + +static void _call_emitter_rowsMoved_10318 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + const QModelIndex &arg4 = gsi::arg_reader() (args, heap); + int arg5 = gsi::arg_reader() (args, heap); + ((QAbstractProxyModel_Adaptor *)cls)->emitter_QAbstractProxyModel_rowsMoved_10318 (arg1, arg2, arg3, arg4, arg5); +} + + +// emitter void QAbstractProxyModel::rowsRemoved(const QModelIndex &parent, int first, int last) + +static void _init_emitter_rowsRemoved_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_rowsRemoved_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QAbstractProxyModel_Adaptor *)cls)->emitter_QAbstractProxyModel_rowsRemoved_7372 (arg1, arg2, arg3); +} + + // exposed QObject *QAbstractProxyModel::sender() static void _init_fp_sender_c0 (qt_gsi::GenericMethod *decl) @@ -3333,6 +3848,20 @@ static void _set_callback_cbs_sort_2340_1 (void *cls, const gsi::Callback &cb) } +// emitter void QAbstractProxyModel::sourceModelChanged() + +static void _init_emitter_sourceModelChanged_3914 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_emitter_sourceModelChanged_3914 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + ((QAbstractProxyModel_Adaptor *)cls)->emitter_QAbstractProxyModel_sourceModelChanged_3914 (); +} + + // QSize QAbstractProxyModel::span(const QModelIndex &index) static void _init_cbs_span_c2395_0 (qt_gsi::GenericMethod *decl) @@ -3464,6 +3993,12 @@ static gsi::Methods methods_QAbstractProxyModel_Adaptor () { methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("columnCount", "@brief Virtual method int QAbstractProxyModel::columnCount(const QModelIndex &parent)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_columnCount_c2395_1, &_call_cbs_columnCount_c2395_1); methods += new qt_gsi::GenericMethod ("columnCount", "@hide", true, &_init_cbs_columnCount_c2395_1, &_call_cbs_columnCount_c2395_1, &_set_callback_cbs_columnCount_c2395_1); + methods += new qt_gsi::GenericMethod ("emit_columnsAboutToBeInserted", "@brief Emitter for signal void QAbstractProxyModel::columnsAboutToBeInserted(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_columnsAboutToBeInserted_7372, &_call_emitter_columnsAboutToBeInserted_7372); + methods += new qt_gsi::GenericMethod ("emit_columnsAboutToBeMoved", "@brief Emitter for signal void QAbstractProxyModel::columnsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn)\nCall this method to emit this signal.", false, &_init_emitter_columnsAboutToBeMoved_10318, &_call_emitter_columnsAboutToBeMoved_10318); + methods += new qt_gsi::GenericMethod ("emit_columnsAboutToBeRemoved", "@brief Emitter for signal void QAbstractProxyModel::columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_columnsAboutToBeRemoved_7372, &_call_emitter_columnsAboutToBeRemoved_7372); + methods += new qt_gsi::GenericMethod ("emit_columnsInserted", "@brief Emitter for signal void QAbstractProxyModel::columnsInserted(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_columnsInserted_7372, &_call_emitter_columnsInserted_7372); + methods += new qt_gsi::GenericMethod ("emit_columnsMoved", "@brief Emitter for signal void QAbstractProxyModel::columnsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column)\nCall this method to emit this signal.", false, &_init_emitter_columnsMoved_10318, &_call_emitter_columnsMoved_10318); + methods += new qt_gsi::GenericMethod ("emit_columnsRemoved", "@brief Emitter for signal void QAbstractProxyModel::columnsRemoved(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_columnsRemoved_7372, &_call_emitter_columnsRemoved_7372); methods += new qt_gsi::GenericMethod ("*createIndex", "@brief Method QModelIndex QAbstractProxyModel::createIndex(int row, int column, void *data)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_createIndex_c2374, &_call_fp_createIndex_c2374); methods += new qt_gsi::GenericMethod ("*createIndex", "@brief Method QModelIndex QAbstractProxyModel::createIndex(int row, int column, quintptr id)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_createIndex_c2657, &_call_fp_createIndex_c2657); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QAbstractProxyModel::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); @@ -3523,10 +4058,13 @@ static gsi::Methods methods_QAbstractProxyModel_Adaptor () { methods += new qt_gsi::GenericMethod ("mimeData", "@hide", true, &_init_cbs_mimeData_c3010_0, &_call_cbs_mimeData_c3010_0, &_set_callback_cbs_mimeData_c3010_0); methods += new qt_gsi::GenericMethod ("mimeTypes", "@brief Virtual method QStringList QAbstractProxyModel::mimeTypes()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_mimeTypes_c0_0, &_call_cbs_mimeTypes_c0_0); methods += new qt_gsi::GenericMethod ("mimeTypes", "@hide", true, &_init_cbs_mimeTypes_c0_0, &_call_cbs_mimeTypes_c0_0, &_set_callback_cbs_mimeTypes_c0_0); + methods += new qt_gsi::GenericMethod ("emit_modelAboutToBeReset", "@brief Emitter for signal void QAbstractProxyModel::modelAboutToBeReset()\nCall this method to emit this signal.", false, &_init_emitter_modelAboutToBeReset_3767, &_call_emitter_modelAboutToBeReset_3767); + methods += new qt_gsi::GenericMethod ("emit_modelReset", "@brief Emitter for signal void QAbstractProxyModel::modelReset()\nCall this method to emit this signal.", false, &_init_emitter_modelReset_3767, &_call_emitter_modelReset_3767); methods += new qt_gsi::GenericMethod ("moveColumns", "@brief Virtual method bool QAbstractProxyModel::moveColumns(const QModelIndex &sourceParent, int sourceColumn, int count, const QModelIndex &destinationParent, int destinationChild)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_moveColumns_6659_0, &_call_cbs_moveColumns_6659_0); methods += new qt_gsi::GenericMethod ("moveColumns", "@hide", false, &_init_cbs_moveColumns_6659_0, &_call_cbs_moveColumns_6659_0, &_set_callback_cbs_moveColumns_6659_0); methods += new qt_gsi::GenericMethod ("moveRows", "@brief Virtual method bool QAbstractProxyModel::moveRows(const QModelIndex &sourceParent, int sourceRow, int count, const QModelIndex &destinationParent, int destinationChild)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_moveRows_6659_0, &_call_cbs_moveRows_6659_0); methods += new qt_gsi::GenericMethod ("moveRows", "@hide", false, &_init_cbs_moveRows_6659_0, &_call_cbs_moveRows_6659_0, &_set_callback_cbs_moveRows_6659_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QAbstractProxyModel::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("parent", "@brief Virtual method QModelIndex QAbstractProxyModel::parent(const QModelIndex &child)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_parent_c2395_0, &_call_cbs_parent_c2395_0); methods += new qt_gsi::GenericMethod ("parent", "@hide", true, &_init_cbs_parent_c2395_0, &_call_cbs_parent_c2395_0, &_set_callback_cbs_parent_c2395_0); methods += new qt_gsi::GenericMethod ("*persistentIndexList", "@brief Method QList QAbstractProxyModel::persistentIndexList()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_persistentIndexList_c0, &_call_fp_persistentIndexList_c0); @@ -3542,6 +4080,12 @@ static gsi::Methods methods_QAbstractProxyModel_Adaptor () { methods += new qt_gsi::GenericMethod ("roleNames", "@hide", true, &_init_cbs_roleNames_c0_0, &_call_cbs_roleNames_c0_0, &_set_callback_cbs_roleNames_c0_0); methods += new qt_gsi::GenericMethod ("rowCount", "@brief Virtual method int QAbstractProxyModel::rowCount(const QModelIndex &parent)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_rowCount_c2395_1, &_call_cbs_rowCount_c2395_1); methods += new qt_gsi::GenericMethod ("rowCount", "@hide", true, &_init_cbs_rowCount_c2395_1, &_call_cbs_rowCount_c2395_1, &_set_callback_cbs_rowCount_c2395_1); + methods += new qt_gsi::GenericMethod ("emit_rowsAboutToBeInserted", "@brief Emitter for signal void QAbstractProxyModel::rowsAboutToBeInserted(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_rowsAboutToBeInserted_7372, &_call_emitter_rowsAboutToBeInserted_7372); + methods += new qt_gsi::GenericMethod ("emit_rowsAboutToBeMoved", "@brief Emitter for signal void QAbstractProxyModel::rowsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow)\nCall this method to emit this signal.", false, &_init_emitter_rowsAboutToBeMoved_10318, &_call_emitter_rowsAboutToBeMoved_10318); + methods += new qt_gsi::GenericMethod ("emit_rowsAboutToBeRemoved", "@brief Emitter for signal void QAbstractProxyModel::rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_rowsAboutToBeRemoved_7372, &_call_emitter_rowsAboutToBeRemoved_7372); + methods += new qt_gsi::GenericMethod ("emit_rowsInserted", "@brief Emitter for signal void QAbstractProxyModel::rowsInserted(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_rowsInserted_7372, &_call_emitter_rowsInserted_7372); + methods += new qt_gsi::GenericMethod ("emit_rowsMoved", "@brief Emitter for signal void QAbstractProxyModel::rowsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row)\nCall this method to emit this signal.", false, &_init_emitter_rowsMoved_10318, &_call_emitter_rowsMoved_10318); + methods += new qt_gsi::GenericMethod ("emit_rowsRemoved", "@brief Emitter for signal void QAbstractProxyModel::rowsRemoved(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_rowsRemoved_7372, &_call_emitter_rowsRemoved_7372); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QAbstractProxyModel::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QAbstractProxyModel::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); methods += new qt_gsi::GenericMethod ("setData", "@brief Virtual method bool QAbstractProxyModel::setData(const QModelIndex &index, const QVariant &value, int role)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_setData_5065_1, &_call_cbs_setData_5065_1); @@ -3556,6 +4100,7 @@ static gsi::Methods methods_QAbstractProxyModel_Adaptor () { methods += new qt_gsi::GenericMethod ("sibling", "@hide", true, &_init_cbs_sibling_c3713_0, &_call_cbs_sibling_c3713_0, &_set_callback_cbs_sibling_c3713_0); methods += new qt_gsi::GenericMethod ("sort", "@brief Virtual method void QAbstractProxyModel::sort(int column, Qt::SortOrder order)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_sort_2340_1, &_call_cbs_sort_2340_1); methods += new qt_gsi::GenericMethod ("sort", "@hide", false, &_init_cbs_sort_2340_1, &_call_cbs_sort_2340_1, &_set_callback_cbs_sort_2340_1); + methods += new qt_gsi::GenericMethod ("emit_sourceModelChanged", "@brief Emitter for signal void QAbstractProxyModel::sourceModelChanged()\nCall this method to emit this signal.", false, &_init_emitter_sourceModelChanged_3914, &_call_emitter_sourceModelChanged_3914); methods += new qt_gsi::GenericMethod ("span", "@brief Virtual method QSize QAbstractProxyModel::span(const QModelIndex &index)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_span_c2395_0, &_call_cbs_span_c2395_0); methods += new qt_gsi::GenericMethod ("span", "@hide", true, &_init_cbs_span_c2395_0, &_call_cbs_span_c2395_0, &_set_callback_cbs_span_c2395_0); methods += new qt_gsi::GenericMethod ("submit", "@brief Virtual method bool QAbstractProxyModel::submit()\nThis method can be reimplemented in a derived class.", false, &_init_cbs_submit_0_0, &_call_cbs_submit_0_0); diff --git a/src/gsiqt/qt5/QtCore/gsiDeclQAbstractState.cc b/src/gsiqt/qt5/QtCore/gsiDeclQAbstractState.cc index df737273e..d7f6fa623 100644 --- a/src/gsiqt/qt5/QtCore/gsiDeclQAbstractState.cc +++ b/src/gsiqt/qt5/QtCore/gsiDeclQAbstractState.cc @@ -163,6 +163,9 @@ static gsi::Methods methods_QAbstractState () { methods += new qt_gsi::GenericMethod ("parentState", "@brief Method QState *QAbstractState::parentState()\n", true, &_init_f_parentState_c0, &_call_f_parentState_c0); methods += gsi::qt_signal ("activeChanged(bool)", "activeChanged", gsi::arg("active"), "@brief Signal declaration for QAbstractState::activeChanged(bool active)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QAbstractState::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("entered()", "entered", "@brief Signal declaration for QAbstractState::entered()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("exited()", "exited", "@brief Signal declaration for QAbstractState::exited()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QAbstractState::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QAbstractState::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QAbstractState::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -223,6 +226,12 @@ public: emit QAbstractState::destroyed(arg1); } + // [emitter impl] void QAbstractState::entered() + void emitter_QAbstractState_entered_3384() + { + throw tl::Exception ("Can't emit private signal 'void QAbstractState::entered()'"); + } + // [adaptor impl] bool QAbstractState::eventFilter(QObject *, QEvent *) bool cbs_eventFilter_2411_0(QObject *arg1, QEvent *arg2) { @@ -238,6 +247,19 @@ public: } } + // [emitter impl] void QAbstractState::exited() + void emitter_QAbstractState_exited_3384() + { + throw tl::Exception ("Can't emit private signal 'void QAbstractState::exited()'"); + } + + // [emitter impl] void QAbstractState::objectNameChanged(const QString &objectName) + void emitter_QAbstractState_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QAbstractState::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] void QAbstractState::childEvent(QChildEvent *) void cbs_childEvent_1701_0(QChildEvent *arg1) { @@ -479,6 +501,20 @@ static void _set_callback_cbs_disconnectNotify_2394_0 (void *cls, const gsi::Cal } +// emitter void QAbstractState::entered() + +static void _init_emitter_entered_3384 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_emitter_entered_3384 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + ((QAbstractState_Adaptor *)cls)->emitter_QAbstractState_entered_3384 (); +} + + // bool QAbstractState::event(QEvent *e) static void _init_cbs_event_1217_0 (qt_gsi::GenericMethod *decl) @@ -528,6 +564,20 @@ static void _set_callback_cbs_eventFilter_2411_0 (void *cls, const gsi::Callback } +// emitter void QAbstractState::exited() + +static void _init_emitter_exited_3384 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_emitter_exited_3384 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + ((QAbstractState_Adaptor *)cls)->emitter_QAbstractState_exited_3384 (); +} + + // exposed bool QAbstractState::isSignalConnected(const QMetaMethod &signal) static void _init_fp_isSignalConnected_c2394 (qt_gsi::GenericMethod *decl) @@ -546,6 +596,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QAbstractState::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QAbstractState_Adaptor *)cls)->emitter_QAbstractState_objectNameChanged_4567 (arg1); +} + + // void QAbstractState::onEntry(QEvent *event) static void _init_cbs_onEntry_1217_0 (qt_gsi::GenericMethod *decl) @@ -680,11 +748,14 @@ static gsi::Methods methods_QAbstractState_Adaptor () { methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QAbstractState::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QAbstractState::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); + methods += new qt_gsi::GenericMethod ("emit_entered", "@brief Emitter for signal void QAbstractState::entered()\nCall this method to emit this signal.", false, &_init_emitter_entered_3384, &_call_emitter_entered_3384); methods += new qt_gsi::GenericMethod ("*event", "@brief Virtual method bool QAbstractState::event(QEvent *e)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0); methods += new qt_gsi::GenericMethod ("*event", "@hide", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0, &_set_callback_cbs_event_1217_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QAbstractState::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); + methods += new qt_gsi::GenericMethod ("emit_exited", "@brief Emitter for signal void QAbstractState::exited()\nCall this method to emit this signal.", false, &_init_emitter_exited_3384, &_call_emitter_exited_3384); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QAbstractState::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QAbstractState::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*onEntry", "@brief Virtual method void QAbstractState::onEntry(QEvent *event)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_onEntry_1217_0, &_call_cbs_onEntry_1217_0); methods += new qt_gsi::GenericMethod ("*onEntry", "@hide", false, &_init_cbs_onEntry_1217_0, &_call_cbs_onEntry_1217_0, &_set_callback_cbs_onEntry_1217_0); methods += new qt_gsi::GenericMethod ("*onExit", "@brief Virtual method void QAbstractState::onExit(QEvent *event)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_onExit_1217_0, &_call_cbs_onExit_1217_0); diff --git a/src/gsiqt/qt5/QtCore/gsiDeclQAbstractTableModel.cc b/src/gsiqt/qt5/QtCore/gsiDeclQAbstractTableModel.cc index c9e2d55d5..bb04d7836 100644 --- a/src/gsiqt/qt5/QtCore/gsiDeclQAbstractTableModel.cc +++ b/src/gsiqt/qt5/QtCore/gsiDeclQAbstractTableModel.cc @@ -236,11 +236,26 @@ static gsi::Methods methods_QAbstractTableModel () { methods += new qt_gsi::GenericMethod ("index", "@brief Method QModelIndex QAbstractTableModel::index(int row, int column, const QModelIndex &parent)\nThis is a reimplementation of QAbstractItemModel::index", true, &_init_f_index_c3713, &_call_f_index_c3713); methods += new qt_gsi::GenericMethod (":parent", "@brief Method QObject *QAbstractTableModel::parent()\n", true, &_init_f_parent_c0, &_call_f_parent_c0); methods += new qt_gsi::GenericMethod ("sibling", "@brief Method QModelIndex QAbstractTableModel::sibling(int row, int column, const QModelIndex &idx)\nThis is a reimplementation of QAbstractItemModel::sibling", true, &_init_f_sibling_c3713, &_call_f_sibling_c3713); + methods += gsi::qt_signal ("columnsAboutToBeInserted(const QModelIndex &, int, int)", "columnsAboutToBeInserted", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QAbstractTableModel::columnsAboutToBeInserted(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("columnsAboutToBeMoved(const QModelIndex &, int, int, const QModelIndex &, int)", "columnsAboutToBeMoved", gsi::arg("sourceParent"), gsi::arg("sourceStart"), gsi::arg("sourceEnd"), gsi::arg("destinationParent"), gsi::arg("destinationColumn"), "@brief Signal declaration for QAbstractTableModel::columnsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("columnsAboutToBeRemoved(const QModelIndex &, int, int)", "columnsAboutToBeRemoved", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QAbstractTableModel::columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("columnsInserted(const QModelIndex &, int, int)", "columnsInserted", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QAbstractTableModel::columnsInserted(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("columnsMoved(const QModelIndex &, int, int, const QModelIndex &, int)", "columnsMoved", gsi::arg("parent"), gsi::arg("start"), gsi::arg("end"), gsi::arg("destination"), gsi::arg("column"), "@brief Signal declaration for QAbstractTableModel::columnsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("columnsRemoved(const QModelIndex &, int, int)", "columnsRemoved", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QAbstractTableModel::columnsRemoved(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal & > ("dataChanged(const QModelIndex &, const QModelIndex &, const QVector &)", "dataChanged", gsi::arg("topLeft"), gsi::arg("bottomRight"), gsi::arg("roles"), "@brief Signal declaration for QAbstractTableModel::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector &roles)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QAbstractTableModel::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal::target_type &, int, int > ("headerDataChanged(Qt::Orientation, int, int)", "headerDataChanged", gsi::arg("orientation"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QAbstractTableModel::headerDataChanged(Qt::Orientation orientation, int first, int last)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal &, const qt_gsi::Converter::target_type & > ("layoutAboutToBeChanged(const QList &, QAbstractItemModel::LayoutChangeHint)", "layoutAboutToBeChanged", gsi::arg("parents"), gsi::arg("hint"), "@brief Signal declaration for QAbstractTableModel::layoutAboutToBeChanged(const QList &parents, QAbstractItemModel::LayoutChangeHint hint)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal &, const qt_gsi::Converter::target_type & > ("layoutChanged(const QList &, QAbstractItemModel::LayoutChangeHint)", "layoutChanged", gsi::arg("parents"), gsi::arg("hint"), "@brief Signal declaration for QAbstractTableModel::layoutChanged(const QList &parents, QAbstractItemModel::LayoutChangeHint hint)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("modelAboutToBeReset()", "modelAboutToBeReset", "@brief Signal declaration for QAbstractTableModel::modelAboutToBeReset()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("modelReset()", "modelReset", "@brief Signal declaration for QAbstractTableModel::modelReset()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QAbstractTableModel::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsAboutToBeInserted(const QModelIndex &, int, int)", "rowsAboutToBeInserted", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QAbstractTableModel::rowsAboutToBeInserted(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsAboutToBeMoved(const QModelIndex &, int, int, const QModelIndex &, int)", "rowsAboutToBeMoved", gsi::arg("sourceParent"), gsi::arg("sourceStart"), gsi::arg("sourceEnd"), gsi::arg("destinationParent"), gsi::arg("destinationRow"), "@brief Signal declaration for QAbstractTableModel::rowsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsAboutToBeRemoved(const QModelIndex &, int, int)", "rowsAboutToBeRemoved", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QAbstractTableModel::rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsInserted(const QModelIndex &, int, int)", "rowsInserted", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QAbstractTableModel::rowsInserted(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsMoved(const QModelIndex &, int, int, const QModelIndex &, int)", "rowsMoved", gsi::arg("parent"), gsi::arg("start"), gsi::arg("end"), gsi::arg("destination"), gsi::arg("row"), "@brief Signal declaration for QAbstractTableModel::rowsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsRemoved(const QModelIndex &, int, int)", "rowsRemoved", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QAbstractTableModel::rowsRemoved(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QAbstractTableModel::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QAbstractTableModel::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -466,6 +481,64 @@ public: } } + // [emitter impl] void QAbstractTableModel::columnsAboutToBeInserted(const QModelIndex &parent, int first, int last) + void emitter_QAbstractTableModel_columnsAboutToBeInserted_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QAbstractTableModel::columnsAboutToBeInserted(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QAbstractTableModel::columnsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn) + void emitter_QAbstractTableModel_columnsAboutToBeMoved_10318(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn) + { + __SUPPRESS_UNUSED_WARNING (sourceParent); + __SUPPRESS_UNUSED_WARNING (sourceStart); + __SUPPRESS_UNUSED_WARNING (sourceEnd); + __SUPPRESS_UNUSED_WARNING (destinationParent); + __SUPPRESS_UNUSED_WARNING (destinationColumn); + throw tl::Exception ("Can't emit private signal 'void QAbstractTableModel::columnsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn)'"); + } + + // [emitter impl] void QAbstractTableModel::columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last) + void emitter_QAbstractTableModel_columnsAboutToBeRemoved_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QAbstractTableModel::columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QAbstractTableModel::columnsInserted(const QModelIndex &parent, int first, int last) + void emitter_QAbstractTableModel_columnsInserted_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QAbstractTableModel::columnsInserted(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QAbstractTableModel::columnsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column) + void emitter_QAbstractTableModel_columnsMoved_10318(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (start); + __SUPPRESS_UNUSED_WARNING (end); + __SUPPRESS_UNUSED_WARNING (destination); + __SUPPRESS_UNUSED_WARNING (column); + throw tl::Exception ("Can't emit private signal 'void QAbstractTableModel::columnsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column)'"); + } + + // [emitter impl] void QAbstractTableModel::columnsRemoved(const QModelIndex &parent, int first, int last) + void emitter_QAbstractTableModel_columnsRemoved_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QAbstractTableModel::columnsRemoved(const QModelIndex &parent, int first, int last)'"); + } + // [adaptor impl] QVariant QAbstractTableModel::data(const QModelIndex &index, int role) QVariant cbs_data_c3054_1(const QModelIndex &index, int role) const { @@ -708,6 +781,18 @@ public: } } + // [emitter impl] void QAbstractTableModel::modelAboutToBeReset() + void emitter_QAbstractTableModel_modelAboutToBeReset_3767() + { + throw tl::Exception ("Can't emit private signal 'void QAbstractTableModel::modelAboutToBeReset()'"); + } + + // [emitter impl] void QAbstractTableModel::modelReset() + void emitter_QAbstractTableModel_modelReset_3767() + { + throw tl::Exception ("Can't emit private signal 'void QAbstractTableModel::modelReset()'"); + } + // [adaptor impl] bool QAbstractTableModel::moveColumns(const QModelIndex &sourceParent, int sourceColumn, int count, const QModelIndex &destinationParent, int destinationChild) bool cbs_moveColumns_6659_0(const QModelIndex &sourceParent, int sourceColumn, int count, const QModelIndex &destinationParent, int destinationChild) { @@ -738,6 +823,13 @@ public: } } + // [emitter impl] void QAbstractTableModel::objectNameChanged(const QString &objectName) + void emitter_QAbstractTableModel_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QAbstractTableModel::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] bool QAbstractTableModel::removeColumns(int column, int count, const QModelIndex &parent) bool cbs_removeColumns_3713_1(int column, int count, const QModelIndex &parent) { @@ -814,6 +906,64 @@ public: } } + // [emitter impl] void QAbstractTableModel::rowsAboutToBeInserted(const QModelIndex &parent, int first, int last) + void emitter_QAbstractTableModel_rowsAboutToBeInserted_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QAbstractTableModel::rowsAboutToBeInserted(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QAbstractTableModel::rowsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow) + void emitter_QAbstractTableModel_rowsAboutToBeMoved_10318(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow) + { + __SUPPRESS_UNUSED_WARNING (sourceParent); + __SUPPRESS_UNUSED_WARNING (sourceStart); + __SUPPRESS_UNUSED_WARNING (sourceEnd); + __SUPPRESS_UNUSED_WARNING (destinationParent); + __SUPPRESS_UNUSED_WARNING (destinationRow); + throw tl::Exception ("Can't emit private signal 'void QAbstractTableModel::rowsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow)'"); + } + + // [emitter impl] void QAbstractTableModel::rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last) + void emitter_QAbstractTableModel_rowsAboutToBeRemoved_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QAbstractTableModel::rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QAbstractTableModel::rowsInserted(const QModelIndex &parent, int first, int last) + void emitter_QAbstractTableModel_rowsInserted_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QAbstractTableModel::rowsInserted(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QAbstractTableModel::rowsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row) + void emitter_QAbstractTableModel_rowsMoved_10318(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (start); + __SUPPRESS_UNUSED_WARNING (end); + __SUPPRESS_UNUSED_WARNING (destination); + __SUPPRESS_UNUSED_WARNING (row); + throw tl::Exception ("Can't emit private signal 'void QAbstractTableModel::rowsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row)'"); + } + + // [emitter impl] void QAbstractTableModel::rowsRemoved(const QModelIndex &parent, int first, int last) + void emitter_QAbstractTableModel_rowsRemoved_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QAbstractTableModel::rowsRemoved(const QModelIndex &parent, int first, int last)'"); + } + // [adaptor impl] bool QAbstractTableModel::setData(const QModelIndex &index, const QVariant &value, int role) bool cbs_setData_5065_1(const QModelIndex &index, const QVariant &value, int role) { @@ -1416,6 +1566,162 @@ static void _set_callback_cbs_columnCount_c2395_1 (void *cls, const gsi::Callbac } +// emitter void QAbstractTableModel::columnsAboutToBeInserted(const QModelIndex &parent, int first, int last) + +static void _init_emitter_columnsAboutToBeInserted_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_columnsAboutToBeInserted_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QAbstractTableModel_Adaptor *)cls)->emitter_QAbstractTableModel_columnsAboutToBeInserted_7372 (arg1, arg2, arg3); +} + + +// emitter void QAbstractTableModel::columnsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn) + +static void _init_emitter_columnsAboutToBeMoved_10318 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("sourceParent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("sourceStart"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("sourceEnd"); + decl->add_arg (argspec_2); + static gsi::ArgSpecBase argspec_3 ("destinationParent"); + decl->add_arg (argspec_3); + static gsi::ArgSpecBase argspec_4 ("destinationColumn"); + decl->add_arg (argspec_4); + decl->set_return (); +} + +static void _call_emitter_columnsAboutToBeMoved_10318 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + const QModelIndex &arg4 = gsi::arg_reader() (args, heap); + int arg5 = gsi::arg_reader() (args, heap); + ((QAbstractTableModel_Adaptor *)cls)->emitter_QAbstractTableModel_columnsAboutToBeMoved_10318 (arg1, arg2, arg3, arg4, arg5); +} + + +// emitter void QAbstractTableModel::columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last) + +static void _init_emitter_columnsAboutToBeRemoved_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_columnsAboutToBeRemoved_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QAbstractTableModel_Adaptor *)cls)->emitter_QAbstractTableModel_columnsAboutToBeRemoved_7372 (arg1, arg2, arg3); +} + + +// emitter void QAbstractTableModel::columnsInserted(const QModelIndex &parent, int first, int last) + +static void _init_emitter_columnsInserted_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_columnsInserted_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QAbstractTableModel_Adaptor *)cls)->emitter_QAbstractTableModel_columnsInserted_7372 (arg1, arg2, arg3); +} + + +// emitter void QAbstractTableModel::columnsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column) + +static void _init_emitter_columnsMoved_10318 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("start"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("end"); + decl->add_arg (argspec_2); + static gsi::ArgSpecBase argspec_3 ("destination"); + decl->add_arg (argspec_3); + static gsi::ArgSpecBase argspec_4 ("column"); + decl->add_arg (argspec_4); + decl->set_return (); +} + +static void _call_emitter_columnsMoved_10318 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + const QModelIndex &arg4 = gsi::arg_reader() (args, heap); + int arg5 = gsi::arg_reader() (args, heap); + ((QAbstractTableModel_Adaptor *)cls)->emitter_QAbstractTableModel_columnsMoved_10318 (arg1, arg2, arg3, arg4, arg5); +} + + +// emitter void QAbstractTableModel::columnsRemoved(const QModelIndex &parent, int first, int last) + +static void _init_emitter_columnsRemoved_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_columnsRemoved_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QAbstractTableModel_Adaptor *)cls)->emitter_QAbstractTableModel_columnsRemoved_7372 (arg1, arg2, arg3); +} + + // exposed QModelIndex QAbstractTableModel::createIndex(int row, int column, void *data) static void _init_fp_createIndex_c2374 (qt_gsi::GenericMethod *decl) @@ -2165,6 +2471,34 @@ static void _set_callback_cbs_mimeTypes_c0_0 (void *cls, const gsi::Callback &cb } +// emitter void QAbstractTableModel::modelAboutToBeReset() + +static void _init_emitter_modelAboutToBeReset_3767 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_emitter_modelAboutToBeReset_3767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + ((QAbstractTableModel_Adaptor *)cls)->emitter_QAbstractTableModel_modelAboutToBeReset_3767 (); +} + + +// emitter void QAbstractTableModel::modelReset() + +static void _init_emitter_modelReset_3767 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_emitter_modelReset_3767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + ((QAbstractTableModel_Adaptor *)cls)->emitter_QAbstractTableModel_modelReset_3767 (); +} + + // bool QAbstractTableModel::moveColumns(const QModelIndex &sourceParent, int sourceColumn, int count, const QModelIndex &destinationParent, int destinationChild) static void _init_cbs_moveColumns_6659_0 (qt_gsi::GenericMethod *decl) @@ -2235,6 +2569,24 @@ static void _set_callback_cbs_moveRows_6659_0 (void *cls, const gsi::Callback &c } +// emitter void QAbstractTableModel::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QAbstractTableModel_Adaptor *)cls)->emitter_QAbstractTableModel_objectNameChanged_4567 (arg1); +} + + // exposed QList QAbstractTableModel::persistentIndexList() static void _init_fp_persistentIndexList_c0 (qt_gsi::GenericMethod *decl) @@ -2402,6 +2754,162 @@ static void _set_callback_cbs_rowCount_c2395_1 (void *cls, const gsi::Callback & } +// emitter void QAbstractTableModel::rowsAboutToBeInserted(const QModelIndex &parent, int first, int last) + +static void _init_emitter_rowsAboutToBeInserted_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_rowsAboutToBeInserted_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QAbstractTableModel_Adaptor *)cls)->emitter_QAbstractTableModel_rowsAboutToBeInserted_7372 (arg1, arg2, arg3); +} + + +// emitter void QAbstractTableModel::rowsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow) + +static void _init_emitter_rowsAboutToBeMoved_10318 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("sourceParent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("sourceStart"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("sourceEnd"); + decl->add_arg (argspec_2); + static gsi::ArgSpecBase argspec_3 ("destinationParent"); + decl->add_arg (argspec_3); + static gsi::ArgSpecBase argspec_4 ("destinationRow"); + decl->add_arg (argspec_4); + decl->set_return (); +} + +static void _call_emitter_rowsAboutToBeMoved_10318 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + const QModelIndex &arg4 = gsi::arg_reader() (args, heap); + int arg5 = gsi::arg_reader() (args, heap); + ((QAbstractTableModel_Adaptor *)cls)->emitter_QAbstractTableModel_rowsAboutToBeMoved_10318 (arg1, arg2, arg3, arg4, arg5); +} + + +// emitter void QAbstractTableModel::rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last) + +static void _init_emitter_rowsAboutToBeRemoved_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_rowsAboutToBeRemoved_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QAbstractTableModel_Adaptor *)cls)->emitter_QAbstractTableModel_rowsAboutToBeRemoved_7372 (arg1, arg2, arg3); +} + + +// emitter void QAbstractTableModel::rowsInserted(const QModelIndex &parent, int first, int last) + +static void _init_emitter_rowsInserted_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_rowsInserted_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QAbstractTableModel_Adaptor *)cls)->emitter_QAbstractTableModel_rowsInserted_7372 (arg1, arg2, arg3); +} + + +// emitter void QAbstractTableModel::rowsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row) + +static void _init_emitter_rowsMoved_10318 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("start"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("end"); + decl->add_arg (argspec_2); + static gsi::ArgSpecBase argspec_3 ("destination"); + decl->add_arg (argspec_3); + static gsi::ArgSpecBase argspec_4 ("row"); + decl->add_arg (argspec_4); + decl->set_return (); +} + +static void _call_emitter_rowsMoved_10318 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + const QModelIndex &arg4 = gsi::arg_reader() (args, heap); + int arg5 = gsi::arg_reader() (args, heap); + ((QAbstractTableModel_Adaptor *)cls)->emitter_QAbstractTableModel_rowsMoved_10318 (arg1, arg2, arg3, arg4, arg5); +} + + +// emitter void QAbstractTableModel::rowsRemoved(const QModelIndex &parent, int first, int last) + +static void _init_emitter_rowsRemoved_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_rowsRemoved_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QAbstractTableModel_Adaptor *)cls)->emitter_QAbstractTableModel_rowsRemoved_7372 (arg1, arg2, arg3); +} + + // exposed QObject *QAbstractTableModel::sender() static void _init_fp_sender_c0 (qt_gsi::GenericMethod *decl) @@ -2704,6 +3212,12 @@ static gsi::Methods methods_QAbstractTableModel_Adaptor () { methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("columnCount", "@brief Virtual method int QAbstractTableModel::columnCount(const QModelIndex &parent)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_columnCount_c2395_1, &_call_cbs_columnCount_c2395_1); methods += new qt_gsi::GenericMethod ("columnCount", "@hide", true, &_init_cbs_columnCount_c2395_1, &_call_cbs_columnCount_c2395_1, &_set_callback_cbs_columnCount_c2395_1); + methods += new qt_gsi::GenericMethod ("emit_columnsAboutToBeInserted", "@brief Emitter for signal void QAbstractTableModel::columnsAboutToBeInserted(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_columnsAboutToBeInserted_7372, &_call_emitter_columnsAboutToBeInserted_7372); + methods += new qt_gsi::GenericMethod ("emit_columnsAboutToBeMoved", "@brief Emitter for signal void QAbstractTableModel::columnsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn)\nCall this method to emit this signal.", false, &_init_emitter_columnsAboutToBeMoved_10318, &_call_emitter_columnsAboutToBeMoved_10318); + methods += new qt_gsi::GenericMethod ("emit_columnsAboutToBeRemoved", "@brief Emitter for signal void QAbstractTableModel::columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_columnsAboutToBeRemoved_7372, &_call_emitter_columnsAboutToBeRemoved_7372); + methods += new qt_gsi::GenericMethod ("emit_columnsInserted", "@brief Emitter for signal void QAbstractTableModel::columnsInserted(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_columnsInserted_7372, &_call_emitter_columnsInserted_7372); + methods += new qt_gsi::GenericMethod ("emit_columnsMoved", "@brief Emitter for signal void QAbstractTableModel::columnsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column)\nCall this method to emit this signal.", false, &_init_emitter_columnsMoved_10318, &_call_emitter_columnsMoved_10318); + methods += new qt_gsi::GenericMethod ("emit_columnsRemoved", "@brief Emitter for signal void QAbstractTableModel::columnsRemoved(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_columnsRemoved_7372, &_call_emitter_columnsRemoved_7372); methods += new qt_gsi::GenericMethod ("*createIndex", "@brief Method QModelIndex QAbstractTableModel::createIndex(int row, int column, void *data)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_createIndex_c2374, &_call_fp_createIndex_c2374); methods += new qt_gsi::GenericMethod ("*createIndex", "@brief Method QModelIndex QAbstractTableModel::createIndex(int row, int column, quintptr id)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_createIndex_c2657, &_call_fp_createIndex_c2657); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QAbstractTableModel::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); @@ -2753,10 +3267,13 @@ static gsi::Methods methods_QAbstractTableModel_Adaptor () { methods += new qt_gsi::GenericMethod ("mimeData", "@hide", true, &_init_cbs_mimeData_c3010_0, &_call_cbs_mimeData_c3010_0, &_set_callback_cbs_mimeData_c3010_0); methods += new qt_gsi::GenericMethod ("mimeTypes", "@brief Virtual method QStringList QAbstractTableModel::mimeTypes()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_mimeTypes_c0_0, &_call_cbs_mimeTypes_c0_0); methods += new qt_gsi::GenericMethod ("mimeTypes", "@hide", true, &_init_cbs_mimeTypes_c0_0, &_call_cbs_mimeTypes_c0_0, &_set_callback_cbs_mimeTypes_c0_0); + methods += new qt_gsi::GenericMethod ("emit_modelAboutToBeReset", "@brief Emitter for signal void QAbstractTableModel::modelAboutToBeReset()\nCall this method to emit this signal.", false, &_init_emitter_modelAboutToBeReset_3767, &_call_emitter_modelAboutToBeReset_3767); + methods += new qt_gsi::GenericMethod ("emit_modelReset", "@brief Emitter for signal void QAbstractTableModel::modelReset()\nCall this method to emit this signal.", false, &_init_emitter_modelReset_3767, &_call_emitter_modelReset_3767); methods += new qt_gsi::GenericMethod ("moveColumns", "@brief Virtual method bool QAbstractTableModel::moveColumns(const QModelIndex &sourceParent, int sourceColumn, int count, const QModelIndex &destinationParent, int destinationChild)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_moveColumns_6659_0, &_call_cbs_moveColumns_6659_0); methods += new qt_gsi::GenericMethod ("moveColumns", "@hide", false, &_init_cbs_moveColumns_6659_0, &_call_cbs_moveColumns_6659_0, &_set_callback_cbs_moveColumns_6659_0); methods += new qt_gsi::GenericMethod ("moveRows", "@brief Virtual method bool QAbstractTableModel::moveRows(const QModelIndex &sourceParent, int sourceRow, int count, const QModelIndex &destinationParent, int destinationChild)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_moveRows_6659_0, &_call_cbs_moveRows_6659_0); methods += new qt_gsi::GenericMethod ("moveRows", "@hide", false, &_init_cbs_moveRows_6659_0, &_call_cbs_moveRows_6659_0, &_set_callback_cbs_moveRows_6659_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QAbstractTableModel::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*persistentIndexList", "@brief Method QList QAbstractTableModel::persistentIndexList()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_persistentIndexList_c0, &_call_fp_persistentIndexList_c0); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QAbstractTableModel::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("removeColumns", "@brief Virtual method bool QAbstractTableModel::removeColumns(int column, int count, const QModelIndex &parent)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_removeColumns_3713_1, &_call_cbs_removeColumns_3713_1); @@ -2770,6 +3287,12 @@ static gsi::Methods methods_QAbstractTableModel_Adaptor () { methods += new qt_gsi::GenericMethod ("roleNames", "@hide", true, &_init_cbs_roleNames_c0_0, &_call_cbs_roleNames_c0_0, &_set_callback_cbs_roleNames_c0_0); methods += new qt_gsi::GenericMethod ("rowCount", "@brief Virtual method int QAbstractTableModel::rowCount(const QModelIndex &parent)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_rowCount_c2395_1, &_call_cbs_rowCount_c2395_1); methods += new qt_gsi::GenericMethod ("rowCount", "@hide", true, &_init_cbs_rowCount_c2395_1, &_call_cbs_rowCount_c2395_1, &_set_callback_cbs_rowCount_c2395_1); + methods += new qt_gsi::GenericMethod ("emit_rowsAboutToBeInserted", "@brief Emitter for signal void QAbstractTableModel::rowsAboutToBeInserted(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_rowsAboutToBeInserted_7372, &_call_emitter_rowsAboutToBeInserted_7372); + methods += new qt_gsi::GenericMethod ("emit_rowsAboutToBeMoved", "@brief Emitter for signal void QAbstractTableModel::rowsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow)\nCall this method to emit this signal.", false, &_init_emitter_rowsAboutToBeMoved_10318, &_call_emitter_rowsAboutToBeMoved_10318); + methods += new qt_gsi::GenericMethod ("emit_rowsAboutToBeRemoved", "@brief Emitter for signal void QAbstractTableModel::rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_rowsAboutToBeRemoved_7372, &_call_emitter_rowsAboutToBeRemoved_7372); + methods += new qt_gsi::GenericMethod ("emit_rowsInserted", "@brief Emitter for signal void QAbstractTableModel::rowsInserted(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_rowsInserted_7372, &_call_emitter_rowsInserted_7372); + methods += new qt_gsi::GenericMethod ("emit_rowsMoved", "@brief Emitter for signal void QAbstractTableModel::rowsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row)\nCall this method to emit this signal.", false, &_init_emitter_rowsMoved_10318, &_call_emitter_rowsMoved_10318); + methods += new qt_gsi::GenericMethod ("emit_rowsRemoved", "@brief Emitter for signal void QAbstractTableModel::rowsRemoved(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_rowsRemoved_7372, &_call_emitter_rowsRemoved_7372); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QAbstractTableModel::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QAbstractTableModel::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); methods += new qt_gsi::GenericMethod ("setData", "@brief Virtual method bool QAbstractTableModel::setData(const QModelIndex &index, const QVariant &value, int role)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_setData_5065_1, &_call_cbs_setData_5065_1); diff --git a/src/gsiqt/qt5/QtCore/gsiDeclQAbstractTransition.cc b/src/gsiqt/qt5/QtCore/gsiDeclQAbstractTransition.cc index b333114f9..dbae14c12 100644 --- a/src/gsiqt/qt5/QtCore/gsiDeclQAbstractTransition.cc +++ b/src/gsiqt/qt5/QtCore/gsiDeclQAbstractTransition.cc @@ -317,6 +317,10 @@ static gsi::Methods methods_QAbstractTransition () { methods += new qt_gsi::GenericMethod (":targetStates", "@brief Method QList QAbstractTransition::targetStates()\n", true, &_init_f_targetStates_c0, &_call_f_targetStates_c0); methods += new qt_gsi::GenericMethod (":transitionType", "@brief Method QAbstractTransition::TransitionType QAbstractTransition::transitionType()\n", true, &_init_f_transitionType_c0, &_call_f_transitionType_c0); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QAbstractTransition::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QAbstractTransition::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("targetStateChanged()", "targetStateChanged", "@brief Signal declaration for QAbstractTransition::targetStateChanged()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("targetStatesChanged()", "targetStatesChanged", "@brief Signal declaration for QAbstractTransition::targetStatesChanged()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("triggered()", "triggered", "@brief Signal declaration for QAbstractTransition::triggered()\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QAbstractTransition::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QAbstractTransition::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -392,6 +396,31 @@ public: } } + // [emitter impl] void QAbstractTransition::objectNameChanged(const QString &objectName) + void emitter_QAbstractTransition_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QAbstractTransition::objectNameChanged(const QString &objectName)'"); + } + + // [emitter impl] void QAbstractTransition::targetStateChanged() + void emitter_QAbstractTransition_targetStateChanged_3938() + { + throw tl::Exception ("Can't emit private signal 'void QAbstractTransition::targetStateChanged()'"); + } + + // [emitter impl] void QAbstractTransition::targetStatesChanged() + void emitter_QAbstractTransition_targetStatesChanged_3938() + { + throw tl::Exception ("Can't emit private signal 'void QAbstractTransition::targetStatesChanged()'"); + } + + // [emitter impl] void QAbstractTransition::triggered() + void emitter_QAbstractTransition_triggered_3938() + { + throw tl::Exception ("Can't emit private signal 'void QAbstractTransition::triggered()'"); + } + // [adaptor impl] void QAbstractTransition::childEvent(QChildEvent *) void cbs_childEvent_1701_0(QChildEvent *arg1) { @@ -709,6 +738,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QAbstractTransition::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QAbstractTransition_Adaptor *)cls)->emitter_QAbstractTransition_objectNameChanged_4567 (arg1); +} + + // void QAbstractTransition::onTransition(QEvent *event) static void _init_cbs_onTransition_1217_0 (qt_gsi::GenericMethod *decl) @@ -779,6 +826,34 @@ static void _call_fp_senderSignalIndex_c0 (const qt_gsi::GenericMethod * /*decl* } +// emitter void QAbstractTransition::targetStateChanged() + +static void _init_emitter_targetStateChanged_3938 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_emitter_targetStateChanged_3938 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + ((QAbstractTransition_Adaptor *)cls)->emitter_QAbstractTransition_targetStateChanged_3938 (); +} + + +// emitter void QAbstractTransition::targetStatesChanged() + +static void _init_emitter_targetStatesChanged_3938 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_emitter_targetStatesChanged_3938 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + ((QAbstractTransition_Adaptor *)cls)->emitter_QAbstractTransition_targetStatesChanged_3938 (); +} + + // void QAbstractTransition::timerEvent(QTimerEvent *) static void _init_cbs_timerEvent_1730_0 (qt_gsi::GenericMethod *decl) @@ -803,6 +878,20 @@ static void _set_callback_cbs_timerEvent_1730_0 (void *cls, const gsi::Callback } +// emitter void QAbstractTransition::triggered() + +static void _init_emitter_triggered_3938 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_emitter_triggered_3938 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + ((QAbstractTransition_Adaptor *)cls)->emitter_QAbstractTransition_triggered_3938 (); +} + + namespace gsi { @@ -825,13 +914,17 @@ static gsi::Methods methods_QAbstractTransition_Adaptor () { methods += new qt_gsi::GenericMethod ("*eventTest", "@brief Virtual method bool QAbstractTransition::eventTest(QEvent *event)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventTest_1217_0, &_call_cbs_eventTest_1217_0); methods += new qt_gsi::GenericMethod ("*eventTest", "@hide", false, &_init_cbs_eventTest_1217_0, &_call_cbs_eventTest_1217_0, &_set_callback_cbs_eventTest_1217_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QAbstractTransition::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QAbstractTransition::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*onTransition", "@brief Virtual method void QAbstractTransition::onTransition(QEvent *event)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_onTransition_1217_0, &_call_cbs_onTransition_1217_0); methods += new qt_gsi::GenericMethod ("*onTransition", "@hide", false, &_init_cbs_onTransition_1217_0, &_call_cbs_onTransition_1217_0, &_set_callback_cbs_onTransition_1217_0); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QAbstractTransition::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QAbstractTransition::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QAbstractTransition::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); + methods += new qt_gsi::GenericMethod ("emit_targetStateChanged", "@brief Emitter for signal void QAbstractTransition::targetStateChanged()\nCall this method to emit this signal.", false, &_init_emitter_targetStateChanged_3938, &_call_emitter_targetStateChanged_3938); + methods += new qt_gsi::GenericMethod ("emit_targetStatesChanged", "@brief Emitter for signal void QAbstractTransition::targetStatesChanged()\nCall this method to emit this signal.", false, &_init_emitter_targetStatesChanged_3938, &_call_emitter_targetStatesChanged_3938); methods += new qt_gsi::GenericMethod ("*timerEvent", "@brief Virtual method void QAbstractTransition::timerEvent(QTimerEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_timerEvent_1730_0, &_call_cbs_timerEvent_1730_0); methods += new qt_gsi::GenericMethod ("*timerEvent", "@hide", false, &_init_cbs_timerEvent_1730_0, &_call_cbs_timerEvent_1730_0, &_set_callback_cbs_timerEvent_1730_0); + methods += new qt_gsi::GenericMethod ("emit_triggered", "@brief Emitter for signal void QAbstractTransition::triggered()\nCall this method to emit this signal.", false, &_init_emitter_triggered_3938, &_call_emitter_triggered_3938); return methods; } diff --git a/src/gsiqt/qt5/QtCore/gsiDeclQAnimationDriver.cc b/src/gsiqt/qt5/QtCore/gsiDeclQAnimationDriver.cc index 719885e82..f0cf3fe2f 100644 --- a/src/gsiqt/qt5/QtCore/gsiDeclQAnimationDriver.cc +++ b/src/gsiqt/qt5/QtCore/gsiDeclQAnimationDriver.cc @@ -232,6 +232,7 @@ static gsi::Methods methods_QAnimationDriver () { methods += new qt_gsi::GenericMethod (":startTime", "@brief Method qint64 QAnimationDriver::startTime()\n", true, &_init_f_startTime_c0, &_call_f_startTime_c0); methods += new qt_gsi::GenericMethod ("uninstall", "@brief Method void QAnimationDriver::uninstall()\n", false, &_init_f_uninstall_0, &_call_f_uninstall_0); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QAnimationDriver::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QAnimationDriver::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("started()", "started", "@brief Signal declaration for QAnimationDriver::started()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("stopped()", "stopped", "@brief Signal declaration for QAnimationDriver::stopped()\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QAnimationDriver::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); @@ -359,6 +360,13 @@ public: } } + // [emitter impl] void QAnimationDriver::objectNameChanged(const QString &objectName) + void emitter_QAnimationDriver_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QAnimationDriver::objectNameChanged(const QString &objectName)'"); + } + // [emitter impl] void QAnimationDriver::started() void emitter_QAnimationDriver_started_0() { @@ -708,6 +716,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QAnimationDriver::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QAnimationDriver_Adaptor *)cls)->emitter_QAnimationDriver_objectNameChanged_4567 (arg1); +} + + // exposed int QAnimationDriver::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -871,6 +897,7 @@ static gsi::Methods methods_QAnimationDriver_Adaptor () { methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QAnimationDriver::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QAnimationDriver::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QAnimationDriver::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QAnimationDriver::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QAnimationDriver::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QAnimationDriver::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); diff --git a/src/gsiqt/qt5/QtCore/gsiDeclQAnimationGroup.cc b/src/gsiqt/qt5/QtCore/gsiDeclQAnimationGroup.cc index d618b5e4d..d3f28c7e0 100644 --- a/src/gsiqt/qt5/QtCore/gsiDeclQAnimationGroup.cc +++ b/src/gsiqt/qt5/QtCore/gsiDeclQAnimationGroup.cc @@ -275,6 +275,7 @@ static gsi::Methods methods_QAnimationGroup () { methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QAnimationGroup::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal::target_type & > ("directionChanged(QAbstractAnimation::Direction)", "directionChanged", gsi::arg("arg1"), "@brief Signal declaration for QAnimationGroup::directionChanged(QAbstractAnimation::Direction)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("finished()", "finished", "@brief Signal declaration for QAnimationGroup::finished()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QAnimationGroup::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal::target_type &, const qt_gsi::Converter::target_type & > ("stateChanged(QAbstractAnimation::State, QAbstractAnimation::State)", "stateChanged", gsi::arg("newState"), gsi::arg("oldState"), "@brief Signal declaration for QAnimationGroup::stateChanged(QAbstractAnimation::State newState, QAbstractAnimation::State oldState)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QAnimationGroup::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QAnimationGroup::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); @@ -384,6 +385,13 @@ public: emit QAnimationGroup::finished(); } + // [emitter impl] void QAnimationGroup::objectNameChanged(const QString &objectName) + void emitter_QAnimationGroup_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QAnimationGroup::objectNameChanged(const QString &objectName)'"); + } + // [emitter impl] void QAnimationGroup::stateChanged(QAbstractAnimation::State newState, QAbstractAnimation::State oldState) void emitter_QAnimationGroup_stateChanged_5680(QAbstractAnimation::State newState, QAbstractAnimation::State oldState) { @@ -769,6 +777,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QAnimationGroup::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QAnimationGroup_Adaptor *)cls)->emitter_QAnimationGroup_objectNameChanged_4567 (arg1); +} + + // exposed int QAnimationGroup::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -960,6 +986,7 @@ static gsi::Methods methods_QAnimationGroup_Adaptor () { methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("emit_finished", "@brief Emitter for signal void QAnimationGroup::finished()\nCall this method to emit this signal.", false, &_init_emitter_finished_0, &_call_emitter_finished_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QAnimationGroup::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QAnimationGroup::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QAnimationGroup::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QAnimationGroup::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QAnimationGroup::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); diff --git a/src/gsiqt/qt5/QtCore/gsiDeclQBuffer.cc b/src/gsiqt/qt5/QtCore/gsiDeclQBuffer.cc index 0994e7240..558569917 100644 --- a/src/gsiqt/qt5/QtCore/gsiDeclQBuffer.cc +++ b/src/gsiqt/qt5/QtCore/gsiDeclQBuffer.cc @@ -391,6 +391,7 @@ static gsi::Methods methods_QBuffer () { methods += gsi::qt_signal ("aboutToClose()", "aboutToClose", "@brief Signal declaration for QBuffer::aboutToClose()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("bytesWritten(qint64)", "bytesWritten", gsi::arg("bytes"), "@brief Signal declaration for QBuffer::bytesWritten(qint64 bytes)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QBuffer::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QBuffer::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("readChannelFinished()", "readChannelFinished", "@brief Signal declaration for QBuffer::readChannelFinished()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("readyRead()", "readyRead", "@brief Signal declaration for QBuffer::readyRead()\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QBuffer::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); diff --git a/src/gsiqt/qt5/QtCore/gsiDeclQCoreApplication.cc b/src/gsiqt/qt5/QtCore/gsiDeclQCoreApplication.cc index e7569ed1e..a1c0120d2 100644 --- a/src/gsiqt/qt5/QtCore/gsiDeclQCoreApplication.cc +++ b/src/gsiqt/qt5/QtCore/gsiDeclQCoreApplication.cc @@ -926,9 +926,11 @@ static gsi::Methods methods_QCoreApplication () { methods += new qt_gsi::GenericMethod ("installNativeEventFilter", "@brief Method void QCoreApplication::installNativeEventFilter(QAbstractNativeEventFilter *filterObj)\n", false, &_init_f_installNativeEventFilter_3266, &_call_f_installNativeEventFilter_3266); methods += new qt_gsi::GenericMethod ("notify", "@brief Method bool QCoreApplication::notify(QObject *, QEvent *)\n", false, &_init_f_notify_2411, &_call_f_notify_2411); methods += new qt_gsi::GenericMethod ("removeNativeEventFilter", "@brief Method void QCoreApplication::removeNativeEventFilter(QAbstractNativeEventFilter *filterObj)\n", false, &_init_f_removeNativeEventFilter_3266, &_call_f_removeNativeEventFilter_3266); + methods += gsi::qt_signal ("aboutToQuit()", "aboutToQuit", "@brief Signal declaration for QCoreApplication::aboutToQuit()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("applicationNameChanged()", "applicationNameChanged", "@brief Signal declaration for QCoreApplication::applicationNameChanged()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("applicationVersionChanged()", "applicationVersionChanged", "@brief Signal declaration for QCoreApplication::applicationVersionChanged()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QCoreApplication::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QCoreApplication::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("organizationDomainChanged()", "organizationDomainChanged", "@brief Signal declaration for QCoreApplication::organizationDomainChanged()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("organizationNameChanged()", "organizationNameChanged", "@brief Signal declaration for QCoreApplication::organizationNameChanged()\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("addLibraryPath", "@brief Static method void QCoreApplication::addLibraryPath(const QString &)\nThis method is static and can be called without an instance.", &_init_f_addLibraryPath_2025, &_call_f_addLibraryPath_2025); @@ -1035,6 +1037,12 @@ public: return QCoreApplication::senderSignalIndex(); } + // [emitter impl] void QCoreApplication::aboutToQuit() + void emitter_QCoreApplication_aboutToQuit_3584() + { + throw tl::Exception ("Can't emit private signal 'void QCoreApplication::aboutToQuit()'"); + } + // [emitter impl] void QCoreApplication::applicationNameChanged() void emitter_QCoreApplication_applicationNameChanged_0() { @@ -1083,6 +1091,13 @@ public: } } + // [emitter impl] void QCoreApplication::objectNameChanged(const QString &objectName) + void emitter_QCoreApplication_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QCoreApplication::objectNameChanged(const QString &objectName)'"); + } + // [emitter impl] void QCoreApplication::organizationDomainChanged() void emitter_QCoreApplication_organizationDomainChanged_0() { @@ -1181,6 +1196,20 @@ public: QCoreApplication_Adaptor::~QCoreApplication_Adaptor() { } +// emitter void QCoreApplication::aboutToQuit() + +static void _init_emitter_aboutToQuit_3584 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_emitter_aboutToQuit_3584 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + ((QCoreApplication_Adaptor *)cls)->emitter_QCoreApplication_aboutToQuit_3584 (); +} + + // emitter void QCoreApplication::applicationNameChanged() static void _init_emitter_applicationNameChanged_0 (qt_gsi::GenericMethod *decl) @@ -1392,6 +1421,24 @@ static void _set_callback_cbs_notify_2411_0 (void *cls, const gsi::Callback &cb) } +// emitter void QCoreApplication::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QCoreApplication_Adaptor *)cls)->emitter_QCoreApplication_objectNameChanged_4567 (arg1); +} + + // emitter void QCoreApplication::organizationDomainChanged() static void _init_emitter_organizationDomainChanged_0 (qt_gsi::GenericMethod *decl) @@ -1497,6 +1544,7 @@ gsi::Class &qtdecl_QCoreApplication (); static gsi::Methods methods_QCoreApplication_Adaptor () { gsi::Methods methods; + methods += new qt_gsi::GenericMethod ("emit_aboutToQuit", "@brief Emitter for signal void QCoreApplication::aboutToQuit()\nCall this method to emit this signal.", false, &_init_emitter_aboutToQuit_3584, &_call_emitter_aboutToQuit_3584); methods += new qt_gsi::GenericMethod ("emit_applicationNameChanged", "@brief Emitter for signal void QCoreApplication::applicationNameChanged()\nCall this method to emit this signal.", false, &_init_emitter_applicationNameChanged_0, &_call_emitter_applicationNameChanged_0); methods += new qt_gsi::GenericMethod ("emit_applicationVersionChanged", "@brief Emitter for signal void QCoreApplication::applicationVersionChanged()\nCall this method to emit this signal.", false, &_init_emitter_applicationVersionChanged_0, &_call_emitter_applicationVersionChanged_0); methods += new qt_gsi::GenericMethod ("*childEvent", "@brief Virtual method void QCoreApplication::childEvent(QChildEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0); @@ -1513,6 +1561,7 @@ static gsi::Methods methods_QCoreApplication_Adaptor () { methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QCoreApplication::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); methods += new qt_gsi::GenericMethod ("notify", "@brief Virtual method bool QCoreApplication::notify(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_notify_2411_0, &_call_cbs_notify_2411_0); methods += new qt_gsi::GenericMethod ("notify", "@hide", false, &_init_cbs_notify_2411_0, &_call_cbs_notify_2411_0, &_set_callback_cbs_notify_2411_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QCoreApplication::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("emit_organizationDomainChanged", "@brief Emitter for signal void QCoreApplication::organizationDomainChanged()\nCall this method to emit this signal.", false, &_init_emitter_organizationDomainChanged_0, &_call_emitter_organizationDomainChanged_0); methods += new qt_gsi::GenericMethod ("emit_organizationNameChanged", "@brief Emitter for signal void QCoreApplication::organizationNameChanged()\nCall this method to emit this signal.", false, &_init_emitter_organizationNameChanged_0, &_call_emitter_organizationNameChanged_0); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QCoreApplication::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); diff --git a/src/gsiqt/qt5/QtCore/gsiDeclQEventLoop.cc b/src/gsiqt/qt5/QtCore/gsiDeclQEventLoop.cc index 0fda24464..a0c4b454d 100644 --- a/src/gsiqt/qt5/QtCore/gsiDeclQEventLoop.cc +++ b/src/gsiqt/qt5/QtCore/gsiDeclQEventLoop.cc @@ -267,6 +267,7 @@ static gsi::Methods methods_QEventLoop () { methods += new qt_gsi::GenericMethod ("quit", "@brief Method void QEventLoop::quit()\n", false, &_init_f_quit_0, &_call_f_quit_0); methods += new qt_gsi::GenericMethod ("wakeUp", "@brief Method void QEventLoop::wakeUp()\n", false, &_init_f_wakeUp_0, &_call_f_wakeUp_0); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QEventLoop::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QEventLoop::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QEventLoop::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QEventLoop::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -357,6 +358,13 @@ public: } } + // [emitter impl] void QEventLoop::objectNameChanged(const QString &objectName) + void emitter_QEventLoop_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QEventLoop::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] void QEventLoop::childEvent(QChildEvent *) void cbs_childEvent_1701_0(QChildEvent *arg1) { @@ -602,6 +610,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QEventLoop::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QEventLoop_Adaptor *)cls)->emitter_QEventLoop_objectNameChanged_4567 (arg1); +} + + // exposed int QEventLoop::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -692,6 +718,7 @@ static gsi::Methods methods_QEventLoop_Adaptor () { methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QEventLoop::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QEventLoop::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QEventLoop::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QEventLoop::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QEventLoop::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QEventLoop::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); diff --git a/src/gsiqt/qt5/QtCore/gsiDeclQEventTransition.cc b/src/gsiqt/qt5/QtCore/gsiDeclQEventTransition.cc index e2d50cca1..4594f6ab9 100644 --- a/src/gsiqt/qt5/QtCore/gsiDeclQEventTransition.cc +++ b/src/gsiqt/qt5/QtCore/gsiDeclQEventTransition.cc @@ -190,6 +190,10 @@ static gsi::Methods methods_QEventTransition () { methods += new qt_gsi::GenericMethod ("setEventSource|eventSource=", "@brief Method void QEventTransition::setEventSource(QObject *object)\n", false, &_init_f_setEventSource_1302, &_call_f_setEventSource_1302); methods += new qt_gsi::GenericMethod ("setEventType|eventType=", "@brief Method void QEventTransition::setEventType(QEvent::Type type)\n", false, &_init_f_setEventType_1565, &_call_f_setEventType_1565); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QEventTransition::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QEventTransition::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("targetStateChanged()", "targetStateChanged", "@brief Signal declaration for QEventTransition::targetStateChanged()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("targetStatesChanged()", "targetStatesChanged", "@brief Signal declaration for QEventTransition::targetStatesChanged()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("triggered()", "triggered", "@brief Signal declaration for QEventTransition::triggered()\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QEventTransition::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QEventTransition::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -277,6 +281,31 @@ public: } } + // [emitter impl] void QEventTransition::objectNameChanged(const QString &objectName) + void emitter_QEventTransition_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QEventTransition::objectNameChanged(const QString &objectName)'"); + } + + // [emitter impl] void QEventTransition::targetStateChanged() + void emitter_QEventTransition_targetStateChanged_3938() + { + throw tl::Exception ("Can't emit private signal 'void QEventTransition::targetStateChanged()'"); + } + + // [emitter impl] void QEventTransition::targetStatesChanged() + void emitter_QEventTransition_targetStatesChanged_3938() + { + throw tl::Exception ("Can't emit private signal 'void QEventTransition::targetStatesChanged()'"); + } + + // [emitter impl] void QEventTransition::triggered() + void emitter_QEventTransition_triggered_3938() + { + throw tl::Exception ("Can't emit private signal 'void QEventTransition::triggered()'"); + } + // [adaptor impl] void QEventTransition::childEvent(QChildEvent *) void cbs_childEvent_1701_0(QChildEvent *arg1) { @@ -616,6 +645,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QEventTransition::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QEventTransition_Adaptor *)cls)->emitter_QEventTransition_objectNameChanged_4567 (arg1); +} + + // void QEventTransition::onTransition(QEvent *event) static void _init_cbs_onTransition_1217_0 (qt_gsi::GenericMethod *decl) @@ -686,6 +733,34 @@ static void _call_fp_senderSignalIndex_c0 (const qt_gsi::GenericMethod * /*decl* } +// emitter void QEventTransition::targetStateChanged() + +static void _init_emitter_targetStateChanged_3938 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_emitter_targetStateChanged_3938 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + ((QEventTransition_Adaptor *)cls)->emitter_QEventTransition_targetStateChanged_3938 (); +} + + +// emitter void QEventTransition::targetStatesChanged() + +static void _init_emitter_targetStatesChanged_3938 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_emitter_targetStatesChanged_3938 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + ((QEventTransition_Adaptor *)cls)->emitter_QEventTransition_targetStatesChanged_3938 (); +} + + // void QEventTransition::timerEvent(QTimerEvent *) static void _init_cbs_timerEvent_1730_0 (qt_gsi::GenericMethod *decl) @@ -710,6 +785,20 @@ static void _set_callback_cbs_timerEvent_1730_0 (void *cls, const gsi::Callback } +// emitter void QEventTransition::triggered() + +static void _init_emitter_triggered_3938 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_emitter_triggered_3938 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + ((QEventTransition_Adaptor *)cls)->emitter_QEventTransition_triggered_3938 (); +} + + namespace gsi { @@ -733,13 +822,17 @@ static gsi::Methods methods_QEventTransition_Adaptor () { methods += new qt_gsi::GenericMethod ("*eventTest", "@brief Virtual method bool QEventTransition::eventTest(QEvent *event)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventTest_1217_0, &_call_cbs_eventTest_1217_0); methods += new qt_gsi::GenericMethod ("*eventTest", "@hide", false, &_init_cbs_eventTest_1217_0, &_call_cbs_eventTest_1217_0, &_set_callback_cbs_eventTest_1217_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QEventTransition::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QEventTransition::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*onTransition", "@brief Virtual method void QEventTransition::onTransition(QEvent *event)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_onTransition_1217_0, &_call_cbs_onTransition_1217_0); methods += new qt_gsi::GenericMethod ("*onTransition", "@hide", false, &_init_cbs_onTransition_1217_0, &_call_cbs_onTransition_1217_0, &_set_callback_cbs_onTransition_1217_0); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QEventTransition::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QEventTransition::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QEventTransition::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); + methods += new qt_gsi::GenericMethod ("emit_targetStateChanged", "@brief Emitter for signal void QEventTransition::targetStateChanged()\nCall this method to emit this signal.", false, &_init_emitter_targetStateChanged_3938, &_call_emitter_targetStateChanged_3938); + methods += new qt_gsi::GenericMethod ("emit_targetStatesChanged", "@brief Emitter for signal void QEventTransition::targetStatesChanged()\nCall this method to emit this signal.", false, &_init_emitter_targetStatesChanged_3938, &_call_emitter_targetStatesChanged_3938); methods += new qt_gsi::GenericMethod ("*timerEvent", "@brief Virtual method void QEventTransition::timerEvent(QTimerEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_timerEvent_1730_0, &_call_cbs_timerEvent_1730_0); methods += new qt_gsi::GenericMethod ("*timerEvent", "@hide", false, &_init_cbs_timerEvent_1730_0, &_call_cbs_timerEvent_1730_0, &_set_callback_cbs_timerEvent_1730_0); + methods += new qt_gsi::GenericMethod ("emit_triggered", "@brief Emitter for signal void QEventTransition::triggered()\nCall this method to emit this signal.", false, &_init_emitter_triggered_3938, &_call_emitter_triggered_3938); return methods; } diff --git a/src/gsiqt/qt5/QtCore/gsiDeclQFile.cc b/src/gsiqt/qt5/QtCore/gsiDeclQFile.cc index 29ef41a53..e129f517e 100644 --- a/src/gsiqt/qt5/QtCore/gsiDeclQFile.cc +++ b/src/gsiqt/qt5/QtCore/gsiDeclQFile.cc @@ -688,6 +688,7 @@ static gsi::Methods methods_QFile () { methods += gsi::qt_signal ("aboutToClose()", "aboutToClose", "@brief Signal declaration for QFile::aboutToClose()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("bytesWritten(qint64)", "bytesWritten", gsi::arg("bytes"), "@brief Signal declaration for QFile::bytesWritten(qint64 bytes)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QFile::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QFile::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("readChannelFinished()", "readChannelFinished", "@brief Signal declaration for QFile::readChannelFinished()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("readyRead()", "readyRead", "@brief Signal declaration for QFile::readyRead()\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("copy", "@brief Static method bool QFile::copy(const QString &fileName, const QString &newName)\nThis method is static and can be called without an instance.", &_init_f_copy_3942, &_call_f_copy_3942); diff --git a/src/gsiqt/qt5/QtCore/gsiDeclQFileDevice.cc b/src/gsiqt/qt5/QtCore/gsiDeclQFileDevice.cc index a2656d84f..0f8e69cb0 100644 --- a/src/gsiqt/qt5/QtCore/gsiDeclQFileDevice.cc +++ b/src/gsiqt/qt5/QtCore/gsiDeclQFileDevice.cc @@ -352,6 +352,7 @@ static gsi::Methods methods_QFileDevice () { methods += gsi::qt_signal ("aboutToClose()", "aboutToClose", "@brief Signal declaration for QFileDevice::aboutToClose()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("bytesWritten(qint64)", "bytesWritten", gsi::arg("bytes"), "@brief Signal declaration for QFileDevice::bytesWritten(qint64 bytes)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QFileDevice::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QFileDevice::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("readChannelFinished()", "readChannelFinished", "@brief Signal declaration for QFileDevice::readChannelFinished()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("readyRead()", "readyRead", "@brief Signal declaration for QFileDevice::readyRead()\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QFileDevice::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); @@ -559,6 +560,13 @@ public: } } + // [emitter impl] void QFileDevice::objectNameChanged(const QString &objectName) + void emitter_QFileDevice_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QFileDevice::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] bool QFileDevice::open(QFlags mode) bool cbs_open_3242_0(QFlags mode) { @@ -1147,6 +1155,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QFileDevice::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QFileDevice_Adaptor *)cls)->emitter_QFileDevice_objectNameChanged_4567 (arg1); +} + + // bool QFileDevice::open(QFlags mode) static void _init_cbs_open_3242_0 (qt_gsi::GenericMethod *decl) @@ -1558,6 +1584,7 @@ static gsi::Methods methods_QFileDevice_Adaptor () { methods += new qt_gsi::GenericMethod ("isSequential", "@brief Virtual method bool QFileDevice::isSequential()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_isSequential_c0_0, &_call_cbs_isSequential_c0_0); methods += new qt_gsi::GenericMethod ("isSequential", "@hide", true, &_init_cbs_isSequential_c0_0, &_call_cbs_isSequential_c0_0, &_set_callback_cbs_isSequential_c0_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QFileDevice::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QFileDevice::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("open", "@brief Virtual method bool QFileDevice::open(QFlags mode)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_open_3242_0, &_call_cbs_open_3242_0); methods += new qt_gsi::GenericMethod ("open", "@hide", false, &_init_cbs_open_3242_0, &_call_cbs_open_3242_0, &_set_callback_cbs_open_3242_0); methods += new qt_gsi::GenericMethod ("permissions", "@brief Virtual method QFlags QFileDevice::permissions()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_permissions_c0_0, &_call_cbs_permissions_c0_0); diff --git a/src/gsiqt/qt5/QtCore/gsiDeclQFileSelector.cc b/src/gsiqt/qt5/QtCore/gsiDeclQFileSelector.cc index 86b231417..d6672a738 100644 --- a/src/gsiqt/qt5/QtCore/gsiDeclQFileSelector.cc +++ b/src/gsiqt/qt5/QtCore/gsiDeclQFileSelector.cc @@ -206,6 +206,7 @@ static gsi::Methods methods_QFileSelector () { methods += new qt_gsi::GenericMethod ("select", "@brief Method QUrl QFileSelector::select(const QUrl &filePath)\n", true, &_init_f_select_c1701, &_call_f_select_c1701); methods += new qt_gsi::GenericMethod ("setExtraSelectors|extraSelectors=", "@brief Method void QFileSelector::setExtraSelectors(const QStringList &list)\n", false, &_init_f_setExtraSelectors_2437, &_call_f_setExtraSelectors_2437); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QFileSelector::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QFileSelector::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QFileSelector::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QFileSelector::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -296,6 +297,13 @@ public: } } + // [emitter impl] void QFileSelector::objectNameChanged(const QString &objectName) + void emitter_QFileSelector_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QFileSelector::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] void QFileSelector::childEvent(QChildEvent *) void cbs_childEvent_1701_0(QChildEvent *arg1) { @@ -541,6 +549,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QFileSelector::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QFileSelector_Adaptor *)cls)->emitter_QFileSelector_objectNameChanged_4567 (arg1); +} + + // exposed int QFileSelector::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -631,6 +657,7 @@ static gsi::Methods methods_QFileSelector_Adaptor () { methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QFileSelector::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QFileSelector::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QFileSelector::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QFileSelector::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QFileSelector::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QFileSelector::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); diff --git a/src/gsiqt/qt5/QtCore/gsiDeclQFileSystemWatcher.cc b/src/gsiqt/qt5/QtCore/gsiDeclQFileSystemWatcher.cc index 90d8eba1b..b24ec273a 100644 --- a/src/gsiqt/qt5/QtCore/gsiDeclQFileSystemWatcher.cc +++ b/src/gsiqt/qt5/QtCore/gsiDeclQFileSystemWatcher.cc @@ -224,6 +224,9 @@ static gsi::Methods methods_QFileSystemWatcher () { methods += new qt_gsi::GenericMethod ("removePath", "@brief Method bool QFileSystemWatcher::removePath(const QString &file)\n", false, &_init_f_removePath_2025, &_call_f_removePath_2025); methods += new qt_gsi::GenericMethod ("removePaths", "@brief Method QStringList QFileSystemWatcher::removePaths(const QStringList &files)\n", false, &_init_f_removePaths_2437, &_call_f_removePaths_2437); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QFileSystemWatcher::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("directoryChanged(const QString &)", "directoryChanged", gsi::arg("path"), "@brief Signal declaration for QFileSystemWatcher::directoryChanged(const QString &path)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("fileChanged(const QString &)", "fileChanged", gsi::arg("path"), "@brief Signal declaration for QFileSystemWatcher::fileChanged(const QString &path)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QFileSystemWatcher::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QFileSystemWatcher::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QFileSystemWatcher::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -296,6 +299,13 @@ public: emit QFileSystemWatcher::destroyed(arg1); } + // [emitter impl] void QFileSystemWatcher::directoryChanged(const QString &path) + void emitter_QFileSystemWatcher_directoryChanged_5715(const QString &path) + { + __SUPPRESS_UNUSED_WARNING (path); + throw tl::Exception ("Can't emit private signal 'void QFileSystemWatcher::directoryChanged(const QString &path)'"); + } + // [adaptor impl] bool QFileSystemWatcher::event(QEvent *) bool cbs_event_1217_0(QEvent *arg1) { @@ -326,6 +336,20 @@ public: } } + // [emitter impl] void QFileSystemWatcher::fileChanged(const QString &path) + void emitter_QFileSystemWatcher_fileChanged_5715(const QString &path) + { + __SUPPRESS_UNUSED_WARNING (path); + throw tl::Exception ("Can't emit private signal 'void QFileSystemWatcher::fileChanged(const QString &path)'"); + } + + // [emitter impl] void QFileSystemWatcher::objectNameChanged(const QString &objectName) + void emitter_QFileSystemWatcher_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QFileSystemWatcher::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] void QFileSystemWatcher::childEvent(QChildEvent *) void cbs_childEvent_1701_0(QChildEvent *arg1) { @@ -501,6 +525,24 @@ static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/ } +// emitter void QFileSystemWatcher::directoryChanged(const QString &path) + +static void _init_emitter_directoryChanged_5715 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("path"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_directoryChanged_5715 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QFileSystemWatcher_Adaptor *)cls)->emitter_QFileSystemWatcher_directoryChanged_5715 (arg1); +} + + // void QFileSystemWatcher::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -574,6 +616,24 @@ static void _set_callback_cbs_eventFilter_2411_0 (void *cls, const gsi::Callback } +// emitter void QFileSystemWatcher::fileChanged(const QString &path) + +static void _init_emitter_fileChanged_5715 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("path"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_fileChanged_5715 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QFileSystemWatcher_Adaptor *)cls)->emitter_QFileSystemWatcher_fileChanged_5715 (arg1); +} + + // exposed bool QFileSystemWatcher::isSignalConnected(const QMetaMethod &signal) static void _init_fp_isSignalConnected_c2394 (qt_gsi::GenericMethod *decl) @@ -592,6 +652,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QFileSystemWatcher::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QFileSystemWatcher_Adaptor *)cls)->emitter_QFileSystemWatcher_objectNameChanged_4567 (arg1); +} + + // exposed int QFileSystemWatcher::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -676,13 +754,16 @@ static gsi::Methods methods_QFileSystemWatcher_Adaptor () { methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QFileSystemWatcher::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QFileSystemWatcher::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); + methods += new qt_gsi::GenericMethod ("emit_directoryChanged", "@brief Emitter for signal void QFileSystemWatcher::directoryChanged(const QString &path)\nCall this method to emit this signal.", false, &_init_emitter_directoryChanged_5715, &_call_emitter_directoryChanged_5715); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QFileSystemWatcher::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("event", "@brief Virtual method bool QFileSystemWatcher::event(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0); methods += new qt_gsi::GenericMethod ("event", "@hide", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0, &_set_callback_cbs_event_1217_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QFileSystemWatcher::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); + methods += new qt_gsi::GenericMethod ("emit_fileChanged", "@brief Emitter for signal void QFileSystemWatcher::fileChanged(const QString &path)\nCall this method to emit this signal.", false, &_init_emitter_fileChanged_5715, &_call_emitter_fileChanged_5715); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QFileSystemWatcher::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QFileSystemWatcher::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QFileSystemWatcher::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QFileSystemWatcher::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QFileSystemWatcher::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); diff --git a/src/gsiqt/qt5/QtCore/gsiDeclQFinalState.cc b/src/gsiqt/qt5/QtCore/gsiDeclQFinalState.cc index cd97c4357..02eddb35b 100644 --- a/src/gsiqt/qt5/QtCore/gsiDeclQFinalState.cc +++ b/src/gsiqt/qt5/QtCore/gsiDeclQFinalState.cc @@ -115,6 +115,9 @@ static gsi::Methods methods_QFinalState () { methods += new qt_gsi::GenericStaticMethod ("staticMetaObject", "@brief Obtains the static MetaObject for this class.", &_init_smo, &_call_smo); methods += gsi::qt_signal ("activeChanged(bool)", "activeChanged", gsi::arg("active"), "@brief Signal declaration for QFinalState::activeChanged(bool active)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QFinalState::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("entered()", "entered", "@brief Signal declaration for QFinalState::entered()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("exited()", "exited", "@brief Signal declaration for QFinalState::exited()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QFinalState::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QFinalState::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QFinalState::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -181,6 +184,12 @@ public: emit QFinalState::destroyed(arg1); } + // [emitter impl] void QFinalState::entered() + void emitter_QFinalState_entered_3384() + { + throw tl::Exception ("Can't emit private signal 'void QFinalState::entered()'"); + } + // [adaptor impl] bool QFinalState::eventFilter(QObject *, QEvent *) bool cbs_eventFilter_2411_0(QObject *arg1, QEvent *arg2) { @@ -196,6 +205,19 @@ public: } } + // [emitter impl] void QFinalState::exited() + void emitter_QFinalState_exited_3384() + { + throw tl::Exception ("Can't emit private signal 'void QFinalState::exited()'"); + } + + // [emitter impl] void QFinalState::objectNameChanged(const QString &objectName) + void emitter_QFinalState_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QFinalState::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] void QFinalState::childEvent(QChildEvent *) void cbs_childEvent_1701_0(QChildEvent *arg1) { @@ -439,6 +461,20 @@ static void _set_callback_cbs_disconnectNotify_2394_0 (void *cls, const gsi::Cal } +// emitter void QFinalState::entered() + +static void _init_emitter_entered_3384 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_emitter_entered_3384 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + ((QFinalState_Adaptor *)cls)->emitter_QFinalState_entered_3384 (); +} + + // bool QFinalState::event(QEvent *e) static void _init_cbs_event_1217_0 (qt_gsi::GenericMethod *decl) @@ -488,6 +524,20 @@ static void _set_callback_cbs_eventFilter_2411_0 (void *cls, const gsi::Callback } +// emitter void QFinalState::exited() + +static void _init_emitter_exited_3384 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_emitter_exited_3384 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + ((QFinalState_Adaptor *)cls)->emitter_QFinalState_exited_3384 (); +} + + // exposed bool QFinalState::isSignalConnected(const QMetaMethod &signal) static void _init_fp_isSignalConnected_c2394 (qt_gsi::GenericMethod *decl) @@ -506,6 +556,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QFinalState::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QFinalState_Adaptor *)cls)->emitter_QFinalState_objectNameChanged_4567 (arg1); +} + + // void QFinalState::onEntry(QEvent *event) static void _init_cbs_onEntry_1217_0 (qt_gsi::GenericMethod *decl) @@ -640,11 +708,14 @@ static gsi::Methods methods_QFinalState_Adaptor () { methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QFinalState::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QFinalState::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); + methods += new qt_gsi::GenericMethod ("emit_entered", "@brief Emitter for signal void QFinalState::entered()\nCall this method to emit this signal.", false, &_init_emitter_entered_3384, &_call_emitter_entered_3384); methods += new qt_gsi::GenericMethod ("*event", "@brief Virtual method bool QFinalState::event(QEvent *e)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0); methods += new qt_gsi::GenericMethod ("*event", "@hide", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0, &_set_callback_cbs_event_1217_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QFinalState::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); + methods += new qt_gsi::GenericMethod ("emit_exited", "@brief Emitter for signal void QFinalState::exited()\nCall this method to emit this signal.", false, &_init_emitter_exited_3384, &_call_emitter_exited_3384); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QFinalState::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QFinalState::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*onEntry", "@brief Virtual method void QFinalState::onEntry(QEvent *event)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_onEntry_1217_0, &_call_cbs_onEntry_1217_0); methods += new qt_gsi::GenericMethod ("*onEntry", "@hide", false, &_init_cbs_onEntry_1217_0, &_call_cbs_onEntry_1217_0, &_set_callback_cbs_onEntry_1217_0); methods += new qt_gsi::GenericMethod ("*onExit", "@brief Virtual method void QFinalState::onExit(QEvent *event)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_onExit_1217_0, &_call_cbs_onExit_1217_0); diff --git a/src/gsiqt/qt5/QtCore/gsiDeclQHistoryState.cc b/src/gsiqt/qt5/QtCore/gsiDeclQHistoryState.cc index 8981af88b..cfd539cb9 100644 --- a/src/gsiqt/qt5/QtCore/gsiDeclQHistoryState.cc +++ b/src/gsiqt/qt5/QtCore/gsiDeclQHistoryState.cc @@ -189,7 +189,12 @@ static gsi::Methods methods_QHistoryState () { methods += new qt_gsi::GenericMethod ("setDefaultState|defaultState=", "@brief Method void QHistoryState::setDefaultState(QAbstractState *state)\n", false, &_init_f_setDefaultState_2036, &_call_f_setDefaultState_2036); methods += new qt_gsi::GenericMethod ("setHistoryType|historyType=", "@brief Method void QHistoryState::setHistoryType(QHistoryState::HistoryType type)\n", false, &_init_f_setHistoryType_3072, &_call_f_setHistoryType_3072); methods += gsi::qt_signal ("activeChanged(bool)", "activeChanged", gsi::arg("active"), "@brief Signal declaration for QHistoryState::activeChanged(bool active)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("defaultStateChanged()", "defaultStateChanged", "@brief Signal declaration for QHistoryState::defaultStateChanged()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QHistoryState::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("entered()", "entered", "@brief Signal declaration for QHistoryState::entered()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("exited()", "exited", "@brief Signal declaration for QHistoryState::exited()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("historyTypeChanged()", "historyTypeChanged", "@brief Signal declaration for QHistoryState::historyTypeChanged()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QHistoryState::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QHistoryState::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QHistoryState::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -262,12 +267,24 @@ public: emit QHistoryState::activeChanged(active); } + // [emitter impl] void QHistoryState::defaultStateChanged() + void emitter_QHistoryState_defaultStateChanged_3318() + { + throw tl::Exception ("Can't emit private signal 'void QHistoryState::defaultStateChanged()'"); + } + // [emitter impl] void QHistoryState::destroyed(QObject *) void emitter_QHistoryState_destroyed_1302(QObject *arg1) { emit QHistoryState::destroyed(arg1); } + // [emitter impl] void QHistoryState::entered() + void emitter_QHistoryState_entered_3384() + { + throw tl::Exception ("Can't emit private signal 'void QHistoryState::entered()'"); + } + // [adaptor impl] bool QHistoryState::eventFilter(QObject *, QEvent *) bool cbs_eventFilter_2411_0(QObject *arg1, QEvent *arg2) { @@ -283,6 +300,25 @@ public: } } + // [emitter impl] void QHistoryState::exited() + void emitter_QHistoryState_exited_3384() + { + throw tl::Exception ("Can't emit private signal 'void QHistoryState::exited()'"); + } + + // [emitter impl] void QHistoryState::historyTypeChanged() + void emitter_QHistoryState_historyTypeChanged_3318() + { + throw tl::Exception ("Can't emit private signal 'void QHistoryState::historyTypeChanged()'"); + } + + // [emitter impl] void QHistoryState::objectNameChanged(const QString &objectName) + void emitter_QHistoryState_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QHistoryState::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] void QHistoryState::childEvent(QChildEvent *) void cbs_childEvent_1701_0(QChildEvent *arg1) { @@ -505,6 +541,20 @@ static void _set_callback_cbs_customEvent_1217_0 (void *cls, const gsi::Callback } +// emitter void QHistoryState::defaultStateChanged() + +static void _init_emitter_defaultStateChanged_3318 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_emitter_defaultStateChanged_3318 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + ((QHistoryState_Adaptor *)cls)->emitter_QHistoryState_defaultStateChanged_3318 (); +} + + // emitter void QHistoryState::destroyed(QObject *) static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) @@ -547,6 +597,20 @@ static void _set_callback_cbs_disconnectNotify_2394_0 (void *cls, const gsi::Cal } +// emitter void QHistoryState::entered() + +static void _init_emitter_entered_3384 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_emitter_entered_3384 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + ((QHistoryState_Adaptor *)cls)->emitter_QHistoryState_entered_3384 (); +} + + // bool QHistoryState::event(QEvent *e) static void _init_cbs_event_1217_0 (qt_gsi::GenericMethod *decl) @@ -596,6 +660,34 @@ static void _set_callback_cbs_eventFilter_2411_0 (void *cls, const gsi::Callback } +// emitter void QHistoryState::exited() + +static void _init_emitter_exited_3384 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_emitter_exited_3384 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + ((QHistoryState_Adaptor *)cls)->emitter_QHistoryState_exited_3384 (); +} + + +// emitter void QHistoryState::historyTypeChanged() + +static void _init_emitter_historyTypeChanged_3318 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_emitter_historyTypeChanged_3318 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + ((QHistoryState_Adaptor *)cls)->emitter_QHistoryState_historyTypeChanged_3318 (); +} + + // exposed bool QHistoryState::isSignalConnected(const QMetaMethod &signal) static void _init_fp_isSignalConnected_c2394 (qt_gsi::GenericMethod *decl) @@ -614,6 +706,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QHistoryState::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QHistoryState_Adaptor *)cls)->emitter_QHistoryState_objectNameChanged_4567 (arg1); +} + + // void QHistoryState::onEntry(QEvent *event) static void _init_cbs_onEntry_1217_0 (qt_gsi::GenericMethod *decl) @@ -746,14 +856,19 @@ static gsi::Methods methods_QHistoryState_Adaptor () { methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QHistoryState::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); + methods += new qt_gsi::GenericMethod ("emit_defaultStateChanged", "@brief Emitter for signal void QHistoryState::defaultStateChanged()\nCall this method to emit this signal.", false, &_init_emitter_defaultStateChanged_3318, &_call_emitter_defaultStateChanged_3318); methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QHistoryState::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QHistoryState::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); + methods += new qt_gsi::GenericMethod ("emit_entered", "@brief Emitter for signal void QHistoryState::entered()\nCall this method to emit this signal.", false, &_init_emitter_entered_3384, &_call_emitter_entered_3384); methods += new qt_gsi::GenericMethod ("*event", "@brief Virtual method bool QHistoryState::event(QEvent *e)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0); methods += new qt_gsi::GenericMethod ("*event", "@hide", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0, &_set_callback_cbs_event_1217_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QHistoryState::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); + methods += new qt_gsi::GenericMethod ("emit_exited", "@brief Emitter for signal void QHistoryState::exited()\nCall this method to emit this signal.", false, &_init_emitter_exited_3384, &_call_emitter_exited_3384); + methods += new qt_gsi::GenericMethod ("emit_historyTypeChanged", "@brief Emitter for signal void QHistoryState::historyTypeChanged()\nCall this method to emit this signal.", false, &_init_emitter_historyTypeChanged_3318, &_call_emitter_historyTypeChanged_3318); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QHistoryState::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QHistoryState::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*onEntry", "@brief Virtual method void QHistoryState::onEntry(QEvent *event)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_onEntry_1217_0, &_call_cbs_onEntry_1217_0); methods += new qt_gsi::GenericMethod ("*onEntry", "@hide", false, &_init_cbs_onEntry_1217_0, &_call_cbs_onEntry_1217_0, &_set_callback_cbs_onEntry_1217_0); methods += new qt_gsi::GenericMethod ("*onExit", "@brief Virtual method void QHistoryState::onExit(QEvent *event)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_onExit_1217_0, &_call_cbs_onExit_1217_0); diff --git a/src/gsiqt/qt5/QtCore/gsiDeclQIODevice.cc b/src/gsiqt/qt5/QtCore/gsiDeclQIODevice.cc index 1d208a26e..3ede5ff6f 100644 --- a/src/gsiqt/qt5/QtCore/gsiDeclQIODevice.cc +++ b/src/gsiqt/qt5/QtCore/gsiDeclQIODevice.cc @@ -615,6 +615,7 @@ static gsi::Methods methods_QIODevice () { methods += gsi::qt_signal ("aboutToClose()", "aboutToClose", "@brief Signal declaration for QIODevice::aboutToClose()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("bytesWritten(qint64)", "bytesWritten", gsi::arg("bytes"), "@brief Signal declaration for QIODevice::bytesWritten(qint64 bytes)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QIODevice::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QIODevice::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("readChannelFinished()", "readChannelFinished", "@brief Signal declaration for QIODevice::readChannelFinished()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("readyRead()", "readyRead", "@brief Signal declaration for QIODevice::readyRead()\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QIODevice::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); diff --git a/src/gsiqt/qt5/QtCore/gsiDeclQIdentityProxyModel.cc b/src/gsiqt/qt5/QtCore/gsiDeclQIdentityProxyModel.cc index 619b42394..f2bce03ae 100644 --- a/src/gsiqt/qt5/QtCore/gsiDeclQIdentityProxyModel.cc +++ b/src/gsiqt/qt5/QtCore/gsiDeclQIdentityProxyModel.cc @@ -525,11 +525,27 @@ static gsi::Methods methods_QIdentityProxyModel () { methods += new qt_gsi::GenericMethod ("rowCount", "@brief Method int QIdentityProxyModel::rowCount(const QModelIndex &parent)\nThis is a reimplementation of QAbstractItemModel::rowCount", true, &_init_f_rowCount_c2395, &_call_f_rowCount_c2395); methods += new qt_gsi::GenericMethod ("setSourceModel|sourceModel=", "@brief Method void QIdentityProxyModel::setSourceModel(QAbstractItemModel *sourceModel)\nThis is a reimplementation of QAbstractProxyModel::setSourceModel", false, &_init_f_setSourceModel_2419, &_call_f_setSourceModel_2419); methods += new qt_gsi::GenericMethod ("sibling", "@brief Method QModelIndex QIdentityProxyModel::sibling(int row, int column, const QModelIndex &idx)\nThis is a reimplementation of QAbstractProxyModel::sibling", true, &_init_f_sibling_c3713, &_call_f_sibling_c3713); + methods += gsi::qt_signal ("columnsAboutToBeInserted(const QModelIndex &, int, int)", "columnsAboutToBeInserted", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QIdentityProxyModel::columnsAboutToBeInserted(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("columnsAboutToBeMoved(const QModelIndex &, int, int, const QModelIndex &, int)", "columnsAboutToBeMoved", gsi::arg("sourceParent"), gsi::arg("sourceStart"), gsi::arg("sourceEnd"), gsi::arg("destinationParent"), gsi::arg("destinationColumn"), "@brief Signal declaration for QIdentityProxyModel::columnsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("columnsAboutToBeRemoved(const QModelIndex &, int, int)", "columnsAboutToBeRemoved", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QIdentityProxyModel::columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("columnsInserted(const QModelIndex &, int, int)", "columnsInserted", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QIdentityProxyModel::columnsInserted(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("columnsMoved(const QModelIndex &, int, int, const QModelIndex &, int)", "columnsMoved", gsi::arg("parent"), gsi::arg("start"), gsi::arg("end"), gsi::arg("destination"), gsi::arg("column"), "@brief Signal declaration for QIdentityProxyModel::columnsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("columnsRemoved(const QModelIndex &, int, int)", "columnsRemoved", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QIdentityProxyModel::columnsRemoved(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal & > ("dataChanged(const QModelIndex &, const QModelIndex &, const QVector &)", "dataChanged", gsi::arg("topLeft"), gsi::arg("bottomRight"), gsi::arg("roles"), "@brief Signal declaration for QIdentityProxyModel::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector &roles)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QIdentityProxyModel::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal::target_type &, int, int > ("headerDataChanged(Qt::Orientation, int, int)", "headerDataChanged", gsi::arg("orientation"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QIdentityProxyModel::headerDataChanged(Qt::Orientation orientation, int first, int last)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal &, const qt_gsi::Converter::target_type & > ("layoutAboutToBeChanged(const QList &, QAbstractItemModel::LayoutChangeHint)", "layoutAboutToBeChanged", gsi::arg("parents"), gsi::arg("hint"), "@brief Signal declaration for QIdentityProxyModel::layoutAboutToBeChanged(const QList &parents, QAbstractItemModel::LayoutChangeHint hint)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal &, const qt_gsi::Converter::target_type & > ("layoutChanged(const QList &, QAbstractItemModel::LayoutChangeHint)", "layoutChanged", gsi::arg("parents"), gsi::arg("hint"), "@brief Signal declaration for QIdentityProxyModel::layoutChanged(const QList &parents, QAbstractItemModel::LayoutChangeHint hint)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("modelAboutToBeReset()", "modelAboutToBeReset", "@brief Signal declaration for QIdentityProxyModel::modelAboutToBeReset()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("modelReset()", "modelReset", "@brief Signal declaration for QIdentityProxyModel::modelReset()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QIdentityProxyModel::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsAboutToBeInserted(const QModelIndex &, int, int)", "rowsAboutToBeInserted", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QIdentityProxyModel::rowsAboutToBeInserted(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsAboutToBeMoved(const QModelIndex &, int, int, const QModelIndex &, int)", "rowsAboutToBeMoved", gsi::arg("sourceParent"), gsi::arg("sourceStart"), gsi::arg("sourceEnd"), gsi::arg("destinationParent"), gsi::arg("destinationRow"), "@brief Signal declaration for QIdentityProxyModel::rowsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsAboutToBeRemoved(const QModelIndex &, int, int)", "rowsAboutToBeRemoved", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QIdentityProxyModel::rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsInserted(const QModelIndex &, int, int)", "rowsInserted", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QIdentityProxyModel::rowsInserted(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsMoved(const QModelIndex &, int, int, const QModelIndex &, int)", "rowsMoved", gsi::arg("parent"), gsi::arg("start"), gsi::arg("end"), gsi::arg("destination"), gsi::arg("row"), "@brief Signal declaration for QIdentityProxyModel::rowsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsRemoved(const QModelIndex &, int, int)", "rowsRemoved", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QIdentityProxyModel::rowsRemoved(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("sourceModelChanged()", "sourceModelChanged", "@brief Signal declaration for QIdentityProxyModel::sourceModelChanged()\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QIdentityProxyModel::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QIdentityProxyModel::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -754,6 +770,64 @@ public: } } + // [emitter impl] void QIdentityProxyModel::columnsAboutToBeInserted(const QModelIndex &parent, int first, int last) + void emitter_QIdentityProxyModel_columnsAboutToBeInserted_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QIdentityProxyModel::columnsAboutToBeInserted(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QIdentityProxyModel::columnsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn) + void emitter_QIdentityProxyModel_columnsAboutToBeMoved_10318(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn) + { + __SUPPRESS_UNUSED_WARNING (sourceParent); + __SUPPRESS_UNUSED_WARNING (sourceStart); + __SUPPRESS_UNUSED_WARNING (sourceEnd); + __SUPPRESS_UNUSED_WARNING (destinationParent); + __SUPPRESS_UNUSED_WARNING (destinationColumn); + throw tl::Exception ("Can't emit private signal 'void QIdentityProxyModel::columnsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn)'"); + } + + // [emitter impl] void QIdentityProxyModel::columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last) + void emitter_QIdentityProxyModel_columnsAboutToBeRemoved_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QIdentityProxyModel::columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QIdentityProxyModel::columnsInserted(const QModelIndex &parent, int first, int last) + void emitter_QIdentityProxyModel_columnsInserted_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QIdentityProxyModel::columnsInserted(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QIdentityProxyModel::columnsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column) + void emitter_QIdentityProxyModel_columnsMoved_10318(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (start); + __SUPPRESS_UNUSED_WARNING (end); + __SUPPRESS_UNUSED_WARNING (destination); + __SUPPRESS_UNUSED_WARNING (column); + throw tl::Exception ("Can't emit private signal 'void QIdentityProxyModel::columnsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column)'"); + } + + // [emitter impl] void QIdentityProxyModel::columnsRemoved(const QModelIndex &parent, int first, int last) + void emitter_QIdentityProxyModel_columnsRemoved_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QIdentityProxyModel::columnsRemoved(const QModelIndex &parent, int first, int last)'"); + } + // [adaptor impl] QVariant QIdentityProxyModel::data(const QModelIndex &proxyIndex, int role) QVariant cbs_data_c3054_1(const QModelIndex &proxyIndex, int role) const { @@ -1069,6 +1143,18 @@ public: } } + // [emitter impl] void QIdentityProxyModel::modelAboutToBeReset() + void emitter_QIdentityProxyModel_modelAboutToBeReset_3767() + { + throw tl::Exception ("Can't emit private signal 'void QIdentityProxyModel::modelAboutToBeReset()'"); + } + + // [emitter impl] void QIdentityProxyModel::modelReset() + void emitter_QIdentityProxyModel_modelReset_3767() + { + throw tl::Exception ("Can't emit private signal 'void QIdentityProxyModel::modelReset()'"); + } + // [adaptor impl] bool QIdentityProxyModel::moveColumns(const QModelIndex &sourceParent, int sourceColumn, int count, const QModelIndex &destinationParent, int destinationChild) bool cbs_moveColumns_6659_0(const QModelIndex &sourceParent, int sourceColumn, int count, const QModelIndex &destinationParent, int destinationChild) { @@ -1099,6 +1185,13 @@ public: } } + // [emitter impl] void QIdentityProxyModel::objectNameChanged(const QString &objectName) + void emitter_QIdentityProxyModel_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QIdentityProxyModel::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QModelIndex QIdentityProxyModel::parent(const QModelIndex &child) QModelIndex cbs_parent_c2395_0(const QModelIndex &child) const { @@ -1189,6 +1282,64 @@ public: } } + // [emitter impl] void QIdentityProxyModel::rowsAboutToBeInserted(const QModelIndex &parent, int first, int last) + void emitter_QIdentityProxyModel_rowsAboutToBeInserted_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QIdentityProxyModel::rowsAboutToBeInserted(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QIdentityProxyModel::rowsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow) + void emitter_QIdentityProxyModel_rowsAboutToBeMoved_10318(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow) + { + __SUPPRESS_UNUSED_WARNING (sourceParent); + __SUPPRESS_UNUSED_WARNING (sourceStart); + __SUPPRESS_UNUSED_WARNING (sourceEnd); + __SUPPRESS_UNUSED_WARNING (destinationParent); + __SUPPRESS_UNUSED_WARNING (destinationRow); + throw tl::Exception ("Can't emit private signal 'void QIdentityProxyModel::rowsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow)'"); + } + + // [emitter impl] void QIdentityProxyModel::rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last) + void emitter_QIdentityProxyModel_rowsAboutToBeRemoved_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QIdentityProxyModel::rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QIdentityProxyModel::rowsInserted(const QModelIndex &parent, int first, int last) + void emitter_QIdentityProxyModel_rowsInserted_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QIdentityProxyModel::rowsInserted(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QIdentityProxyModel::rowsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row) + void emitter_QIdentityProxyModel_rowsMoved_10318(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (start); + __SUPPRESS_UNUSED_WARNING (end); + __SUPPRESS_UNUSED_WARNING (destination); + __SUPPRESS_UNUSED_WARNING (row); + throw tl::Exception ("Can't emit private signal 'void QIdentityProxyModel::rowsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row)'"); + } + + // [emitter impl] void QIdentityProxyModel::rowsRemoved(const QModelIndex &parent, int first, int last) + void emitter_QIdentityProxyModel_rowsRemoved_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QIdentityProxyModel::rowsRemoved(const QModelIndex &parent, int first, int last)'"); + } + // [adaptor impl] bool QIdentityProxyModel::setData(const QModelIndex &index, const QVariant &value, int role) bool cbs_setData_5065_1(const QModelIndex &index, const QVariant &value, int role) { @@ -1279,6 +1430,12 @@ public: } } + // [emitter impl] void QIdentityProxyModel::sourceModelChanged() + void emitter_QIdentityProxyModel_sourceModelChanged_3914() + { + throw tl::Exception ("Can't emit private signal 'void QIdentityProxyModel::sourceModelChanged()'"); + } + // [adaptor impl] QSize QIdentityProxyModel::span(const QModelIndex &index) QSize cbs_span_c2395_0(const QModelIndex &index) const { @@ -1813,6 +1970,162 @@ static void _set_callback_cbs_columnCount_c2395_1 (void *cls, const gsi::Callbac } +// emitter void QIdentityProxyModel::columnsAboutToBeInserted(const QModelIndex &parent, int first, int last) + +static void _init_emitter_columnsAboutToBeInserted_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_columnsAboutToBeInserted_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QIdentityProxyModel_Adaptor *)cls)->emitter_QIdentityProxyModel_columnsAboutToBeInserted_7372 (arg1, arg2, arg3); +} + + +// emitter void QIdentityProxyModel::columnsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn) + +static void _init_emitter_columnsAboutToBeMoved_10318 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("sourceParent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("sourceStart"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("sourceEnd"); + decl->add_arg (argspec_2); + static gsi::ArgSpecBase argspec_3 ("destinationParent"); + decl->add_arg (argspec_3); + static gsi::ArgSpecBase argspec_4 ("destinationColumn"); + decl->add_arg (argspec_4); + decl->set_return (); +} + +static void _call_emitter_columnsAboutToBeMoved_10318 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + const QModelIndex &arg4 = gsi::arg_reader() (args, heap); + int arg5 = gsi::arg_reader() (args, heap); + ((QIdentityProxyModel_Adaptor *)cls)->emitter_QIdentityProxyModel_columnsAboutToBeMoved_10318 (arg1, arg2, arg3, arg4, arg5); +} + + +// emitter void QIdentityProxyModel::columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last) + +static void _init_emitter_columnsAboutToBeRemoved_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_columnsAboutToBeRemoved_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QIdentityProxyModel_Adaptor *)cls)->emitter_QIdentityProxyModel_columnsAboutToBeRemoved_7372 (arg1, arg2, arg3); +} + + +// emitter void QIdentityProxyModel::columnsInserted(const QModelIndex &parent, int first, int last) + +static void _init_emitter_columnsInserted_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_columnsInserted_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QIdentityProxyModel_Adaptor *)cls)->emitter_QIdentityProxyModel_columnsInserted_7372 (arg1, arg2, arg3); +} + + +// emitter void QIdentityProxyModel::columnsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column) + +static void _init_emitter_columnsMoved_10318 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("start"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("end"); + decl->add_arg (argspec_2); + static gsi::ArgSpecBase argspec_3 ("destination"); + decl->add_arg (argspec_3); + static gsi::ArgSpecBase argspec_4 ("column"); + decl->add_arg (argspec_4); + decl->set_return (); +} + +static void _call_emitter_columnsMoved_10318 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + const QModelIndex &arg4 = gsi::arg_reader() (args, heap); + int arg5 = gsi::arg_reader() (args, heap); + ((QIdentityProxyModel_Adaptor *)cls)->emitter_QIdentityProxyModel_columnsMoved_10318 (arg1, arg2, arg3, arg4, arg5); +} + + +// emitter void QIdentityProxyModel::columnsRemoved(const QModelIndex &parent, int first, int last) + +static void _init_emitter_columnsRemoved_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_columnsRemoved_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QIdentityProxyModel_Adaptor *)cls)->emitter_QIdentityProxyModel_columnsRemoved_7372 (arg1, arg2, arg3); +} + + // exposed QModelIndex QIdentityProxyModel::createIndex(int row, int column, void *data) static void _init_fp_createIndex_c2374 (qt_gsi::GenericMethod *decl) @@ -2677,6 +2990,34 @@ static void _set_callback_cbs_mimeTypes_c0_0 (void *cls, const gsi::Callback &cb } +// emitter void QIdentityProxyModel::modelAboutToBeReset() + +static void _init_emitter_modelAboutToBeReset_3767 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_emitter_modelAboutToBeReset_3767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + ((QIdentityProxyModel_Adaptor *)cls)->emitter_QIdentityProxyModel_modelAboutToBeReset_3767 (); +} + + +// emitter void QIdentityProxyModel::modelReset() + +static void _init_emitter_modelReset_3767 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_emitter_modelReset_3767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + ((QIdentityProxyModel_Adaptor *)cls)->emitter_QIdentityProxyModel_modelReset_3767 (); +} + + // bool QIdentityProxyModel::moveColumns(const QModelIndex &sourceParent, int sourceColumn, int count, const QModelIndex &destinationParent, int destinationChild) static void _init_cbs_moveColumns_6659_0 (qt_gsi::GenericMethod *decl) @@ -2747,6 +3088,24 @@ static void _set_callback_cbs_moveRows_6659_0 (void *cls, const gsi::Callback &c } +// emitter void QIdentityProxyModel::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QIdentityProxyModel_Adaptor *)cls)->emitter_QIdentityProxyModel_objectNameChanged_4567 (arg1); +} + + // QModelIndex QIdentityProxyModel::parent(const QModelIndex &child) static void _init_cbs_parent_c2395_0 (qt_gsi::GenericMethod *decl) @@ -2937,6 +3296,162 @@ static void _set_callback_cbs_rowCount_c2395_1 (void *cls, const gsi::Callback & } +// emitter void QIdentityProxyModel::rowsAboutToBeInserted(const QModelIndex &parent, int first, int last) + +static void _init_emitter_rowsAboutToBeInserted_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_rowsAboutToBeInserted_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QIdentityProxyModel_Adaptor *)cls)->emitter_QIdentityProxyModel_rowsAboutToBeInserted_7372 (arg1, arg2, arg3); +} + + +// emitter void QIdentityProxyModel::rowsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow) + +static void _init_emitter_rowsAboutToBeMoved_10318 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("sourceParent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("sourceStart"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("sourceEnd"); + decl->add_arg (argspec_2); + static gsi::ArgSpecBase argspec_3 ("destinationParent"); + decl->add_arg (argspec_3); + static gsi::ArgSpecBase argspec_4 ("destinationRow"); + decl->add_arg (argspec_4); + decl->set_return (); +} + +static void _call_emitter_rowsAboutToBeMoved_10318 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + const QModelIndex &arg4 = gsi::arg_reader() (args, heap); + int arg5 = gsi::arg_reader() (args, heap); + ((QIdentityProxyModel_Adaptor *)cls)->emitter_QIdentityProxyModel_rowsAboutToBeMoved_10318 (arg1, arg2, arg3, arg4, arg5); +} + + +// emitter void QIdentityProxyModel::rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last) + +static void _init_emitter_rowsAboutToBeRemoved_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_rowsAboutToBeRemoved_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QIdentityProxyModel_Adaptor *)cls)->emitter_QIdentityProxyModel_rowsAboutToBeRemoved_7372 (arg1, arg2, arg3); +} + + +// emitter void QIdentityProxyModel::rowsInserted(const QModelIndex &parent, int first, int last) + +static void _init_emitter_rowsInserted_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_rowsInserted_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QIdentityProxyModel_Adaptor *)cls)->emitter_QIdentityProxyModel_rowsInserted_7372 (arg1, arg2, arg3); +} + + +// emitter void QIdentityProxyModel::rowsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row) + +static void _init_emitter_rowsMoved_10318 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("start"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("end"); + decl->add_arg (argspec_2); + static gsi::ArgSpecBase argspec_3 ("destination"); + decl->add_arg (argspec_3); + static gsi::ArgSpecBase argspec_4 ("row"); + decl->add_arg (argspec_4); + decl->set_return (); +} + +static void _call_emitter_rowsMoved_10318 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + const QModelIndex &arg4 = gsi::arg_reader() (args, heap); + int arg5 = gsi::arg_reader() (args, heap); + ((QIdentityProxyModel_Adaptor *)cls)->emitter_QIdentityProxyModel_rowsMoved_10318 (arg1, arg2, arg3, arg4, arg5); +} + + +// emitter void QIdentityProxyModel::rowsRemoved(const QModelIndex &parent, int first, int last) + +static void _init_emitter_rowsRemoved_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_rowsRemoved_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QIdentityProxyModel_Adaptor *)cls)->emitter_QIdentityProxyModel_rowsRemoved_7372 (arg1, arg2, arg3); +} + + // exposed QObject *QIdentityProxyModel::sender() static void _init_fp_sender_c0 (qt_gsi::GenericMethod *decl) @@ -3132,6 +3647,20 @@ static void _set_callback_cbs_sort_2340_1 (void *cls, const gsi::Callback &cb) } +// emitter void QIdentityProxyModel::sourceModelChanged() + +static void _init_emitter_sourceModelChanged_3914 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_emitter_sourceModelChanged_3914 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + ((QIdentityProxyModel_Adaptor *)cls)->emitter_QIdentityProxyModel_sourceModelChanged_3914 (); +} + + // QSize QIdentityProxyModel::span(const QModelIndex &index) static void _init_cbs_span_c2395_0 (qt_gsi::GenericMethod *decl) @@ -3263,6 +3792,12 @@ static gsi::Methods methods_QIdentityProxyModel_Adaptor () { methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("columnCount", "@brief Virtual method int QIdentityProxyModel::columnCount(const QModelIndex &parent)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_columnCount_c2395_1, &_call_cbs_columnCount_c2395_1); methods += new qt_gsi::GenericMethod ("columnCount", "@hide", true, &_init_cbs_columnCount_c2395_1, &_call_cbs_columnCount_c2395_1, &_set_callback_cbs_columnCount_c2395_1); + methods += new qt_gsi::GenericMethod ("emit_columnsAboutToBeInserted", "@brief Emitter for signal void QIdentityProxyModel::columnsAboutToBeInserted(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_columnsAboutToBeInserted_7372, &_call_emitter_columnsAboutToBeInserted_7372); + methods += new qt_gsi::GenericMethod ("emit_columnsAboutToBeMoved", "@brief Emitter for signal void QIdentityProxyModel::columnsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn)\nCall this method to emit this signal.", false, &_init_emitter_columnsAboutToBeMoved_10318, &_call_emitter_columnsAboutToBeMoved_10318); + methods += new qt_gsi::GenericMethod ("emit_columnsAboutToBeRemoved", "@brief Emitter for signal void QIdentityProxyModel::columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_columnsAboutToBeRemoved_7372, &_call_emitter_columnsAboutToBeRemoved_7372); + methods += new qt_gsi::GenericMethod ("emit_columnsInserted", "@brief Emitter for signal void QIdentityProxyModel::columnsInserted(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_columnsInserted_7372, &_call_emitter_columnsInserted_7372); + methods += new qt_gsi::GenericMethod ("emit_columnsMoved", "@brief Emitter for signal void QIdentityProxyModel::columnsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column)\nCall this method to emit this signal.", false, &_init_emitter_columnsMoved_10318, &_call_emitter_columnsMoved_10318); + methods += new qt_gsi::GenericMethod ("emit_columnsRemoved", "@brief Emitter for signal void QIdentityProxyModel::columnsRemoved(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_columnsRemoved_7372, &_call_emitter_columnsRemoved_7372); methods += new qt_gsi::GenericMethod ("*createIndex", "@brief Method QModelIndex QIdentityProxyModel::createIndex(int row, int column, void *data)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_createIndex_c2374, &_call_fp_createIndex_c2374); methods += new qt_gsi::GenericMethod ("*createIndex", "@brief Method QModelIndex QIdentityProxyModel::createIndex(int row, int column, quintptr id)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_createIndex_c2657, &_call_fp_createIndex_c2657); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QIdentityProxyModel::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); @@ -3322,10 +3857,13 @@ static gsi::Methods methods_QIdentityProxyModel_Adaptor () { methods += new qt_gsi::GenericMethod ("mimeData", "@hide", true, &_init_cbs_mimeData_c3010_0, &_call_cbs_mimeData_c3010_0, &_set_callback_cbs_mimeData_c3010_0); methods += new qt_gsi::GenericMethod ("mimeTypes", "@brief Virtual method QStringList QIdentityProxyModel::mimeTypes()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_mimeTypes_c0_0, &_call_cbs_mimeTypes_c0_0); methods += new qt_gsi::GenericMethod ("mimeTypes", "@hide", true, &_init_cbs_mimeTypes_c0_0, &_call_cbs_mimeTypes_c0_0, &_set_callback_cbs_mimeTypes_c0_0); + methods += new qt_gsi::GenericMethod ("emit_modelAboutToBeReset", "@brief Emitter for signal void QIdentityProxyModel::modelAboutToBeReset()\nCall this method to emit this signal.", false, &_init_emitter_modelAboutToBeReset_3767, &_call_emitter_modelAboutToBeReset_3767); + methods += new qt_gsi::GenericMethod ("emit_modelReset", "@brief Emitter for signal void QIdentityProxyModel::modelReset()\nCall this method to emit this signal.", false, &_init_emitter_modelReset_3767, &_call_emitter_modelReset_3767); methods += new qt_gsi::GenericMethod ("moveColumns", "@brief Virtual method bool QIdentityProxyModel::moveColumns(const QModelIndex &sourceParent, int sourceColumn, int count, const QModelIndex &destinationParent, int destinationChild)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_moveColumns_6659_0, &_call_cbs_moveColumns_6659_0); methods += new qt_gsi::GenericMethod ("moveColumns", "@hide", false, &_init_cbs_moveColumns_6659_0, &_call_cbs_moveColumns_6659_0, &_set_callback_cbs_moveColumns_6659_0); methods += new qt_gsi::GenericMethod ("moveRows", "@brief Virtual method bool QIdentityProxyModel::moveRows(const QModelIndex &sourceParent, int sourceRow, int count, const QModelIndex &destinationParent, int destinationChild)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_moveRows_6659_0, &_call_cbs_moveRows_6659_0); methods += new qt_gsi::GenericMethod ("moveRows", "@hide", false, &_init_cbs_moveRows_6659_0, &_call_cbs_moveRows_6659_0, &_set_callback_cbs_moveRows_6659_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QIdentityProxyModel::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("parent", "@brief Virtual method QModelIndex QIdentityProxyModel::parent(const QModelIndex &child)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_parent_c2395_0, &_call_cbs_parent_c2395_0); methods += new qt_gsi::GenericMethod ("parent", "@hide", true, &_init_cbs_parent_c2395_0, &_call_cbs_parent_c2395_0, &_set_callback_cbs_parent_c2395_0); methods += new qt_gsi::GenericMethod ("*persistentIndexList", "@brief Method QList QIdentityProxyModel::persistentIndexList()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_persistentIndexList_c0, &_call_fp_persistentIndexList_c0); @@ -3341,6 +3879,12 @@ static gsi::Methods methods_QIdentityProxyModel_Adaptor () { methods += new qt_gsi::GenericMethod ("roleNames", "@hide", true, &_init_cbs_roleNames_c0_0, &_call_cbs_roleNames_c0_0, &_set_callback_cbs_roleNames_c0_0); methods += new qt_gsi::GenericMethod ("rowCount", "@brief Virtual method int QIdentityProxyModel::rowCount(const QModelIndex &parent)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_rowCount_c2395_1, &_call_cbs_rowCount_c2395_1); methods += new qt_gsi::GenericMethod ("rowCount", "@hide", true, &_init_cbs_rowCount_c2395_1, &_call_cbs_rowCount_c2395_1, &_set_callback_cbs_rowCount_c2395_1); + methods += new qt_gsi::GenericMethod ("emit_rowsAboutToBeInserted", "@brief Emitter for signal void QIdentityProxyModel::rowsAboutToBeInserted(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_rowsAboutToBeInserted_7372, &_call_emitter_rowsAboutToBeInserted_7372); + methods += new qt_gsi::GenericMethod ("emit_rowsAboutToBeMoved", "@brief Emitter for signal void QIdentityProxyModel::rowsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow)\nCall this method to emit this signal.", false, &_init_emitter_rowsAboutToBeMoved_10318, &_call_emitter_rowsAboutToBeMoved_10318); + methods += new qt_gsi::GenericMethod ("emit_rowsAboutToBeRemoved", "@brief Emitter for signal void QIdentityProxyModel::rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_rowsAboutToBeRemoved_7372, &_call_emitter_rowsAboutToBeRemoved_7372); + methods += new qt_gsi::GenericMethod ("emit_rowsInserted", "@brief Emitter for signal void QIdentityProxyModel::rowsInserted(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_rowsInserted_7372, &_call_emitter_rowsInserted_7372); + methods += new qt_gsi::GenericMethod ("emit_rowsMoved", "@brief Emitter for signal void QIdentityProxyModel::rowsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row)\nCall this method to emit this signal.", false, &_init_emitter_rowsMoved_10318, &_call_emitter_rowsMoved_10318); + methods += new qt_gsi::GenericMethod ("emit_rowsRemoved", "@brief Emitter for signal void QIdentityProxyModel::rowsRemoved(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_rowsRemoved_7372, &_call_emitter_rowsRemoved_7372); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QIdentityProxyModel::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QIdentityProxyModel::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); methods += new qt_gsi::GenericMethod ("setData", "@brief Virtual method bool QIdentityProxyModel::setData(const QModelIndex &index, const QVariant &value, int role)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_setData_5065_1, &_call_cbs_setData_5065_1); @@ -3355,6 +3899,7 @@ static gsi::Methods methods_QIdentityProxyModel_Adaptor () { methods += new qt_gsi::GenericMethod ("sibling", "@hide", true, &_init_cbs_sibling_c3713_0, &_call_cbs_sibling_c3713_0, &_set_callback_cbs_sibling_c3713_0); methods += new qt_gsi::GenericMethod ("sort", "@brief Virtual method void QIdentityProxyModel::sort(int column, Qt::SortOrder order)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_sort_2340_1, &_call_cbs_sort_2340_1); methods += new qt_gsi::GenericMethod ("sort", "@hide", false, &_init_cbs_sort_2340_1, &_call_cbs_sort_2340_1, &_set_callback_cbs_sort_2340_1); + methods += new qt_gsi::GenericMethod ("emit_sourceModelChanged", "@brief Emitter for signal void QIdentityProxyModel::sourceModelChanged()\nCall this method to emit this signal.", false, &_init_emitter_sourceModelChanged_3914, &_call_emitter_sourceModelChanged_3914); methods += new qt_gsi::GenericMethod ("span", "@brief Virtual method QSize QIdentityProxyModel::span(const QModelIndex &index)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_span_c2395_0, &_call_cbs_span_c2395_0); methods += new qt_gsi::GenericMethod ("span", "@hide", true, &_init_cbs_span_c2395_0, &_call_cbs_span_c2395_0, &_set_callback_cbs_span_c2395_0); methods += new qt_gsi::GenericMethod ("submit", "@brief Virtual method bool QIdentityProxyModel::submit()\nThis method can be reimplemented in a derived class.", false, &_init_cbs_submit_0_0, &_call_cbs_submit_0_0); diff --git a/src/gsiqt/qt5/QtCore/gsiDeclQItemSelectionModel.cc b/src/gsiqt/qt5/QtCore/gsiDeclQItemSelectionModel.cc index e89e13920..9e10d1067 100644 --- a/src/gsiqt/qt5/QtCore/gsiDeclQItemSelectionModel.cc +++ b/src/gsiqt/qt5/QtCore/gsiDeclQItemSelectionModel.cc @@ -528,6 +528,7 @@ static gsi::Methods methods_QItemSelectionModel () { methods += gsi::qt_signal ("currentRowChanged(const QModelIndex &, const QModelIndex &)", "currentRowChanged", gsi::arg("current"), gsi::arg("previous"), "@brief Signal declaration for QItemSelectionModel::currentRowChanged(const QModelIndex ¤t, const QModelIndex &previous)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QItemSelectionModel::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("modelChanged(QAbstractItemModel *)", "modelChanged", gsi::arg("model"), "@brief Signal declaration for QItemSelectionModel::modelChanged(QAbstractItemModel *model)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QItemSelectionModel::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("selectionChanged(const QItemSelection &, const QItemSelection &)", "selectionChanged", gsi::arg("selected"), gsi::arg("deselected"), "@brief Signal declaration for QItemSelectionModel::selectionChanged(const QItemSelection &selected, const QItemSelection &deselected)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QItemSelectionModel::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QItemSelectionModel::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); @@ -684,6 +685,13 @@ public: emit QItemSelectionModel::modelChanged(model); } + // [emitter impl] void QItemSelectionModel::objectNameChanged(const QString &objectName) + void emitter_QItemSelectionModel_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QItemSelectionModel::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] void QItemSelectionModel::reset() void cbs_reset_0_0() { @@ -1165,6 +1173,24 @@ static void _call_emitter_modelChanged_2419 (const qt_gsi::GenericMethod * /*dec } +// emitter void QItemSelectionModel::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QItemSelectionModel_Adaptor *)cls)->emitter_QItemSelectionModel_objectNameChanged_4567 (arg1); +} + + // exposed int QItemSelectionModel::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -1387,6 +1413,7 @@ static gsi::Methods methods_QItemSelectionModel_Adaptor () { methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QItemSelectionModel::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); methods += new qt_gsi::GenericMethod ("emit_modelChanged", "@brief Emitter for signal void QItemSelectionModel::modelChanged(QAbstractItemModel *model)\nCall this method to emit this signal.", false, &_init_emitter_modelChanged_2419, &_call_emitter_modelChanged_2419); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QItemSelectionModel::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QItemSelectionModel::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("reset", "@brief Virtual method void QItemSelectionModel::reset()\nThis method can be reimplemented in a derived class.", false, &_init_cbs_reset_0_0, &_call_cbs_reset_0_0); methods += new qt_gsi::GenericMethod ("reset", "@hide", false, &_init_cbs_reset_0_0, &_call_cbs_reset_0_0, &_set_callback_cbs_reset_0_0); diff --git a/src/gsiqt/qt5/QtCore/gsiDeclQLibrary.cc b/src/gsiqt/qt5/QtCore/gsiDeclQLibrary.cc index e6df895d0..a3dd4a12a 100644 --- a/src/gsiqt/qt5/QtCore/gsiDeclQLibrary.cc +++ b/src/gsiqt/qt5/QtCore/gsiDeclQLibrary.cc @@ -317,6 +317,7 @@ static gsi::Methods methods_QLibrary () { methods += new qt_gsi::GenericMethod ("setLoadHints|loadHints=", "@brief Method void QLibrary::setLoadHints(QFlags hints)\n", false, &_init_f_setLoadHints_2841, &_call_f_setLoadHints_2841); methods += new qt_gsi::GenericMethod ("unload", "@brief Method bool QLibrary::unload()\n", false, &_init_f_unload_0, &_call_f_unload_0); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QLibrary::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QLibrary::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("isLibrary?", "@brief Static method bool QLibrary::isLibrary(const QString &fileName)\nThis method is static and can be called without an instance.", &_init_f_isLibrary_2025, &_call_f_isLibrary_2025); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QLibrary::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QLibrary::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); @@ -444,6 +445,13 @@ public: } } + // [emitter impl] void QLibrary::objectNameChanged(const QString &objectName) + void emitter_QLibrary_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QLibrary::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] void QLibrary::childEvent(QChildEvent *) void cbs_childEvent_1701_0(QChildEvent *arg1) { @@ -758,6 +766,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QLibrary::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QLibrary_Adaptor *)cls)->emitter_QLibrary_objectNameChanged_4567 (arg1); +} + + // exposed int QLibrary::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -851,6 +877,7 @@ static gsi::Methods methods_QLibrary_Adaptor () { methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QLibrary::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QLibrary::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QLibrary::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QLibrary::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QLibrary::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QLibrary::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); diff --git a/src/gsiqt/qt5/QtCore/gsiDeclQMimeData.cc b/src/gsiqt/qt5/QtCore/gsiDeclQMimeData.cc index 5cdf74455..15fb1cc97 100644 --- a/src/gsiqt/qt5/QtCore/gsiDeclQMimeData.cc +++ b/src/gsiqt/qt5/QtCore/gsiDeclQMimeData.cc @@ -496,6 +496,7 @@ static gsi::Methods methods_QMimeData () { methods += new qt_gsi::GenericMethod ("text", "@brief Method QString QMimeData::text()\n", true, &_init_f_text_c0, &_call_f_text_c0); methods += new qt_gsi::GenericMethod ("urls", "@brief Method QList QMimeData::urls()\n", true, &_init_f_urls_c0, &_call_f_urls_c0); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QMimeData::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QMimeData::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QMimeData::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QMimeData::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -610,6 +611,13 @@ public: } } + // [emitter impl] void QMimeData::objectNameChanged(const QString &objectName) + void emitter_QMimeData_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QMimeData::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] void QMimeData::childEvent(QChildEvent *) void cbs_childEvent_1701_0(QChildEvent *arg1) { @@ -911,6 +919,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QMimeData::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QMimeData_Adaptor *)cls)->emitter_QMimeData_objectNameChanged_4567 (arg1); +} + + // exposed int QMimeData::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -1031,6 +1057,7 @@ static gsi::Methods methods_QMimeData_Adaptor () { methods += new qt_gsi::GenericMethod ("hasFormat", "@brief Virtual method bool QMimeData::hasFormat(const QString &mimetype)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_hasFormat_c2025_0, &_call_cbs_hasFormat_c2025_0); methods += new qt_gsi::GenericMethod ("hasFormat", "@hide", true, &_init_cbs_hasFormat_c2025_0, &_call_cbs_hasFormat_c2025_0, &_set_callback_cbs_hasFormat_c2025_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QMimeData::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QMimeData::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QMimeData::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*retrieveData", "@brief Virtual method QVariant QMimeData::retrieveData(const QString &mimetype, QVariant::Type preferredType)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_retrieveData_c3693_0, &_call_cbs_retrieveData_c3693_0); methods += new qt_gsi::GenericMethod ("*retrieveData", "@hide", true, &_init_cbs_retrieveData_c3693_0, &_call_cbs_retrieveData_c3693_0, &_set_callback_cbs_retrieveData_c3693_0); diff --git a/src/gsiqt/qt5/QtCore/gsiDeclQObject.cc b/src/gsiqt/qt5/QtCore/gsiDeclQObject.cc index fde0ae8a3..4f343a294 100644 --- a/src/gsiqt/qt5/QtCore/gsiDeclQObject.cc +++ b/src/gsiqt/qt5/QtCore/gsiDeclQObject.cc @@ -133,26 +133,6 @@ static void _call_f_deleteLater_0 (const qt_gsi::GenericMethod * /*decl*/, void } -// void QObject::destroyed(QObject *) - - -static void _init_f_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_f_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - __SUPPRESS_UNUSED_WARNING(ret); - ((QObject *)cls)->destroyed (arg1); -} - - // bool QObject::disconnect(const char *signal, const QObject *receiver, const char *member) @@ -797,7 +777,6 @@ static gsi::Methods methods_QObject () { methods += new qt_gsi::GenericMethod ("children", "@brief Method const QList &QObject::children()\n", true, &_init_f_children_c0, &_call_f_children_c0); methods += new qt_gsi::GenericMethod ("connect", "@brief Method QMetaObject::Connection QObject::connect(const QObject *sender, const char *signal, const char *member, Qt::ConnectionType type)\n", true, &_init_f_connect_c7342, &_call_f_connect_c7342); methods += new qt_gsi::GenericMethod ("deleteLater", "@brief Method void QObject::deleteLater()\n", false, &_init_f_deleteLater_0, &_call_f_deleteLater_0); - methods += new qt_gsi::GenericMethod ("destroyed", "@brief Method void QObject::destroyed(QObject *)\n", false, &_init_f_destroyed_1302, &_call_f_destroyed_1302); methods += new qt_gsi::GenericMethod ("disconnect", "@brief Method bool QObject::disconnect(const char *signal, const QObject *receiver, const char *member)\n", true, &_init_f_disconnect_c5243, &_call_f_disconnect_c5243); methods += new qt_gsi::GenericMethod ("disconnect", "@brief Method bool QObject::disconnect(const QObject *receiver, const char *member)\n", true, &_init_f_disconnect_c3620, &_call_f_disconnect_c3620); methods += new qt_gsi::GenericMethod ("dumpObjectInfo", "@brief Method void QObject::dumpObjectInfo()\n", false, &_init_f_dumpObjectInfo_0, &_call_f_dumpObjectInfo_0); @@ -821,6 +800,8 @@ static gsi::Methods methods_QObject () { methods += new qt_gsi::GenericMethod ("signalsBlocked", "@brief Method bool QObject::signalsBlocked()\n", true, &_init_f_signalsBlocked_c0, &_call_f_signalsBlocked_c0); methods += new qt_gsi::GenericMethod ("startTimer", "@brief Method int QObject::startTimer(int interval, Qt::TimerType timerType)\n", false, &_init_f_startTimer_2339, &_call_f_startTimer_2339); methods += new qt_gsi::GenericMethod ("thread", "@brief Method QThread *QObject::thread()\n", true, &_init_f_thread_c0, &_call_f_thread_c0); + methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QObject::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QObject::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("connect", "@brief Static method QMetaObject::Connection QObject::connect(const QObject *sender, const char *signal, const QObject *receiver, const char *member, Qt::ConnectionType)\nThis method is static and can be called without an instance.", &_init_f_connect_9231, &_call_f_connect_9231); methods += new qt_gsi::GenericStaticMethod ("connect", "@brief Static method QMetaObject::Connection QObject::connect(const QObject *sender, const QMetaMethod &signal, const QObject *receiver, const QMetaMethod &method, Qt::ConnectionType type)\nThis method is static and can be called without an instance.", &_init_f_connect_10557, &_call_f_connect_10557); methods += new qt_gsi::GenericStaticMethod ("disconnect", "@brief Static method bool QObject::disconnect(const QObject *sender, const char *signal, const QObject *receiver, const char *member)\nThis method is static and can be called without an instance.", &_init_f_disconnect_7132, &_call_f_disconnect_7132); @@ -881,6 +862,12 @@ public: return QObject::senderSignalIndex(); } + // [emitter impl] void QObject::destroyed(QObject *) + void emitter_QObject_destroyed_1302(QObject *arg1) + { + emit QObject::destroyed(arg1); + } + // [adaptor impl] bool QObject::event(QEvent *) bool cbs_event_1217_0(QEvent *arg1) { @@ -911,6 +898,13 @@ public: } } + // [emitter impl] void QObject::objectNameChanged(const QString &objectName) + void emitter_QObject_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QObject::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] void QObject::childEvent(QChildEvent *) void cbs_childEvent_1701_0(QChildEvent *arg1) { @@ -1047,6 +1041,24 @@ static void _set_callback_cbs_customEvent_1217_0 (void *cls, const gsi::Callback } +// emitter void QObject::destroyed(QObject *) + +static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); + ((QObject_Adaptor *)cls)->emitter_QObject_destroyed_1302 (arg1); +} + + // void QObject::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -1138,6 +1150,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QObject::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QObject_Adaptor *)cls)->emitter_QObject_objectNameChanged_4567 (arg1); +} + + // exposed int QObject::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -1220,6 +1250,7 @@ static gsi::Methods methods_QObject_Adaptor () { methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QObject::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); + methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QObject::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QObject::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("event", "@brief Virtual method bool QObject::event(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0); @@ -1227,6 +1258,7 @@ static gsi::Methods methods_QObject_Adaptor () { methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QObject::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QObject::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QObject::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QObject::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QObject::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QObject::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); diff --git a/src/gsiqt/qt5/QtCore/gsiDeclQParallelAnimationGroup.cc b/src/gsiqt/qt5/QtCore/gsiDeclQParallelAnimationGroup.cc index d6dab8035..800b9ffdb 100644 --- a/src/gsiqt/qt5/QtCore/gsiDeclQParallelAnimationGroup.cc +++ b/src/gsiqt/qt5/QtCore/gsiDeclQParallelAnimationGroup.cc @@ -133,6 +133,7 @@ static gsi::Methods methods_QParallelAnimationGroup () { methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QParallelAnimationGroup::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal::target_type & > ("directionChanged(QAbstractAnimation::Direction)", "directionChanged", gsi::arg("arg1"), "@brief Signal declaration for QParallelAnimationGroup::directionChanged(QAbstractAnimation::Direction)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("finished()", "finished", "@brief Signal declaration for QParallelAnimationGroup::finished()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QParallelAnimationGroup::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal::target_type &, const qt_gsi::Converter::target_type & > ("stateChanged(QAbstractAnimation::State, QAbstractAnimation::State)", "stateChanged", gsi::arg("newState"), gsi::arg("oldState"), "@brief Signal declaration for QParallelAnimationGroup::stateChanged(QAbstractAnimation::State newState, QAbstractAnimation::State oldState)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QParallelAnimationGroup::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QParallelAnimationGroup::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); @@ -242,6 +243,13 @@ public: emit QParallelAnimationGroup::finished(); } + // [emitter impl] void QParallelAnimationGroup::objectNameChanged(const QString &objectName) + void emitter_QParallelAnimationGroup_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QParallelAnimationGroup::objectNameChanged(const QString &objectName)'"); + } + // [emitter impl] void QParallelAnimationGroup::stateChanged(QAbstractAnimation::State newState, QAbstractAnimation::State oldState) void emitter_QParallelAnimationGroup_stateChanged_5680(QAbstractAnimation::State newState, QAbstractAnimation::State oldState) { @@ -626,6 +634,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QParallelAnimationGroup::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QParallelAnimationGroup_Adaptor *)cls)->emitter_QParallelAnimationGroup_objectNameChanged_4567 (arg1); +} + + // exposed int QParallelAnimationGroup::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -817,6 +843,7 @@ static gsi::Methods methods_QParallelAnimationGroup_Adaptor () { methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("emit_finished", "@brief Emitter for signal void QParallelAnimationGroup::finished()\nCall this method to emit this signal.", false, &_init_emitter_finished_0, &_call_emitter_finished_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QParallelAnimationGroup::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QParallelAnimationGroup::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QParallelAnimationGroup::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QParallelAnimationGroup::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QParallelAnimationGroup::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); diff --git a/src/gsiqt/qt5/QtCore/gsiDeclQPauseAnimation.cc b/src/gsiqt/qt5/QtCore/gsiDeclQPauseAnimation.cc index 0f51fad5f..dfdfd30f0 100644 --- a/src/gsiqt/qt5/QtCore/gsiDeclQPauseAnimation.cc +++ b/src/gsiqt/qt5/QtCore/gsiDeclQPauseAnimation.cc @@ -153,6 +153,7 @@ static gsi::Methods methods_QPauseAnimation () { methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QPauseAnimation::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal::target_type & > ("directionChanged(QAbstractAnimation::Direction)", "directionChanged", gsi::arg("arg1"), "@brief Signal declaration for QPauseAnimation::directionChanged(QAbstractAnimation::Direction)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("finished()", "finished", "@brief Signal declaration for QPauseAnimation::finished()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QPauseAnimation::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal::target_type &, const qt_gsi::Converter::target_type & > ("stateChanged(QAbstractAnimation::State, QAbstractAnimation::State)", "stateChanged", gsi::arg("newState"), gsi::arg("oldState"), "@brief Signal declaration for QPauseAnimation::stateChanged(QAbstractAnimation::State newState, QAbstractAnimation::State oldState)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QPauseAnimation::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QPauseAnimation::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); @@ -274,6 +275,13 @@ public: emit QPauseAnimation::finished(); } + // [emitter impl] void QPauseAnimation::objectNameChanged(const QString &objectName) + void emitter_QPauseAnimation_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QPauseAnimation::objectNameChanged(const QString &objectName)'"); + } + // [emitter impl] void QPauseAnimation::stateChanged(QAbstractAnimation::State newState, QAbstractAnimation::State oldState) void emitter_QPauseAnimation_stateChanged_5680(QAbstractAnimation::State newState, QAbstractAnimation::State oldState) { @@ -679,6 +687,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QPauseAnimation::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QPauseAnimation_Adaptor *)cls)->emitter_QPauseAnimation_objectNameChanged_4567 (arg1); +} + + // exposed int QPauseAnimation::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -871,6 +897,7 @@ static gsi::Methods methods_QPauseAnimation_Adaptor () { methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("emit_finished", "@brief Emitter for signal void QPauseAnimation::finished()\nCall this method to emit this signal.", false, &_init_emitter_finished_0, &_call_emitter_finished_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QPauseAnimation::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QPauseAnimation::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QPauseAnimation::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QPauseAnimation::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QPauseAnimation::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); diff --git a/src/gsiqt/qt5/QtCore/gsiDeclQPluginLoader.cc b/src/gsiqt/qt5/QtCore/gsiDeclQPluginLoader.cc index 58aad4763..915c0f201 100644 --- a/src/gsiqt/qt5/QtCore/gsiDeclQPluginLoader.cc +++ b/src/gsiqt/qt5/QtCore/gsiDeclQPluginLoader.cc @@ -314,6 +314,7 @@ static gsi::Methods methods_QPluginLoader () { methods += new qt_gsi::GenericMethod ("setLoadHints|loadHints=", "@brief Method void QPluginLoader::setLoadHints(QFlags loadHints)\n", false, &_init_f_setLoadHints_2841, &_call_f_setLoadHints_2841); methods += new qt_gsi::GenericMethod ("unload", "@brief Method bool QPluginLoader::unload()\n", false, &_init_f_unload_0, &_call_f_unload_0); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QPluginLoader::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QPluginLoader::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("staticInstances", "@brief Static method QList QPluginLoader::staticInstances()\nThis method is static and can be called without an instance.", &_init_f_staticInstances_0, &_call_f_staticInstances_0); methods += new qt_gsi::GenericStaticMethod ("staticPlugins", "@brief Static method QVector QPluginLoader::staticPlugins()\nThis method is static and can be called without an instance.", &_init_f_staticPlugins_0, &_call_f_staticPlugins_0); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QPluginLoader::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); @@ -418,6 +419,13 @@ public: } } + // [emitter impl] void QPluginLoader::objectNameChanged(const QString &objectName) + void emitter_QPluginLoader_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QPluginLoader::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] void QPluginLoader::childEvent(QChildEvent *) void cbs_childEvent_1701_0(QChildEvent *arg1) { @@ -684,6 +692,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QPluginLoader::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QPluginLoader_Adaptor *)cls)->emitter_QPluginLoader_objectNameChanged_4567 (arg1); +} + + // exposed int QPluginLoader::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -775,6 +801,7 @@ static gsi::Methods methods_QPluginLoader_Adaptor () { methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QPluginLoader::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QPluginLoader::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QPluginLoader::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QPluginLoader::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QPluginLoader::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QPluginLoader::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); diff --git a/src/gsiqt/qt5/QtCore/gsiDeclQProcess.cc b/src/gsiqt/qt5/QtCore/gsiDeclQProcess.cc index 3c3cad221..e325c6809 100644 --- a/src/gsiqt/qt5/QtCore/gsiDeclQProcess.cc +++ b/src/gsiqt/qt5/QtCore/gsiDeclQProcess.cc @@ -1169,8 +1169,13 @@ static gsi::Methods methods_QProcess () { methods += gsi::qt_signal::target_type & > ("error(QProcess::ProcessError)", "error_sig", gsi::arg("error"), "@brief Signal declaration for QProcess::error(QProcess::ProcessError error)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("finished(int)", "finished_int", gsi::arg("exitCode"), "@brief Signal declaration for QProcess::finished(int exitCode)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal::target_type & > ("finished(int, QProcess::ExitStatus)", "finished", gsi::arg("exitCode"), gsi::arg("exitStatus"), "@brief Signal declaration for QProcess::finished(int exitCode, QProcess::ExitStatus exitStatus)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QProcess::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("readChannelFinished()", "readChannelFinished", "@brief Signal declaration for QProcess::readChannelFinished()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("readyRead()", "readyRead", "@brief Signal declaration for QProcess::readyRead()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("readyReadStandardError()", "readyReadStandardError", "@brief Signal declaration for QProcess::readyReadStandardError()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("readyReadStandardOutput()", "readyReadStandardOutput", "@brief Signal declaration for QProcess::readyReadStandardOutput()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("started()", "started", "@brief Signal declaration for QProcess::started()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal::target_type & > ("stateChanged(QProcess::ProcessState)", "stateChanged", gsi::arg("state"), "@brief Signal declaration for QProcess::stateChanged(QProcess::ProcessState state)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("execute", "@brief Static method int QProcess::execute(const QString &program, const QStringList &arguments)\nThis method is static and can be called without an instance.", &_init_f_execute_4354, &_call_f_execute_4354); methods += new qt_gsi::GenericStaticMethod ("execute", "@brief Static method int QProcess::execute(const QString &command)\nThis method is static and can be called without an instance.", &_init_f_execute_2025, &_call_f_execute_2025); methods += new qt_gsi::GenericStaticMethod ("nullDevice", "@brief Static method QString QProcess::nullDevice()\nThis method is static and can be called without an instance.", &_init_f_nullDevice_0, &_call_f_nullDevice_0); diff --git a/src/gsiqt/qt5/QtCore/gsiDeclQPropertyAnimation.cc b/src/gsiqt/qt5/QtCore/gsiDeclQPropertyAnimation.cc index 8a2996da1..def6c9e7e 100644 --- a/src/gsiqt/qt5/QtCore/gsiDeclQPropertyAnimation.cc +++ b/src/gsiqt/qt5/QtCore/gsiDeclQPropertyAnimation.cc @@ -191,6 +191,7 @@ static gsi::Methods methods_QPropertyAnimation () { methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QPropertyAnimation::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal::target_type & > ("directionChanged(QAbstractAnimation::Direction)", "directionChanged", gsi::arg("arg1"), "@brief Signal declaration for QPropertyAnimation::directionChanged(QAbstractAnimation::Direction)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("finished()", "finished", "@brief Signal declaration for QPropertyAnimation::finished()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QPropertyAnimation::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal::target_type &, const qt_gsi::Converter::target_type & > ("stateChanged(QAbstractAnimation::State, QAbstractAnimation::State)", "stateChanged", gsi::arg("newState"), gsi::arg("oldState"), "@brief Signal declaration for QPropertyAnimation::stateChanged(QAbstractAnimation::State newState, QAbstractAnimation::State oldState)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("valueChanged(const QVariant &)", "valueChanged", gsi::arg("value"), "@brief Signal declaration for QPropertyAnimation::valueChanged(const QVariant &value)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QPropertyAnimation::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); @@ -313,6 +314,13 @@ public: emit QPropertyAnimation::finished(); } + // [emitter impl] void QPropertyAnimation::objectNameChanged(const QString &objectName) + void emitter_QPropertyAnimation_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QPropertyAnimation::objectNameChanged(const QString &objectName)'"); + } + // [emitter impl] void QPropertyAnimation::stateChanged(QAbstractAnimation::State newState, QAbstractAnimation::State oldState) void emitter_QPropertyAnimation_stateChanged_5680(QAbstractAnimation::State newState, QAbstractAnimation::State oldState) { @@ -788,6 +796,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QPropertyAnimation::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QPropertyAnimation_Adaptor *)cls)->emitter_QPropertyAnimation_objectNameChanged_4567 (arg1); +} + + // exposed int QPropertyAnimation::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -1024,6 +1050,7 @@ static gsi::Methods methods_QPropertyAnimation_Adaptor () { methods += new qt_gsi::GenericMethod ("*interpolated", "@brief Virtual method QVariant QPropertyAnimation::interpolated(const QVariant &from, const QVariant &to, double progress)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_interpolated_c5093_0, &_call_cbs_interpolated_c5093_0); methods += new qt_gsi::GenericMethod ("*interpolated", "@hide", true, &_init_cbs_interpolated_c5093_0, &_call_cbs_interpolated_c5093_0, &_set_callback_cbs_interpolated_c5093_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QPropertyAnimation::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QPropertyAnimation::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QPropertyAnimation::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QPropertyAnimation::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QPropertyAnimation::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); diff --git a/src/gsiqt/qt5/QtCore/gsiDeclQSaveFile.cc b/src/gsiqt/qt5/QtCore/gsiDeclQSaveFile.cc index 577803e22..19c5f9a99 100644 --- a/src/gsiqt/qt5/QtCore/gsiDeclQSaveFile.cc +++ b/src/gsiqt/qt5/QtCore/gsiDeclQSaveFile.cc @@ -241,6 +241,7 @@ static gsi::Methods methods_QSaveFile () { methods += gsi::qt_signal ("aboutToClose()", "aboutToClose", "@brief Signal declaration for QSaveFile::aboutToClose()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("bytesWritten(qint64)", "bytesWritten", gsi::arg("bytes"), "@brief Signal declaration for QSaveFile::bytesWritten(qint64 bytes)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QSaveFile::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QSaveFile::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("readChannelFinished()", "readChannelFinished", "@brief Signal declaration for QSaveFile::readChannelFinished()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("readyRead()", "readyRead", "@brief Signal declaration for QSaveFile::readyRead()\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QSaveFile::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); @@ -457,6 +458,13 @@ public: } } + // [emitter impl] void QSaveFile::objectNameChanged(const QString &objectName) + void emitter_QSaveFile_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QSaveFile::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] bool QSaveFile::open(QFlags flags) bool cbs_open_3242_0(QFlags flags) { @@ -1081,6 +1089,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QSaveFile::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QSaveFile_Adaptor *)cls)->emitter_QSaveFile_objectNameChanged_4567 (arg1); +} + + // bool QSaveFile::open(QFlags flags) static void _init_cbs_open_3242_0 (qt_gsi::GenericMethod *decl) @@ -1493,6 +1519,7 @@ static gsi::Methods methods_QSaveFile_Adaptor () { methods += new qt_gsi::GenericMethod ("isSequential", "@brief Virtual method bool QSaveFile::isSequential()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_isSequential_c0_0, &_call_cbs_isSequential_c0_0); methods += new qt_gsi::GenericMethod ("isSequential", "@hide", true, &_init_cbs_isSequential_c0_0, &_call_cbs_isSequential_c0_0, &_set_callback_cbs_isSequential_c0_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QSaveFile::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QSaveFile::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("open", "@brief Virtual method bool QSaveFile::open(QFlags flags)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_open_3242_0, &_call_cbs_open_3242_0); methods += new qt_gsi::GenericMethod ("open", "@hide", false, &_init_cbs_open_3242_0, &_call_cbs_open_3242_0, &_set_callback_cbs_open_3242_0); methods += new qt_gsi::GenericMethod ("permissions", "@brief Virtual method QFlags QSaveFile::permissions()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_permissions_c0_0, &_call_cbs_permissions_c0_0); diff --git a/src/gsiqt/qt5/QtCore/gsiDeclQSequentialAnimationGroup.cc b/src/gsiqt/qt5/QtCore/gsiDeclQSequentialAnimationGroup.cc index 3f9c99bdf..ba79d38cb 100644 --- a/src/gsiqt/qt5/QtCore/gsiDeclQSequentialAnimationGroup.cc +++ b/src/gsiqt/qt5/QtCore/gsiDeclQSequentialAnimationGroup.cc @@ -194,6 +194,7 @@ static gsi::Methods methods_QSequentialAnimationGroup () { methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QSequentialAnimationGroup::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal::target_type & > ("directionChanged(QAbstractAnimation::Direction)", "directionChanged", gsi::arg("arg1"), "@brief Signal declaration for QSequentialAnimationGroup::directionChanged(QAbstractAnimation::Direction)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("finished()", "finished", "@brief Signal declaration for QSequentialAnimationGroup::finished()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QSequentialAnimationGroup::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal::target_type &, const qt_gsi::Converter::target_type & > ("stateChanged(QAbstractAnimation::State, QAbstractAnimation::State)", "stateChanged", gsi::arg("newState"), gsi::arg("oldState"), "@brief Signal declaration for QSequentialAnimationGroup::stateChanged(QAbstractAnimation::State newState, QAbstractAnimation::State oldState)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QSequentialAnimationGroup::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QSequentialAnimationGroup::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); @@ -309,6 +310,13 @@ public: emit QSequentialAnimationGroup::finished(); } + // [emitter impl] void QSequentialAnimationGroup::objectNameChanged(const QString &objectName) + void emitter_QSequentialAnimationGroup_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QSequentialAnimationGroup::objectNameChanged(const QString &objectName)'"); + } + // [emitter impl] void QSequentialAnimationGroup::stateChanged(QAbstractAnimation::State newState, QAbstractAnimation::State oldState) void emitter_QSequentialAnimationGroup_stateChanged_5680(QAbstractAnimation::State newState, QAbstractAnimation::State oldState) { @@ -711,6 +719,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QSequentialAnimationGroup::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QSequentialAnimationGroup_Adaptor *)cls)->emitter_QSequentialAnimationGroup_objectNameChanged_4567 (arg1); +} + + // exposed int QSequentialAnimationGroup::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -903,6 +929,7 @@ static gsi::Methods methods_QSequentialAnimationGroup_Adaptor () { methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("emit_finished", "@brief Emitter for signal void QSequentialAnimationGroup::finished()\nCall this method to emit this signal.", false, &_init_emitter_finished_0, &_call_emitter_finished_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QSequentialAnimationGroup::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QSequentialAnimationGroup::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QSequentialAnimationGroup::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QSequentialAnimationGroup::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QSequentialAnimationGroup::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); diff --git a/src/gsiqt/qt5/QtCore/gsiDeclQSettings.cc b/src/gsiqt/qt5/QtCore/gsiDeclQSettings.cc index d841d7bf7..7f570a9be 100644 --- a/src/gsiqt/qt5/QtCore/gsiDeclQSettings.cc +++ b/src/gsiqt/qt5/QtCore/gsiDeclQSettings.cc @@ -668,6 +668,7 @@ static gsi::Methods methods_QSettings () { methods += new qt_gsi::GenericMethod ("sync", "@brief Method void QSettings::sync()\n", false, &_init_f_sync_0, &_call_f_sync_0); methods += new qt_gsi::GenericMethod ("value", "@brief Method QVariant QSettings::value(const QString &key, const QVariant &defaultValue)\n", true, &_init_f_value_c4036, &_call_f_value_c4036); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QSettings::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QSettings::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod (":defaultFormat", "@brief Static method QSettings::Format QSettings::defaultFormat()\nThis method is static and can be called without an instance.", &_init_f_defaultFormat_0, &_call_f_defaultFormat_0); methods += new qt_gsi::GenericStaticMethod ("setDefaultFormat|defaultFormat=", "@brief Static method void QSettings::setDefaultFormat(QSettings::Format format)\nThis method is static and can be called without an instance.", &_init_f_setDefaultFormat_2099, &_call_f_setDefaultFormat_2099); methods += new qt_gsi::GenericStaticMethod ("setPath", "@brief Static method void QSettings::setPath(QSettings::Format format, QSettings::Scope scope, const QString &path)\nThis method is static and can be called without an instance.", &_init_f_setPath_5896, &_call_f_setPath_5896); @@ -814,6 +815,13 @@ public: } } + // [emitter impl] void QSettings::objectNameChanged(const QString &objectName) + void emitter_QSettings_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QSettings::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] void QSettings::childEvent(QChildEvent *) void cbs_childEvent_1701_0(QChildEvent *arg1) { @@ -1179,6 +1187,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QSettings::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QSettings_Adaptor *)cls)->emitter_QSettings_objectNameChanged_4567 (arg1); +} + + // exposed int QSettings::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -1273,6 +1299,7 @@ static gsi::Methods methods_QSettings_Adaptor () { methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QSettings::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QSettings::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QSettings::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QSettings::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QSettings::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QSettings::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); diff --git a/src/gsiqt/qt5/QtCore/gsiDeclQSharedMemory.cc b/src/gsiqt/qt5/QtCore/gsiDeclQSharedMemory.cc index fbb8962ea..a3b7b2931 100644 --- a/src/gsiqt/qt5/QtCore/gsiDeclQSharedMemory.cc +++ b/src/gsiqt/qt5/QtCore/gsiDeclQSharedMemory.cc @@ -389,6 +389,7 @@ static gsi::Methods methods_QSharedMemory () { methods += new qt_gsi::GenericMethod ("size", "@brief Method int QSharedMemory::size()\n", true, &_init_f_size_c0, &_call_f_size_c0); methods += new qt_gsi::GenericMethod ("unlock", "@brief Method bool QSharedMemory::unlock()\n", false, &_init_f_unlock_0, &_call_f_unlock_0); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QSharedMemory::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QSharedMemory::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QSharedMemory::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QSharedMemory::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -491,6 +492,13 @@ public: } } + // [emitter impl] void QSharedMemory::objectNameChanged(const QString &objectName) + void emitter_QSharedMemory_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QSharedMemory::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] void QSharedMemory::childEvent(QChildEvent *) void cbs_childEvent_1701_0(QChildEvent *arg1) { @@ -757,6 +765,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QSharedMemory::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QSharedMemory_Adaptor *)cls)->emitter_QSharedMemory_objectNameChanged_4567 (arg1); +} + + // exposed int QSharedMemory::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -848,6 +874,7 @@ static gsi::Methods methods_QSharedMemory_Adaptor () { methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QSharedMemory::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QSharedMemory::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QSharedMemory::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QSharedMemory::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QSharedMemory::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QSharedMemory::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); diff --git a/src/gsiqt/qt5/QtCore/gsiDeclQSignalMapper.cc b/src/gsiqt/qt5/QtCore/gsiDeclQSignalMapper.cc index df693da2d..5de57d018 100644 --- a/src/gsiqt/qt5/QtCore/gsiDeclQSignalMapper.cc +++ b/src/gsiqt/qt5/QtCore/gsiDeclQSignalMapper.cc @@ -352,6 +352,7 @@ static gsi::Methods methods_QSignalMapper () { methods += gsi::qt_signal ("mapped(const QString &)", "mapped_qs", gsi::arg("arg1"), "@brief Signal declaration for QSignalMapper::mapped(const QString &)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("mapped(QWidget *)", "mapped_qw", gsi::arg("arg1"), "@brief Signal declaration for QSignalMapper::mapped(QWidget *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("mapped(QObject *)", "mapped_qo", gsi::arg("arg1"), "@brief Signal declaration for QSignalMapper::mapped(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QSignalMapper::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QSignalMapper::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QSignalMapper::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -466,6 +467,13 @@ public: emit QSignalMapper::mapped(arg1); } + // [emitter impl] void QSignalMapper::objectNameChanged(const QString &objectName) + void emitter_QSignalMapper_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QSignalMapper::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] void QSignalMapper::childEvent(QChildEvent *) void cbs_childEvent_1701_0(QChildEvent *arg1) { @@ -783,6 +791,24 @@ static void _call_emitter_mapped_1302 (const qt_gsi::GenericMethod * /*decl*/, v } +// emitter void QSignalMapper::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QSignalMapper_Adaptor *)cls)->emitter_QSignalMapper_objectNameChanged_4567 (arg1); +} + + // exposed int QSignalMapper::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -877,6 +903,7 @@ static gsi::Methods methods_QSignalMapper_Adaptor () { methods += new qt_gsi::GenericMethod ("emit_mapped_qs", "@brief Emitter for signal void QSignalMapper::mapped(const QString &)\nCall this method to emit this signal.", false, &_init_emitter_mapped_2025, &_call_emitter_mapped_2025); methods += new qt_gsi::GenericMethod ("emit_mapped_qw", "@brief Emitter for signal void QSignalMapper::mapped(QWidget *)\nCall this method to emit this signal.", false, &_init_emitter_mapped_1315, &_call_emitter_mapped_1315); methods += new qt_gsi::GenericMethod ("emit_mapped_qo", "@brief Emitter for signal void QSignalMapper::mapped(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_mapped_1302, &_call_emitter_mapped_1302); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QSignalMapper::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QSignalMapper::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QSignalMapper::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QSignalMapper::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); diff --git a/src/gsiqt/qt5/QtCore/gsiDeclQSignalTransition.cc b/src/gsiqt/qt5/QtCore/gsiDeclQSignalTransition.cc index 3ef7225dc..c44816f76 100644 --- a/src/gsiqt/qt5/QtCore/gsiDeclQSignalTransition.cc +++ b/src/gsiqt/qt5/QtCore/gsiDeclQSignalTransition.cc @@ -190,6 +190,12 @@ static gsi::Methods methods_QSignalTransition () { methods += new qt_gsi::GenericMethod ("setSignal|signal=", "@brief Method void QSignalTransition::setSignal(const QByteArray &signal)\n", false, &_init_f_setSignal_2309, &_call_f_setSignal_2309); methods += new qt_gsi::GenericMethod (":signal", "@brief Method QByteArray QSignalTransition::signal()\n", true, &_init_f_signal_c0, &_call_f_signal_c0); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QSignalTransition::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QSignalTransition::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("senderObjectChanged()", "senderObjectChanged", "@brief Signal declaration for QSignalTransition::senderObjectChanged()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("signalChanged()", "signalChanged", "@brief Signal declaration for QSignalTransition::signalChanged()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("targetStateChanged()", "targetStateChanged", "@brief Signal declaration for QSignalTransition::targetStateChanged()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("targetStatesChanged()", "targetStatesChanged", "@brief Signal declaration for QSignalTransition::targetStatesChanged()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("triggered()", "triggered", "@brief Signal declaration for QSignalTransition::triggered()\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QSignalTransition::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QSignalTransition::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -277,6 +283,43 @@ public: } } + // [emitter impl] void QSignalTransition::objectNameChanged(const QString &objectName) + void emitter_QSignalTransition_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QSignalTransition::objectNameChanged(const QString &objectName)'"); + } + + // [emitter impl] void QSignalTransition::senderObjectChanged() + void emitter_QSignalTransition_senderObjectChanged_3724() + { + throw tl::Exception ("Can't emit private signal 'void QSignalTransition::senderObjectChanged()'"); + } + + // [emitter impl] void QSignalTransition::signalChanged() + void emitter_QSignalTransition_signalChanged_3724() + { + throw tl::Exception ("Can't emit private signal 'void QSignalTransition::signalChanged()'"); + } + + // [emitter impl] void QSignalTransition::targetStateChanged() + void emitter_QSignalTransition_targetStateChanged_3938() + { + throw tl::Exception ("Can't emit private signal 'void QSignalTransition::targetStateChanged()'"); + } + + // [emitter impl] void QSignalTransition::targetStatesChanged() + void emitter_QSignalTransition_targetStatesChanged_3938() + { + throw tl::Exception ("Can't emit private signal 'void QSignalTransition::targetStatesChanged()'"); + } + + // [emitter impl] void QSignalTransition::triggered() + void emitter_QSignalTransition_triggered_3938() + { + throw tl::Exception ("Can't emit private signal 'void QSignalTransition::triggered()'"); + } + // [adaptor impl] void QSignalTransition::childEvent(QChildEvent *) void cbs_childEvent_1701_0(QChildEvent *arg1) { @@ -616,6 +659,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QSignalTransition::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QSignalTransition_Adaptor *)cls)->emitter_QSignalTransition_objectNameChanged_4567 (arg1); +} + + // void QSignalTransition::onTransition(QEvent *event) static void _init_cbs_onTransition_1217_0 (qt_gsi::GenericMethod *decl) @@ -672,6 +733,20 @@ static void _call_fp_sender_c0 (const qt_gsi::GenericMethod * /*decl*/, void *cl } +// emitter void QSignalTransition::senderObjectChanged() + +static void _init_emitter_senderObjectChanged_3724 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_emitter_senderObjectChanged_3724 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + ((QSignalTransition_Adaptor *)cls)->emitter_QSignalTransition_senderObjectChanged_3724 (); +} + + // exposed int QSignalTransition::senderSignalIndex() static void _init_fp_senderSignalIndex_c0 (qt_gsi::GenericMethod *decl) @@ -686,6 +761,48 @@ static void _call_fp_senderSignalIndex_c0 (const qt_gsi::GenericMethod * /*decl* } +// emitter void QSignalTransition::signalChanged() + +static void _init_emitter_signalChanged_3724 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_emitter_signalChanged_3724 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + ((QSignalTransition_Adaptor *)cls)->emitter_QSignalTransition_signalChanged_3724 (); +} + + +// emitter void QSignalTransition::targetStateChanged() + +static void _init_emitter_targetStateChanged_3938 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_emitter_targetStateChanged_3938 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + ((QSignalTransition_Adaptor *)cls)->emitter_QSignalTransition_targetStateChanged_3938 (); +} + + +// emitter void QSignalTransition::targetStatesChanged() + +static void _init_emitter_targetStatesChanged_3938 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_emitter_targetStatesChanged_3938 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + ((QSignalTransition_Adaptor *)cls)->emitter_QSignalTransition_targetStatesChanged_3938 (); +} + + // void QSignalTransition::timerEvent(QTimerEvent *) static void _init_cbs_timerEvent_1730_0 (qt_gsi::GenericMethod *decl) @@ -710,6 +827,20 @@ static void _set_callback_cbs_timerEvent_1730_0 (void *cls, const gsi::Callback } +// emitter void QSignalTransition::triggered() + +static void _init_emitter_triggered_3938 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_emitter_triggered_3938 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + ((QSignalTransition_Adaptor *)cls)->emitter_QSignalTransition_triggered_3938 (); +} + + namespace gsi { @@ -733,13 +864,19 @@ static gsi::Methods methods_QSignalTransition_Adaptor () { methods += new qt_gsi::GenericMethod ("*eventTest", "@brief Virtual method bool QSignalTransition::eventTest(QEvent *event)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventTest_1217_0, &_call_cbs_eventTest_1217_0); methods += new qt_gsi::GenericMethod ("*eventTest", "@hide", false, &_init_cbs_eventTest_1217_0, &_call_cbs_eventTest_1217_0, &_set_callback_cbs_eventTest_1217_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QSignalTransition::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QSignalTransition::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*onTransition", "@brief Virtual method void QSignalTransition::onTransition(QEvent *event)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_onTransition_1217_0, &_call_cbs_onTransition_1217_0); methods += new qt_gsi::GenericMethod ("*onTransition", "@hide", false, &_init_cbs_onTransition_1217_0, &_call_cbs_onTransition_1217_0, &_set_callback_cbs_onTransition_1217_0); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QSignalTransition::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QSignalTransition::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); + methods += new qt_gsi::GenericMethod ("emit_senderObjectChanged", "@brief Emitter for signal void QSignalTransition::senderObjectChanged()\nCall this method to emit this signal.", false, &_init_emitter_senderObjectChanged_3724, &_call_emitter_senderObjectChanged_3724); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QSignalTransition::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); + methods += new qt_gsi::GenericMethod ("emit_signalChanged", "@brief Emitter for signal void QSignalTransition::signalChanged()\nCall this method to emit this signal.", false, &_init_emitter_signalChanged_3724, &_call_emitter_signalChanged_3724); + methods += new qt_gsi::GenericMethod ("emit_targetStateChanged", "@brief Emitter for signal void QSignalTransition::targetStateChanged()\nCall this method to emit this signal.", false, &_init_emitter_targetStateChanged_3938, &_call_emitter_targetStateChanged_3938); + methods += new qt_gsi::GenericMethod ("emit_targetStatesChanged", "@brief Emitter for signal void QSignalTransition::targetStatesChanged()\nCall this method to emit this signal.", false, &_init_emitter_targetStatesChanged_3938, &_call_emitter_targetStatesChanged_3938); methods += new qt_gsi::GenericMethod ("*timerEvent", "@brief Virtual method void QSignalTransition::timerEvent(QTimerEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_timerEvent_1730_0, &_call_cbs_timerEvent_1730_0); methods += new qt_gsi::GenericMethod ("*timerEvent", "@hide", false, &_init_cbs_timerEvent_1730_0, &_call_cbs_timerEvent_1730_0, &_set_callback_cbs_timerEvent_1730_0); + methods += new qt_gsi::GenericMethod ("emit_triggered", "@brief Emitter for signal void QSignalTransition::triggered()\nCall this method to emit this signal.", false, &_init_emitter_triggered_3938, &_call_emitter_triggered_3938); return methods; } diff --git a/src/gsiqt/qt5/QtCore/gsiDeclQSocketNotifier.cc b/src/gsiqt/qt5/QtCore/gsiDeclQSocketNotifier.cc index 3c1e36749..6a79a3702 100644 --- a/src/gsiqt/qt5/QtCore/gsiDeclQSocketNotifier.cc +++ b/src/gsiqt/qt5/QtCore/gsiDeclQSocketNotifier.cc @@ -180,7 +180,9 @@ static gsi::Methods methods_QSocketNotifier () { methods += new qt_gsi::GenericMethod ("setEnabled|enabled=", "@brief Method void QSocketNotifier::setEnabled(bool)\n", false, &_init_f_setEnabled_864, &_call_f_setEnabled_864); methods += new qt_gsi::GenericMethod ("socket", "@brief Method QIntegerForSizeof::Signed QSocketNotifier::socket()\n", true, &_init_f_socket_c0, &_call_f_socket_c0); methods += new qt_gsi::GenericMethod ("type", "@brief Method QSocketNotifier::Type QSocketNotifier::type()\n", true, &_init_f_type_c0, &_call_f_type_c0); + methods += gsi::qt_signal ("activated(int)", "activated", gsi::arg("socket"), "@brief Signal declaration for QSocketNotifier::activated(int socket)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QSocketNotifier::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QSocketNotifier::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QSocketNotifier::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QSocketNotifier::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -235,6 +237,13 @@ public: return QSocketNotifier::senderSignalIndex(); } + // [emitter impl] void QSocketNotifier::activated(int socket) + void emitter_QSocketNotifier_activated_4159(int socket) + { + __SUPPRESS_UNUSED_WARNING (socket); + throw tl::Exception ("Can't emit private signal 'void QSocketNotifier::activated(int socket)'"); + } + // [emitter impl] void QSocketNotifier::destroyed(QObject *) void emitter_QSocketNotifier_destroyed_1302(QObject *arg1) { @@ -256,6 +265,13 @@ public: } } + // [emitter impl] void QSocketNotifier::objectNameChanged(const QString &objectName) + void emitter_QSocketNotifier_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QSocketNotifier::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] void QSocketNotifier::childEvent(QChildEvent *) void cbs_childEvent_1701_0(QChildEvent *arg1) { @@ -365,6 +381,24 @@ static void _call_ctor_QSocketNotifier_Adaptor_7056 (const qt_gsi::GenericStatic } +// emitter void QSocketNotifier::activated(int socket) + +static void _init_emitter_activated_4159 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("socket"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_activated_4159 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + int arg1 = gsi::arg_reader() (args, heap); + ((QSocketNotifier_Adaptor *)cls)->emitter_QSocketNotifier_activated_4159 (arg1); +} + + // void QSocketNotifier::childEvent(QChildEvent *) static void _init_cbs_childEvent_1701_0 (qt_gsi::GenericMethod *decl) @@ -522,6 +556,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QSocketNotifier::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QSocketNotifier_Adaptor *)cls)->emitter_QSocketNotifier_objectNameChanged_4567 (arg1); +} + + // exposed int QSocketNotifier::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -600,6 +652,7 @@ gsi::Class &qtdecl_QSocketNotifier (); static gsi::Methods methods_QSocketNotifier_Adaptor () { gsi::Methods methods; methods += new qt_gsi::GenericStaticMethod ("new", "@brief Constructor QSocketNotifier::QSocketNotifier(QIntegerForSizeof::Signed socket, QSocketNotifier::Type, QObject *parent)\nThis method creates an object of class QSocketNotifier.", &_init_ctor_QSocketNotifier_Adaptor_7056, &_call_ctor_QSocketNotifier_Adaptor_7056); + methods += new qt_gsi::GenericMethod ("emit_activated", "@brief Emitter for signal void QSocketNotifier::activated(int socket)\nCall this method to emit this signal.", false, &_init_emitter_activated_4159, &_call_emitter_activated_4159); methods += new qt_gsi::GenericMethod ("*childEvent", "@brief Virtual method void QSocketNotifier::childEvent(QChildEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QSocketNotifier::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); @@ -612,6 +665,7 @@ static gsi::Methods methods_QSocketNotifier_Adaptor () { methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QSocketNotifier::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QSocketNotifier::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QSocketNotifier::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QSocketNotifier::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QSocketNotifier::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QSocketNotifier::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); diff --git a/src/gsiqt/qt5/QtCore/gsiDeclQSortFilterProxyModel.cc b/src/gsiqt/qt5/QtCore/gsiDeclQSortFilterProxyModel.cc index c0ded1ab1..cec3a8ad3 100644 --- a/src/gsiqt/qt5/QtCore/gsiDeclQSortFilterProxyModel.cc +++ b/src/gsiqt/qt5/QtCore/gsiDeclQSortFilterProxyModel.cc @@ -1242,11 +1242,27 @@ static gsi::Methods methods_QSortFilterProxyModel () { methods += new qt_gsi::GenericMethod (":sortRole", "@brief Method int QSortFilterProxyModel::sortRole()\n", true, &_init_f_sortRole_c0, &_call_f_sortRole_c0); methods += new qt_gsi::GenericMethod ("span", "@brief Method QSize QSortFilterProxyModel::span(const QModelIndex &index)\nThis is a reimplementation of QAbstractProxyModel::span", true, &_init_f_span_c2395, &_call_f_span_c2395); methods += new qt_gsi::GenericMethod ("supportedDropActions", "@brief Method QFlags QSortFilterProxyModel::supportedDropActions()\nThis is a reimplementation of QAbstractProxyModel::supportedDropActions", true, &_init_f_supportedDropActions_c0, &_call_f_supportedDropActions_c0); + methods += gsi::qt_signal ("columnsAboutToBeInserted(const QModelIndex &, int, int)", "columnsAboutToBeInserted", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QSortFilterProxyModel::columnsAboutToBeInserted(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("columnsAboutToBeMoved(const QModelIndex &, int, int, const QModelIndex &, int)", "columnsAboutToBeMoved", gsi::arg("sourceParent"), gsi::arg("sourceStart"), gsi::arg("sourceEnd"), gsi::arg("destinationParent"), gsi::arg("destinationColumn"), "@brief Signal declaration for QSortFilterProxyModel::columnsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("columnsAboutToBeRemoved(const QModelIndex &, int, int)", "columnsAboutToBeRemoved", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QSortFilterProxyModel::columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("columnsInserted(const QModelIndex &, int, int)", "columnsInserted", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QSortFilterProxyModel::columnsInserted(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("columnsMoved(const QModelIndex &, int, int, const QModelIndex &, int)", "columnsMoved", gsi::arg("parent"), gsi::arg("start"), gsi::arg("end"), gsi::arg("destination"), gsi::arg("column"), "@brief Signal declaration for QSortFilterProxyModel::columnsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("columnsRemoved(const QModelIndex &, int, int)", "columnsRemoved", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QSortFilterProxyModel::columnsRemoved(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal & > ("dataChanged(const QModelIndex &, const QModelIndex &, const QVector &)", "dataChanged", gsi::arg("topLeft"), gsi::arg("bottomRight"), gsi::arg("roles"), "@brief Signal declaration for QSortFilterProxyModel::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector &roles)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QSortFilterProxyModel::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal::target_type &, int, int > ("headerDataChanged(Qt::Orientation, int, int)", "headerDataChanged", gsi::arg("orientation"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QSortFilterProxyModel::headerDataChanged(Qt::Orientation orientation, int first, int last)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal &, const qt_gsi::Converter::target_type & > ("layoutAboutToBeChanged(const QList &, QAbstractItemModel::LayoutChangeHint)", "layoutAboutToBeChanged", gsi::arg("parents"), gsi::arg("hint"), "@brief Signal declaration for QSortFilterProxyModel::layoutAboutToBeChanged(const QList &parents, QAbstractItemModel::LayoutChangeHint hint)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal &, const qt_gsi::Converter::target_type & > ("layoutChanged(const QList &, QAbstractItemModel::LayoutChangeHint)", "layoutChanged", gsi::arg("parents"), gsi::arg("hint"), "@brief Signal declaration for QSortFilterProxyModel::layoutChanged(const QList &parents, QAbstractItemModel::LayoutChangeHint hint)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("modelAboutToBeReset()", "modelAboutToBeReset", "@brief Signal declaration for QSortFilterProxyModel::modelAboutToBeReset()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("modelReset()", "modelReset", "@brief Signal declaration for QSortFilterProxyModel::modelReset()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QSortFilterProxyModel::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsAboutToBeInserted(const QModelIndex &, int, int)", "rowsAboutToBeInserted", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QSortFilterProxyModel::rowsAboutToBeInserted(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsAboutToBeMoved(const QModelIndex &, int, int, const QModelIndex &, int)", "rowsAboutToBeMoved", gsi::arg("sourceParent"), gsi::arg("sourceStart"), gsi::arg("sourceEnd"), gsi::arg("destinationParent"), gsi::arg("destinationRow"), "@brief Signal declaration for QSortFilterProxyModel::rowsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsAboutToBeRemoved(const QModelIndex &, int, int)", "rowsAboutToBeRemoved", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QSortFilterProxyModel::rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsInserted(const QModelIndex &, int, int)", "rowsInserted", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QSortFilterProxyModel::rowsInserted(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsMoved(const QModelIndex &, int, int, const QModelIndex &, int)", "rowsMoved", gsi::arg("parent"), gsi::arg("start"), gsi::arg("end"), gsi::arg("destination"), gsi::arg("row"), "@brief Signal declaration for QSortFilterProxyModel::rowsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsRemoved(const QModelIndex &, int, int)", "rowsRemoved", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QSortFilterProxyModel::rowsRemoved(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("sourceModelChanged()", "sourceModelChanged", "@brief Signal declaration for QSortFilterProxyModel::sourceModelChanged()\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QSortFilterProxyModel::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QSortFilterProxyModel::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -1481,6 +1497,64 @@ public: } } + // [emitter impl] void QSortFilterProxyModel::columnsAboutToBeInserted(const QModelIndex &parent, int first, int last) + void emitter_QSortFilterProxyModel_columnsAboutToBeInserted_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QSortFilterProxyModel::columnsAboutToBeInserted(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QSortFilterProxyModel::columnsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn) + void emitter_QSortFilterProxyModel_columnsAboutToBeMoved_10318(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn) + { + __SUPPRESS_UNUSED_WARNING (sourceParent); + __SUPPRESS_UNUSED_WARNING (sourceStart); + __SUPPRESS_UNUSED_WARNING (sourceEnd); + __SUPPRESS_UNUSED_WARNING (destinationParent); + __SUPPRESS_UNUSED_WARNING (destinationColumn); + throw tl::Exception ("Can't emit private signal 'void QSortFilterProxyModel::columnsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn)'"); + } + + // [emitter impl] void QSortFilterProxyModel::columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last) + void emitter_QSortFilterProxyModel_columnsAboutToBeRemoved_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QSortFilterProxyModel::columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QSortFilterProxyModel::columnsInserted(const QModelIndex &parent, int first, int last) + void emitter_QSortFilterProxyModel_columnsInserted_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QSortFilterProxyModel::columnsInserted(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QSortFilterProxyModel::columnsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column) + void emitter_QSortFilterProxyModel_columnsMoved_10318(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (start); + __SUPPRESS_UNUSED_WARNING (end); + __SUPPRESS_UNUSED_WARNING (destination); + __SUPPRESS_UNUSED_WARNING (column); + throw tl::Exception ("Can't emit private signal 'void QSortFilterProxyModel::columnsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column)'"); + } + + // [emitter impl] void QSortFilterProxyModel::columnsRemoved(const QModelIndex &parent, int first, int last) + void emitter_QSortFilterProxyModel_columnsRemoved_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QSortFilterProxyModel::columnsRemoved(const QModelIndex &parent, int first, int last)'"); + } + // [adaptor impl] QVariant QSortFilterProxyModel::data(const QModelIndex &index, int role) QVariant cbs_data_c3054_1(const QModelIndex &index, int role) const { @@ -1796,6 +1870,18 @@ public: } } + // [emitter impl] void QSortFilterProxyModel::modelAboutToBeReset() + void emitter_QSortFilterProxyModel_modelAboutToBeReset_3767() + { + throw tl::Exception ("Can't emit private signal 'void QSortFilterProxyModel::modelAboutToBeReset()'"); + } + + // [emitter impl] void QSortFilterProxyModel::modelReset() + void emitter_QSortFilterProxyModel_modelReset_3767() + { + throw tl::Exception ("Can't emit private signal 'void QSortFilterProxyModel::modelReset()'"); + } + // [adaptor impl] bool QSortFilterProxyModel::moveColumns(const QModelIndex &sourceParent, int sourceColumn, int count, const QModelIndex &destinationParent, int destinationChild) bool cbs_moveColumns_6659_0(const QModelIndex &sourceParent, int sourceColumn, int count, const QModelIndex &destinationParent, int destinationChild) { @@ -1826,6 +1912,13 @@ public: } } + // [emitter impl] void QSortFilterProxyModel::objectNameChanged(const QString &objectName) + void emitter_QSortFilterProxyModel_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QSortFilterProxyModel::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QModelIndex QSortFilterProxyModel::parent(const QModelIndex &child) QModelIndex cbs_parent_c2395_0(const QModelIndex &child) const { @@ -1916,6 +2009,64 @@ public: } } + // [emitter impl] void QSortFilterProxyModel::rowsAboutToBeInserted(const QModelIndex &parent, int first, int last) + void emitter_QSortFilterProxyModel_rowsAboutToBeInserted_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QSortFilterProxyModel::rowsAboutToBeInserted(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QSortFilterProxyModel::rowsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow) + void emitter_QSortFilterProxyModel_rowsAboutToBeMoved_10318(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow) + { + __SUPPRESS_UNUSED_WARNING (sourceParent); + __SUPPRESS_UNUSED_WARNING (sourceStart); + __SUPPRESS_UNUSED_WARNING (sourceEnd); + __SUPPRESS_UNUSED_WARNING (destinationParent); + __SUPPRESS_UNUSED_WARNING (destinationRow); + throw tl::Exception ("Can't emit private signal 'void QSortFilterProxyModel::rowsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow)'"); + } + + // [emitter impl] void QSortFilterProxyModel::rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last) + void emitter_QSortFilterProxyModel_rowsAboutToBeRemoved_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QSortFilterProxyModel::rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QSortFilterProxyModel::rowsInserted(const QModelIndex &parent, int first, int last) + void emitter_QSortFilterProxyModel_rowsInserted_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QSortFilterProxyModel::rowsInserted(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QSortFilterProxyModel::rowsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row) + void emitter_QSortFilterProxyModel_rowsMoved_10318(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (start); + __SUPPRESS_UNUSED_WARNING (end); + __SUPPRESS_UNUSED_WARNING (destination); + __SUPPRESS_UNUSED_WARNING (row); + throw tl::Exception ("Can't emit private signal 'void QSortFilterProxyModel::rowsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row)'"); + } + + // [emitter impl] void QSortFilterProxyModel::rowsRemoved(const QModelIndex &parent, int first, int last) + void emitter_QSortFilterProxyModel_rowsRemoved_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QSortFilterProxyModel::rowsRemoved(const QModelIndex &parent, int first, int last)'"); + } + // [adaptor impl] bool QSortFilterProxyModel::setData(const QModelIndex &index, const QVariant &value, int role) bool cbs_setData_5065_1(const QModelIndex &index, const QVariant &value, int role) { @@ -2006,6 +2157,12 @@ public: } } + // [emitter impl] void QSortFilterProxyModel::sourceModelChanged() + void emitter_QSortFilterProxyModel_sourceModelChanged_3914() + { + throw tl::Exception ("Can't emit private signal 'void QSortFilterProxyModel::sourceModelChanged()'"); + } + // [adaptor impl] QSize QSortFilterProxyModel::span(const QModelIndex &index) QSize cbs_span_c2395_0(const QModelIndex &index) const { @@ -2588,6 +2745,162 @@ static void _set_callback_cbs_columnCount_c2395_1 (void *cls, const gsi::Callbac } +// emitter void QSortFilterProxyModel::columnsAboutToBeInserted(const QModelIndex &parent, int first, int last) + +static void _init_emitter_columnsAboutToBeInserted_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_columnsAboutToBeInserted_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QSortFilterProxyModel_Adaptor *)cls)->emitter_QSortFilterProxyModel_columnsAboutToBeInserted_7372 (arg1, arg2, arg3); +} + + +// emitter void QSortFilterProxyModel::columnsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn) + +static void _init_emitter_columnsAboutToBeMoved_10318 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("sourceParent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("sourceStart"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("sourceEnd"); + decl->add_arg (argspec_2); + static gsi::ArgSpecBase argspec_3 ("destinationParent"); + decl->add_arg (argspec_3); + static gsi::ArgSpecBase argspec_4 ("destinationColumn"); + decl->add_arg (argspec_4); + decl->set_return (); +} + +static void _call_emitter_columnsAboutToBeMoved_10318 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + const QModelIndex &arg4 = gsi::arg_reader() (args, heap); + int arg5 = gsi::arg_reader() (args, heap); + ((QSortFilterProxyModel_Adaptor *)cls)->emitter_QSortFilterProxyModel_columnsAboutToBeMoved_10318 (arg1, arg2, arg3, arg4, arg5); +} + + +// emitter void QSortFilterProxyModel::columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last) + +static void _init_emitter_columnsAboutToBeRemoved_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_columnsAboutToBeRemoved_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QSortFilterProxyModel_Adaptor *)cls)->emitter_QSortFilterProxyModel_columnsAboutToBeRemoved_7372 (arg1, arg2, arg3); +} + + +// emitter void QSortFilterProxyModel::columnsInserted(const QModelIndex &parent, int first, int last) + +static void _init_emitter_columnsInserted_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_columnsInserted_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QSortFilterProxyModel_Adaptor *)cls)->emitter_QSortFilterProxyModel_columnsInserted_7372 (arg1, arg2, arg3); +} + + +// emitter void QSortFilterProxyModel::columnsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column) + +static void _init_emitter_columnsMoved_10318 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("start"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("end"); + decl->add_arg (argspec_2); + static gsi::ArgSpecBase argspec_3 ("destination"); + decl->add_arg (argspec_3); + static gsi::ArgSpecBase argspec_4 ("column"); + decl->add_arg (argspec_4); + decl->set_return (); +} + +static void _call_emitter_columnsMoved_10318 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + const QModelIndex &arg4 = gsi::arg_reader() (args, heap); + int arg5 = gsi::arg_reader() (args, heap); + ((QSortFilterProxyModel_Adaptor *)cls)->emitter_QSortFilterProxyModel_columnsMoved_10318 (arg1, arg2, arg3, arg4, arg5); +} + + +// emitter void QSortFilterProxyModel::columnsRemoved(const QModelIndex &parent, int first, int last) + +static void _init_emitter_columnsRemoved_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_columnsRemoved_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QSortFilterProxyModel_Adaptor *)cls)->emitter_QSortFilterProxyModel_columnsRemoved_7372 (arg1, arg2, arg3); +} + + // exposed QModelIndex QSortFilterProxyModel::createIndex(int row, int column, void *data) static void _init_fp_createIndex_c2374 (qt_gsi::GenericMethod *decl) @@ -3560,6 +3873,34 @@ static void _set_callback_cbs_mimeTypes_c0_0 (void *cls, const gsi::Callback &cb } +// emitter void QSortFilterProxyModel::modelAboutToBeReset() + +static void _init_emitter_modelAboutToBeReset_3767 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_emitter_modelAboutToBeReset_3767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + ((QSortFilterProxyModel_Adaptor *)cls)->emitter_QSortFilterProxyModel_modelAboutToBeReset_3767 (); +} + + +// emitter void QSortFilterProxyModel::modelReset() + +static void _init_emitter_modelReset_3767 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_emitter_modelReset_3767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + ((QSortFilterProxyModel_Adaptor *)cls)->emitter_QSortFilterProxyModel_modelReset_3767 (); +} + + // bool QSortFilterProxyModel::moveColumns(const QModelIndex &sourceParent, int sourceColumn, int count, const QModelIndex &destinationParent, int destinationChild) static void _init_cbs_moveColumns_6659_0 (qt_gsi::GenericMethod *decl) @@ -3630,6 +3971,24 @@ static void _set_callback_cbs_moveRows_6659_0 (void *cls, const gsi::Callback &c } +// emitter void QSortFilterProxyModel::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QSortFilterProxyModel_Adaptor *)cls)->emitter_QSortFilterProxyModel_objectNameChanged_4567 (arg1); +} + + // QModelIndex QSortFilterProxyModel::parent(const QModelIndex &child) static void _init_cbs_parent_c2395_0 (qt_gsi::GenericMethod *decl) @@ -3820,6 +4179,162 @@ static void _set_callback_cbs_rowCount_c2395_1 (void *cls, const gsi::Callback & } +// emitter void QSortFilterProxyModel::rowsAboutToBeInserted(const QModelIndex &parent, int first, int last) + +static void _init_emitter_rowsAboutToBeInserted_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_rowsAboutToBeInserted_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QSortFilterProxyModel_Adaptor *)cls)->emitter_QSortFilterProxyModel_rowsAboutToBeInserted_7372 (arg1, arg2, arg3); +} + + +// emitter void QSortFilterProxyModel::rowsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow) + +static void _init_emitter_rowsAboutToBeMoved_10318 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("sourceParent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("sourceStart"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("sourceEnd"); + decl->add_arg (argspec_2); + static gsi::ArgSpecBase argspec_3 ("destinationParent"); + decl->add_arg (argspec_3); + static gsi::ArgSpecBase argspec_4 ("destinationRow"); + decl->add_arg (argspec_4); + decl->set_return (); +} + +static void _call_emitter_rowsAboutToBeMoved_10318 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + const QModelIndex &arg4 = gsi::arg_reader() (args, heap); + int arg5 = gsi::arg_reader() (args, heap); + ((QSortFilterProxyModel_Adaptor *)cls)->emitter_QSortFilterProxyModel_rowsAboutToBeMoved_10318 (arg1, arg2, arg3, arg4, arg5); +} + + +// emitter void QSortFilterProxyModel::rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last) + +static void _init_emitter_rowsAboutToBeRemoved_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_rowsAboutToBeRemoved_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QSortFilterProxyModel_Adaptor *)cls)->emitter_QSortFilterProxyModel_rowsAboutToBeRemoved_7372 (arg1, arg2, arg3); +} + + +// emitter void QSortFilterProxyModel::rowsInserted(const QModelIndex &parent, int first, int last) + +static void _init_emitter_rowsInserted_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_rowsInserted_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QSortFilterProxyModel_Adaptor *)cls)->emitter_QSortFilterProxyModel_rowsInserted_7372 (arg1, arg2, arg3); +} + + +// emitter void QSortFilterProxyModel::rowsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row) + +static void _init_emitter_rowsMoved_10318 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("start"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("end"); + decl->add_arg (argspec_2); + static gsi::ArgSpecBase argspec_3 ("destination"); + decl->add_arg (argspec_3); + static gsi::ArgSpecBase argspec_4 ("row"); + decl->add_arg (argspec_4); + decl->set_return (); +} + +static void _call_emitter_rowsMoved_10318 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + const QModelIndex &arg4 = gsi::arg_reader() (args, heap); + int arg5 = gsi::arg_reader() (args, heap); + ((QSortFilterProxyModel_Adaptor *)cls)->emitter_QSortFilterProxyModel_rowsMoved_10318 (arg1, arg2, arg3, arg4, arg5); +} + + +// emitter void QSortFilterProxyModel::rowsRemoved(const QModelIndex &parent, int first, int last) + +static void _init_emitter_rowsRemoved_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_rowsRemoved_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QSortFilterProxyModel_Adaptor *)cls)->emitter_QSortFilterProxyModel_rowsRemoved_7372 (arg1, arg2, arg3); +} + + // exposed QObject *QSortFilterProxyModel::sender() static void _init_fp_sender_c0 (qt_gsi::GenericMethod *decl) @@ -4015,6 +4530,20 @@ static void _set_callback_cbs_sort_2340_1 (void *cls, const gsi::Callback &cb) } +// emitter void QSortFilterProxyModel::sourceModelChanged() + +static void _init_emitter_sourceModelChanged_3914 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_emitter_sourceModelChanged_3914 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + ((QSortFilterProxyModel_Adaptor *)cls)->emitter_QSortFilterProxyModel_sourceModelChanged_3914 (); +} + + // QSize QSortFilterProxyModel::span(const QModelIndex &index) static void _init_cbs_span_c2395_0 (qt_gsi::GenericMethod *decl) @@ -4146,6 +4675,12 @@ static gsi::Methods methods_QSortFilterProxyModel_Adaptor () { methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("columnCount", "@brief Virtual method int QSortFilterProxyModel::columnCount(const QModelIndex &parent)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_columnCount_c2395_1, &_call_cbs_columnCount_c2395_1); methods += new qt_gsi::GenericMethod ("columnCount", "@hide", true, &_init_cbs_columnCount_c2395_1, &_call_cbs_columnCount_c2395_1, &_set_callback_cbs_columnCount_c2395_1); + methods += new qt_gsi::GenericMethod ("emit_columnsAboutToBeInserted", "@brief Emitter for signal void QSortFilterProxyModel::columnsAboutToBeInserted(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_columnsAboutToBeInserted_7372, &_call_emitter_columnsAboutToBeInserted_7372); + methods += new qt_gsi::GenericMethod ("emit_columnsAboutToBeMoved", "@brief Emitter for signal void QSortFilterProxyModel::columnsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn)\nCall this method to emit this signal.", false, &_init_emitter_columnsAboutToBeMoved_10318, &_call_emitter_columnsAboutToBeMoved_10318); + methods += new qt_gsi::GenericMethod ("emit_columnsAboutToBeRemoved", "@brief Emitter for signal void QSortFilterProxyModel::columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_columnsAboutToBeRemoved_7372, &_call_emitter_columnsAboutToBeRemoved_7372); + methods += new qt_gsi::GenericMethod ("emit_columnsInserted", "@brief Emitter for signal void QSortFilterProxyModel::columnsInserted(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_columnsInserted_7372, &_call_emitter_columnsInserted_7372); + methods += new qt_gsi::GenericMethod ("emit_columnsMoved", "@brief Emitter for signal void QSortFilterProxyModel::columnsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column)\nCall this method to emit this signal.", false, &_init_emitter_columnsMoved_10318, &_call_emitter_columnsMoved_10318); + methods += new qt_gsi::GenericMethod ("emit_columnsRemoved", "@brief Emitter for signal void QSortFilterProxyModel::columnsRemoved(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_columnsRemoved_7372, &_call_emitter_columnsRemoved_7372); methods += new qt_gsi::GenericMethod ("*createIndex", "@brief Method QModelIndex QSortFilterProxyModel::createIndex(int row, int column, void *data)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_createIndex_c2374, &_call_fp_createIndex_c2374); methods += new qt_gsi::GenericMethod ("*createIndex", "@brief Method QModelIndex QSortFilterProxyModel::createIndex(int row, int column, quintptr id)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_createIndex_c2657, &_call_fp_createIndex_c2657); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QSortFilterProxyModel::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); @@ -4213,10 +4748,13 @@ static gsi::Methods methods_QSortFilterProxyModel_Adaptor () { methods += new qt_gsi::GenericMethod ("mimeData", "@hide", true, &_init_cbs_mimeData_c3010_0, &_call_cbs_mimeData_c3010_0, &_set_callback_cbs_mimeData_c3010_0); methods += new qt_gsi::GenericMethod ("mimeTypes", "@brief Virtual method QStringList QSortFilterProxyModel::mimeTypes()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_mimeTypes_c0_0, &_call_cbs_mimeTypes_c0_0); methods += new qt_gsi::GenericMethod ("mimeTypes", "@hide", true, &_init_cbs_mimeTypes_c0_0, &_call_cbs_mimeTypes_c0_0, &_set_callback_cbs_mimeTypes_c0_0); + methods += new qt_gsi::GenericMethod ("emit_modelAboutToBeReset", "@brief Emitter for signal void QSortFilterProxyModel::modelAboutToBeReset()\nCall this method to emit this signal.", false, &_init_emitter_modelAboutToBeReset_3767, &_call_emitter_modelAboutToBeReset_3767); + methods += new qt_gsi::GenericMethod ("emit_modelReset", "@brief Emitter for signal void QSortFilterProxyModel::modelReset()\nCall this method to emit this signal.", false, &_init_emitter_modelReset_3767, &_call_emitter_modelReset_3767); methods += new qt_gsi::GenericMethod ("moveColumns", "@brief Virtual method bool QSortFilterProxyModel::moveColumns(const QModelIndex &sourceParent, int sourceColumn, int count, const QModelIndex &destinationParent, int destinationChild)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_moveColumns_6659_0, &_call_cbs_moveColumns_6659_0); methods += new qt_gsi::GenericMethod ("moveColumns", "@hide", false, &_init_cbs_moveColumns_6659_0, &_call_cbs_moveColumns_6659_0, &_set_callback_cbs_moveColumns_6659_0); methods += new qt_gsi::GenericMethod ("moveRows", "@brief Virtual method bool QSortFilterProxyModel::moveRows(const QModelIndex &sourceParent, int sourceRow, int count, const QModelIndex &destinationParent, int destinationChild)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_moveRows_6659_0, &_call_cbs_moveRows_6659_0); methods += new qt_gsi::GenericMethod ("moveRows", "@hide", false, &_init_cbs_moveRows_6659_0, &_call_cbs_moveRows_6659_0, &_set_callback_cbs_moveRows_6659_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QSortFilterProxyModel::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("parent", "@brief Virtual method QModelIndex QSortFilterProxyModel::parent(const QModelIndex &child)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_parent_c2395_0, &_call_cbs_parent_c2395_0); methods += new qt_gsi::GenericMethod ("parent", "@hide", true, &_init_cbs_parent_c2395_0, &_call_cbs_parent_c2395_0, &_set_callback_cbs_parent_c2395_0); methods += new qt_gsi::GenericMethod ("*persistentIndexList", "@brief Method QList QSortFilterProxyModel::persistentIndexList()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_persistentIndexList_c0, &_call_fp_persistentIndexList_c0); @@ -4232,6 +4770,12 @@ static gsi::Methods methods_QSortFilterProxyModel_Adaptor () { methods += new qt_gsi::GenericMethod ("roleNames", "@hide", true, &_init_cbs_roleNames_c0_0, &_call_cbs_roleNames_c0_0, &_set_callback_cbs_roleNames_c0_0); methods += new qt_gsi::GenericMethod ("rowCount", "@brief Virtual method int QSortFilterProxyModel::rowCount(const QModelIndex &parent)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_rowCount_c2395_1, &_call_cbs_rowCount_c2395_1); methods += new qt_gsi::GenericMethod ("rowCount", "@hide", true, &_init_cbs_rowCount_c2395_1, &_call_cbs_rowCount_c2395_1, &_set_callback_cbs_rowCount_c2395_1); + methods += new qt_gsi::GenericMethod ("emit_rowsAboutToBeInserted", "@brief Emitter for signal void QSortFilterProxyModel::rowsAboutToBeInserted(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_rowsAboutToBeInserted_7372, &_call_emitter_rowsAboutToBeInserted_7372); + methods += new qt_gsi::GenericMethod ("emit_rowsAboutToBeMoved", "@brief Emitter for signal void QSortFilterProxyModel::rowsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow)\nCall this method to emit this signal.", false, &_init_emitter_rowsAboutToBeMoved_10318, &_call_emitter_rowsAboutToBeMoved_10318); + methods += new qt_gsi::GenericMethod ("emit_rowsAboutToBeRemoved", "@brief Emitter for signal void QSortFilterProxyModel::rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_rowsAboutToBeRemoved_7372, &_call_emitter_rowsAboutToBeRemoved_7372); + methods += new qt_gsi::GenericMethod ("emit_rowsInserted", "@brief Emitter for signal void QSortFilterProxyModel::rowsInserted(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_rowsInserted_7372, &_call_emitter_rowsInserted_7372); + methods += new qt_gsi::GenericMethod ("emit_rowsMoved", "@brief Emitter for signal void QSortFilterProxyModel::rowsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row)\nCall this method to emit this signal.", false, &_init_emitter_rowsMoved_10318, &_call_emitter_rowsMoved_10318); + methods += new qt_gsi::GenericMethod ("emit_rowsRemoved", "@brief Emitter for signal void QSortFilterProxyModel::rowsRemoved(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_rowsRemoved_7372, &_call_emitter_rowsRemoved_7372); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QSortFilterProxyModel::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QSortFilterProxyModel::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); methods += new qt_gsi::GenericMethod ("setData", "@brief Virtual method bool QSortFilterProxyModel::setData(const QModelIndex &index, const QVariant &value, int role)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_setData_5065_1, &_call_cbs_setData_5065_1); @@ -4246,6 +4790,7 @@ static gsi::Methods methods_QSortFilterProxyModel_Adaptor () { methods += new qt_gsi::GenericMethod ("sibling", "@hide", true, &_init_cbs_sibling_c3713_0, &_call_cbs_sibling_c3713_0, &_set_callback_cbs_sibling_c3713_0); methods += new qt_gsi::GenericMethod ("sort", "@brief Virtual method void QSortFilterProxyModel::sort(int column, Qt::SortOrder order)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_sort_2340_1, &_call_cbs_sort_2340_1); methods += new qt_gsi::GenericMethod ("sort", "@hide", false, &_init_cbs_sort_2340_1, &_call_cbs_sort_2340_1, &_set_callback_cbs_sort_2340_1); + methods += new qt_gsi::GenericMethod ("emit_sourceModelChanged", "@brief Emitter for signal void QSortFilterProxyModel::sourceModelChanged()\nCall this method to emit this signal.", false, &_init_emitter_sourceModelChanged_3914, &_call_emitter_sourceModelChanged_3914); methods += new qt_gsi::GenericMethod ("span", "@brief Virtual method QSize QSortFilterProxyModel::span(const QModelIndex &index)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_span_c2395_0, &_call_cbs_span_c2395_0); methods += new qt_gsi::GenericMethod ("span", "@hide", true, &_init_cbs_span_c2395_0, &_call_cbs_span_c2395_0, &_set_callback_cbs_span_c2395_0); methods += new qt_gsi::GenericMethod ("submit", "@brief Virtual method bool QSortFilterProxyModel::submit()\nThis method can be reimplemented in a derived class.", false, &_init_cbs_submit_0_0, &_call_cbs_submit_0_0); diff --git a/src/gsiqt/qt5/QtCore/gsiDeclQState.cc b/src/gsiqt/qt5/QtCore/gsiDeclQState.cc index 55f891b8a..272a60189 100644 --- a/src/gsiqt/qt5/QtCore/gsiDeclQState.cc +++ b/src/gsiqt/qt5/QtCore/gsiDeclQState.cc @@ -358,7 +358,15 @@ static gsi::Methods methods_QState () { methods += new qt_gsi::GenericMethod ("setInitialState|initialState=", "@brief Method void QState::setInitialState(QAbstractState *state)\n", false, &_init_f_setInitialState_2036, &_call_f_setInitialState_2036); methods += new qt_gsi::GenericMethod ("transitions", "@brief Method QList QState::transitions()\n", true, &_init_f_transitions_c0, &_call_f_transitions_c0); methods += gsi::qt_signal ("activeChanged(bool)", "activeChanged", gsi::arg("active"), "@brief Signal declaration for QState::activeChanged(bool active)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("childModeChanged()", "childModeChanged", "@brief Signal declaration for QState::childModeChanged()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QState::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("entered()", "entered", "@brief Signal declaration for QState::entered()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("errorStateChanged()", "errorStateChanged", "@brief Signal declaration for QState::errorStateChanged()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("exited()", "exited", "@brief Signal declaration for QState::exited()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("finished()", "finished", "@brief Signal declaration for QState::finished()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("initialStateChanged()", "initialStateChanged", "@brief Signal declaration for QState::initialStateChanged()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QState::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("propertiesAssigned()", "propertiesAssigned", "@brief Signal declaration for QState::propertiesAssigned()\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QState::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QState::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -431,12 +439,30 @@ public: emit QState::activeChanged(active); } + // [emitter impl] void QState::childModeChanged() + void emitter_QState_childModeChanged_2564() + { + throw tl::Exception ("Can't emit private signal 'void QState::childModeChanged()'"); + } + // [emitter impl] void QState::destroyed(QObject *) void emitter_QState_destroyed_1302(QObject *arg1) { emit QState::destroyed(arg1); } + // [emitter impl] void QState::entered() + void emitter_QState_entered_3384() + { + throw tl::Exception ("Can't emit private signal 'void QState::entered()'"); + } + + // [emitter impl] void QState::errorStateChanged() + void emitter_QState_errorStateChanged_2564() + { + throw tl::Exception ("Can't emit private signal 'void QState::errorStateChanged()'"); + } + // [adaptor impl] bool QState::eventFilter(QObject *, QEvent *) bool cbs_eventFilter_2411_0(QObject *arg1, QEvent *arg2) { @@ -452,6 +478,37 @@ public: } } + // [emitter impl] void QState::exited() + void emitter_QState_exited_3384() + { + throw tl::Exception ("Can't emit private signal 'void QState::exited()'"); + } + + // [emitter impl] void QState::finished() + void emitter_QState_finished_2564() + { + throw tl::Exception ("Can't emit private signal 'void QState::finished()'"); + } + + // [emitter impl] void QState::initialStateChanged() + void emitter_QState_initialStateChanged_2564() + { + throw tl::Exception ("Can't emit private signal 'void QState::initialStateChanged()'"); + } + + // [emitter impl] void QState::objectNameChanged(const QString &objectName) + void emitter_QState_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QState::objectNameChanged(const QString &objectName)'"); + } + + // [emitter impl] void QState::propertiesAssigned() + void emitter_QState_propertiesAssigned_2564() + { + throw tl::Exception ("Can't emit private signal 'void QState::propertiesAssigned()'"); + } + // [adaptor impl] void QState::childEvent(QChildEvent *) void cbs_childEvent_1701_0(QChildEvent *arg1) { @@ -650,6 +707,20 @@ static void _set_callback_cbs_childEvent_1701_0 (void *cls, const gsi::Callback } +// emitter void QState::childModeChanged() + +static void _init_emitter_childModeChanged_2564 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_emitter_childModeChanged_2564 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + ((QState_Adaptor *)cls)->emitter_QState_childModeChanged_2564 (); +} + + // void QState::customEvent(QEvent *) static void _init_cbs_customEvent_1217_0 (qt_gsi::GenericMethod *decl) @@ -716,6 +787,34 @@ static void _set_callback_cbs_disconnectNotify_2394_0 (void *cls, const gsi::Cal } +// emitter void QState::entered() + +static void _init_emitter_entered_3384 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_emitter_entered_3384 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + ((QState_Adaptor *)cls)->emitter_QState_entered_3384 (); +} + + +// emitter void QState::errorStateChanged() + +static void _init_emitter_errorStateChanged_2564 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_emitter_errorStateChanged_2564 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + ((QState_Adaptor *)cls)->emitter_QState_errorStateChanged_2564 (); +} + + // bool QState::event(QEvent *e) static void _init_cbs_event_1217_0 (qt_gsi::GenericMethod *decl) @@ -765,6 +864,48 @@ static void _set_callback_cbs_eventFilter_2411_0 (void *cls, const gsi::Callback } +// emitter void QState::exited() + +static void _init_emitter_exited_3384 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_emitter_exited_3384 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + ((QState_Adaptor *)cls)->emitter_QState_exited_3384 (); +} + + +// emitter void QState::finished() + +static void _init_emitter_finished_2564 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_emitter_finished_2564 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + ((QState_Adaptor *)cls)->emitter_QState_finished_2564 (); +} + + +// emitter void QState::initialStateChanged() + +static void _init_emitter_initialStateChanged_2564 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_emitter_initialStateChanged_2564 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + ((QState_Adaptor *)cls)->emitter_QState_initialStateChanged_2564 (); +} + + // exposed bool QState::isSignalConnected(const QMetaMethod &signal) static void _init_fp_isSignalConnected_c2394 (qt_gsi::GenericMethod *decl) @@ -783,6 +924,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QState::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QState_Adaptor *)cls)->emitter_QState_objectNameChanged_4567 (arg1); +} + + // void QState::onEntry(QEvent *event) static void _init_cbs_onEntry_1217_0 (qt_gsi::GenericMethod *decl) @@ -831,6 +990,20 @@ static void _set_callback_cbs_onExit_1217_0 (void *cls, const gsi::Callback &cb) } +// emitter void QState::propertiesAssigned() + +static void _init_emitter_propertiesAssigned_2564 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_emitter_propertiesAssigned_2564 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + ((QState_Adaptor *)cls)->emitter_QState_propertiesAssigned_2564 (); +} + + // exposed int QState::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -913,20 +1086,28 @@ static gsi::Methods methods_QState_Adaptor () { methods += new qt_gsi::GenericMethod ("emit_activeChanged", "@brief Emitter for signal void QState::activeChanged(bool active)\nCall this method to emit this signal.", false, &_init_emitter_activeChanged_864, &_call_emitter_activeChanged_864); methods += new qt_gsi::GenericMethod ("*childEvent", "@brief Virtual method void QState::childEvent(QChildEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); + methods += new qt_gsi::GenericMethod ("emit_childModeChanged", "@brief Emitter for signal void QState::childModeChanged()\nCall this method to emit this signal.", false, &_init_emitter_childModeChanged_2564, &_call_emitter_childModeChanged_2564); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QState::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QState::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QState::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); + methods += new qt_gsi::GenericMethod ("emit_entered", "@brief Emitter for signal void QState::entered()\nCall this method to emit this signal.", false, &_init_emitter_entered_3384, &_call_emitter_entered_3384); + methods += new qt_gsi::GenericMethod ("emit_errorStateChanged", "@brief Emitter for signal void QState::errorStateChanged()\nCall this method to emit this signal.", false, &_init_emitter_errorStateChanged_2564, &_call_emitter_errorStateChanged_2564); methods += new qt_gsi::GenericMethod ("*event", "@brief Virtual method bool QState::event(QEvent *e)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0); methods += new qt_gsi::GenericMethod ("*event", "@hide", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0, &_set_callback_cbs_event_1217_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QState::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); + methods += new qt_gsi::GenericMethod ("emit_exited", "@brief Emitter for signal void QState::exited()\nCall this method to emit this signal.", false, &_init_emitter_exited_3384, &_call_emitter_exited_3384); + methods += new qt_gsi::GenericMethod ("emit_finished", "@brief Emitter for signal void QState::finished()\nCall this method to emit this signal.", false, &_init_emitter_finished_2564, &_call_emitter_finished_2564); + methods += new qt_gsi::GenericMethod ("emit_initialStateChanged", "@brief Emitter for signal void QState::initialStateChanged()\nCall this method to emit this signal.", false, &_init_emitter_initialStateChanged_2564, &_call_emitter_initialStateChanged_2564); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QState::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QState::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*onEntry", "@brief Virtual method void QState::onEntry(QEvent *event)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_onEntry_1217_0, &_call_cbs_onEntry_1217_0); methods += new qt_gsi::GenericMethod ("*onEntry", "@hide", false, &_init_cbs_onEntry_1217_0, &_call_cbs_onEntry_1217_0, &_set_callback_cbs_onEntry_1217_0); methods += new qt_gsi::GenericMethod ("*onExit", "@brief Virtual method void QState::onExit(QEvent *event)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_onExit_1217_0, &_call_cbs_onExit_1217_0); methods += new qt_gsi::GenericMethod ("*onExit", "@hide", false, &_init_cbs_onExit_1217_0, &_call_cbs_onExit_1217_0, &_set_callback_cbs_onExit_1217_0); + methods += new qt_gsi::GenericMethod ("emit_propertiesAssigned", "@brief Emitter for signal void QState::propertiesAssigned()\nCall this method to emit this signal.", false, &_init_emitter_propertiesAssigned_2564, &_call_emitter_propertiesAssigned_2564); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QState::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QState::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QState::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); diff --git a/src/gsiqt/qt5/QtCore/gsiDeclQStateMachine.cc b/src/gsiqt/qt5/QtCore/gsiDeclQStateMachine.cc index ab8ced4df..f7321b020 100644 --- a/src/gsiqt/qt5/QtCore/gsiDeclQStateMachine.cc +++ b/src/gsiqt/qt5/QtCore/gsiDeclQStateMachine.cc @@ -517,8 +517,18 @@ static gsi::Methods methods_QStateMachine () { methods += new qt_gsi::GenericMethod ("start", "@brief Method void QStateMachine::start()\n", false, &_init_f_start_0, &_call_f_start_0); methods += new qt_gsi::GenericMethod ("stop", "@brief Method void QStateMachine::stop()\n", false, &_init_f_stop_0, &_call_f_stop_0); methods += gsi::qt_signal ("activeChanged(bool)", "activeChanged", gsi::arg("active"), "@brief Signal declaration for QStateMachine::activeChanged(bool active)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("childModeChanged()", "childModeChanged", "@brief Signal declaration for QStateMachine::childModeChanged()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QStateMachine::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("entered()", "entered", "@brief Signal declaration for QStateMachine::entered()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("errorStateChanged()", "errorStateChanged", "@brief Signal declaration for QStateMachine::errorStateChanged()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("exited()", "exited", "@brief Signal declaration for QStateMachine::exited()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("finished()", "finished", "@brief Signal declaration for QStateMachine::finished()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("initialStateChanged()", "initialStateChanged", "@brief Signal declaration for QStateMachine::initialStateChanged()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QStateMachine::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("propertiesAssigned()", "propertiesAssigned", "@brief Signal declaration for QStateMachine::propertiesAssigned()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("runningChanged(bool)", "runningChanged", gsi::arg("running"), "@brief Signal declaration for QStateMachine::runningChanged(bool running)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("started()", "started", "@brief Signal declaration for QStateMachine::started()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("stopped()", "stopped", "@brief Signal declaration for QStateMachine::stopped()\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QStateMachine::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QStateMachine::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -591,12 +601,30 @@ public: emit QStateMachine::activeChanged(active); } + // [emitter impl] void QStateMachine::childModeChanged() + void emitter_QStateMachine_childModeChanged_2564() + { + throw tl::Exception ("Can't emit private signal 'void QStateMachine::childModeChanged()'"); + } + // [emitter impl] void QStateMachine::destroyed(QObject *) void emitter_QStateMachine_destroyed_1302(QObject *arg1) { emit QStateMachine::destroyed(arg1); } + // [emitter impl] void QStateMachine::entered() + void emitter_QStateMachine_entered_3384() + { + throw tl::Exception ("Can't emit private signal 'void QStateMachine::entered()'"); + } + + // [emitter impl] void QStateMachine::errorStateChanged() + void emitter_QStateMachine_errorStateChanged_2564() + { + throw tl::Exception ("Can't emit private signal 'void QStateMachine::errorStateChanged()'"); + } + // [adaptor impl] bool QStateMachine::eventFilter(QObject *watched, QEvent *event) bool cbs_eventFilter_2411_0(QObject *watched, QEvent *event) { @@ -612,12 +640,55 @@ public: } } + // [emitter impl] void QStateMachine::exited() + void emitter_QStateMachine_exited_3384() + { + throw tl::Exception ("Can't emit private signal 'void QStateMachine::exited()'"); + } + + // [emitter impl] void QStateMachine::finished() + void emitter_QStateMachine_finished_2564() + { + throw tl::Exception ("Can't emit private signal 'void QStateMachine::finished()'"); + } + + // [emitter impl] void QStateMachine::initialStateChanged() + void emitter_QStateMachine_initialStateChanged_2564() + { + throw tl::Exception ("Can't emit private signal 'void QStateMachine::initialStateChanged()'"); + } + + // [emitter impl] void QStateMachine::objectNameChanged(const QString &objectName) + void emitter_QStateMachine_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QStateMachine::objectNameChanged(const QString &objectName)'"); + } + + // [emitter impl] void QStateMachine::propertiesAssigned() + void emitter_QStateMachine_propertiesAssigned_2564() + { + throw tl::Exception ("Can't emit private signal 'void QStateMachine::propertiesAssigned()'"); + } + // [emitter impl] void QStateMachine::runningChanged(bool running) void emitter_QStateMachine_runningChanged_864(bool running) { emit QStateMachine::runningChanged(running); } + // [emitter impl] void QStateMachine::started() + void emitter_QStateMachine_started_3257() + { + throw tl::Exception ("Can't emit private signal 'void QStateMachine::started()'"); + } + + // [emitter impl] void QStateMachine::stopped() + void emitter_QStateMachine_stopped_3257() + { + throw tl::Exception ("Can't emit private signal 'void QStateMachine::stopped()'"); + } + // [adaptor impl] void QStateMachine::beginMicrostep(QEvent *event) void cbs_beginMicrostep_1217_0(QEvent *event) { @@ -928,6 +999,20 @@ static void _set_callback_cbs_childEvent_1701_0 (void *cls, const gsi::Callback } +// emitter void QStateMachine::childModeChanged() + +static void _init_emitter_childModeChanged_2564 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_emitter_childModeChanged_2564 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + ((QStateMachine_Adaptor *)cls)->emitter_QStateMachine_childModeChanged_2564 (); +} + + // void QStateMachine::customEvent(QEvent *) static void _init_cbs_customEvent_1217_0 (qt_gsi::GenericMethod *decl) @@ -1042,6 +1127,34 @@ static void _set_callback_cbs_endSelectTransitions_1217_0 (void *cls, const gsi: } +// emitter void QStateMachine::entered() + +static void _init_emitter_entered_3384 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_emitter_entered_3384 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + ((QStateMachine_Adaptor *)cls)->emitter_QStateMachine_entered_3384 (); +} + + +// emitter void QStateMachine::errorStateChanged() + +static void _init_emitter_errorStateChanged_2564 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_emitter_errorStateChanged_2564 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + ((QStateMachine_Adaptor *)cls)->emitter_QStateMachine_errorStateChanged_2564 (); +} + + // bool QStateMachine::event(QEvent *e) static void _init_cbs_event_1217_0 (qt_gsi::GenericMethod *decl) @@ -1091,6 +1204,48 @@ static void _set_callback_cbs_eventFilter_2411_0 (void *cls, const gsi::Callback } +// emitter void QStateMachine::exited() + +static void _init_emitter_exited_3384 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_emitter_exited_3384 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + ((QStateMachine_Adaptor *)cls)->emitter_QStateMachine_exited_3384 (); +} + + +// emitter void QStateMachine::finished() + +static void _init_emitter_finished_2564 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_emitter_finished_2564 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + ((QStateMachine_Adaptor *)cls)->emitter_QStateMachine_finished_2564 (); +} + + +// emitter void QStateMachine::initialStateChanged() + +static void _init_emitter_initialStateChanged_2564 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_emitter_initialStateChanged_2564 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + ((QStateMachine_Adaptor *)cls)->emitter_QStateMachine_initialStateChanged_2564 (); +} + + // exposed bool QStateMachine::isSignalConnected(const QMetaMethod &signal) static void _init_fp_isSignalConnected_c2394 (qt_gsi::GenericMethod *decl) @@ -1109,6 +1264,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QStateMachine::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QStateMachine_Adaptor *)cls)->emitter_QStateMachine_objectNameChanged_4567 (arg1); +} + + // void QStateMachine::onEntry(QEvent *event) static void _init_cbs_onEntry_1217_0 (qt_gsi::GenericMethod *decl) @@ -1157,6 +1330,20 @@ static void _set_callback_cbs_onExit_1217_0 (void *cls, const gsi::Callback &cb) } +// emitter void QStateMachine::propertiesAssigned() + +static void _init_emitter_propertiesAssigned_2564 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_emitter_propertiesAssigned_2564 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + ((QStateMachine_Adaptor *)cls)->emitter_QStateMachine_propertiesAssigned_2564 (); +} + + // exposed int QStateMachine::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -1221,6 +1408,34 @@ static void _call_fp_senderSignalIndex_c0 (const qt_gsi::GenericMethod * /*decl* } +// emitter void QStateMachine::started() + +static void _init_emitter_started_3257 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_emitter_started_3257 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + ((QStateMachine_Adaptor *)cls)->emitter_QStateMachine_started_3257 (); +} + + +// emitter void QStateMachine::stopped() + +static void _init_emitter_stopped_3257 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_emitter_stopped_3257 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + ((QStateMachine_Adaptor *)cls)->emitter_QStateMachine_stopped_3257 (); +} + + // void QStateMachine::timerEvent(QTimerEvent *) static void _init_cbs_timerEvent_1730_0 (qt_gsi::GenericMethod *decl) @@ -1261,6 +1476,7 @@ static gsi::Methods methods_QStateMachine_Adaptor () { methods += new qt_gsi::GenericMethod ("*beginSelectTransitions", "@hide", false, &_init_cbs_beginSelectTransitions_1217_0, &_call_cbs_beginSelectTransitions_1217_0, &_set_callback_cbs_beginSelectTransitions_1217_0); methods += new qt_gsi::GenericMethod ("*childEvent", "@brief Virtual method void QStateMachine::childEvent(QChildEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); + methods += new qt_gsi::GenericMethod ("emit_childModeChanged", "@brief Emitter for signal void QStateMachine::childModeChanged()\nCall this method to emit this signal.", false, &_init_emitter_childModeChanged_2564, &_call_emitter_childModeChanged_2564); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QStateMachine::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QStateMachine::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); @@ -1270,19 +1486,28 @@ static gsi::Methods methods_QStateMachine_Adaptor () { methods += new qt_gsi::GenericMethod ("*endMicrostep", "@hide", false, &_init_cbs_endMicrostep_1217_0, &_call_cbs_endMicrostep_1217_0, &_set_callback_cbs_endMicrostep_1217_0); methods += new qt_gsi::GenericMethod ("*endSelectTransitions", "@brief Virtual method void QStateMachine::endSelectTransitions(QEvent *event)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_endSelectTransitions_1217_0, &_call_cbs_endSelectTransitions_1217_0); methods += new qt_gsi::GenericMethod ("*endSelectTransitions", "@hide", false, &_init_cbs_endSelectTransitions_1217_0, &_call_cbs_endSelectTransitions_1217_0, &_set_callback_cbs_endSelectTransitions_1217_0); + methods += new qt_gsi::GenericMethod ("emit_entered", "@brief Emitter for signal void QStateMachine::entered()\nCall this method to emit this signal.", false, &_init_emitter_entered_3384, &_call_emitter_entered_3384); + methods += new qt_gsi::GenericMethod ("emit_errorStateChanged", "@brief Emitter for signal void QStateMachine::errorStateChanged()\nCall this method to emit this signal.", false, &_init_emitter_errorStateChanged_2564, &_call_emitter_errorStateChanged_2564); methods += new qt_gsi::GenericMethod ("*event", "@brief Virtual method bool QStateMachine::event(QEvent *e)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0); methods += new qt_gsi::GenericMethod ("*event", "@hide", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0, &_set_callback_cbs_event_1217_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QStateMachine::eventFilter(QObject *watched, QEvent *event)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); + methods += new qt_gsi::GenericMethod ("emit_exited", "@brief Emitter for signal void QStateMachine::exited()\nCall this method to emit this signal.", false, &_init_emitter_exited_3384, &_call_emitter_exited_3384); + methods += new qt_gsi::GenericMethod ("emit_finished", "@brief Emitter for signal void QStateMachine::finished()\nCall this method to emit this signal.", false, &_init_emitter_finished_2564, &_call_emitter_finished_2564); + methods += new qt_gsi::GenericMethod ("emit_initialStateChanged", "@brief Emitter for signal void QStateMachine::initialStateChanged()\nCall this method to emit this signal.", false, &_init_emitter_initialStateChanged_2564, &_call_emitter_initialStateChanged_2564); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QStateMachine::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QStateMachine::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*onEntry", "@brief Virtual method void QStateMachine::onEntry(QEvent *event)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_onEntry_1217_0, &_call_cbs_onEntry_1217_0); methods += new qt_gsi::GenericMethod ("*onEntry", "@hide", false, &_init_cbs_onEntry_1217_0, &_call_cbs_onEntry_1217_0, &_set_callback_cbs_onEntry_1217_0); methods += new qt_gsi::GenericMethod ("*onExit", "@brief Virtual method void QStateMachine::onExit(QEvent *event)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_onExit_1217_0, &_call_cbs_onExit_1217_0); methods += new qt_gsi::GenericMethod ("*onExit", "@hide", false, &_init_cbs_onExit_1217_0, &_call_cbs_onExit_1217_0, &_set_callback_cbs_onExit_1217_0); + methods += new qt_gsi::GenericMethod ("emit_propertiesAssigned", "@brief Emitter for signal void QStateMachine::propertiesAssigned()\nCall this method to emit this signal.", false, &_init_emitter_propertiesAssigned_2564, &_call_emitter_propertiesAssigned_2564); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QStateMachine::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("emit_runningChanged", "@brief Emitter for signal void QStateMachine::runningChanged(bool running)\nCall this method to emit this signal.", false, &_init_emitter_runningChanged_864, &_call_emitter_runningChanged_864); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QStateMachine::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QStateMachine::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); + methods += new qt_gsi::GenericMethod ("emit_started", "@brief Emitter for signal void QStateMachine::started()\nCall this method to emit this signal.", false, &_init_emitter_started_3257, &_call_emitter_started_3257); + methods += new qt_gsi::GenericMethod ("emit_stopped", "@brief Emitter for signal void QStateMachine::stopped()\nCall this method to emit this signal.", false, &_init_emitter_stopped_3257, &_call_emitter_stopped_3257); methods += new qt_gsi::GenericMethod ("*timerEvent", "@brief Virtual method void QStateMachine::timerEvent(QTimerEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_timerEvent_1730_0, &_call_cbs_timerEvent_1730_0); methods += new qt_gsi::GenericMethod ("*timerEvent", "@hide", false, &_init_cbs_timerEvent_1730_0, &_call_cbs_timerEvent_1730_0, &_set_callback_cbs_timerEvent_1730_0); return methods; diff --git a/src/gsiqt/qt5/QtCore/gsiDeclQStringListModel.cc b/src/gsiqt/qt5/QtCore/gsiDeclQStringListModel.cc index 188bcb518..943a6a202 100644 --- a/src/gsiqt/qt5/QtCore/gsiDeclQStringListModel.cc +++ b/src/gsiqt/qt5/QtCore/gsiDeclQStringListModel.cc @@ -360,11 +360,26 @@ static gsi::Methods methods_QStringListModel () { methods += new qt_gsi::GenericMethod ("sort", "@brief Method void QStringListModel::sort(int column, Qt::SortOrder order)\nThis is a reimplementation of QAbstractItemModel::sort", false, &_init_f_sort_2340, &_call_f_sort_2340); methods += new qt_gsi::GenericMethod (":stringList", "@brief Method QStringList QStringListModel::stringList()\n", true, &_init_f_stringList_c0, &_call_f_stringList_c0); methods += new qt_gsi::GenericMethod ("supportedDropActions", "@brief Method QFlags QStringListModel::supportedDropActions()\nThis is a reimplementation of QAbstractItemModel::supportedDropActions", true, &_init_f_supportedDropActions_c0, &_call_f_supportedDropActions_c0); + methods += gsi::qt_signal ("columnsAboutToBeInserted(const QModelIndex &, int, int)", "columnsAboutToBeInserted", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QStringListModel::columnsAboutToBeInserted(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("columnsAboutToBeMoved(const QModelIndex &, int, int, const QModelIndex &, int)", "columnsAboutToBeMoved", gsi::arg("sourceParent"), gsi::arg("sourceStart"), gsi::arg("sourceEnd"), gsi::arg("destinationParent"), gsi::arg("destinationColumn"), "@brief Signal declaration for QStringListModel::columnsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("columnsAboutToBeRemoved(const QModelIndex &, int, int)", "columnsAboutToBeRemoved", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QStringListModel::columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("columnsInserted(const QModelIndex &, int, int)", "columnsInserted", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QStringListModel::columnsInserted(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("columnsMoved(const QModelIndex &, int, int, const QModelIndex &, int)", "columnsMoved", gsi::arg("parent"), gsi::arg("start"), gsi::arg("end"), gsi::arg("destination"), gsi::arg("column"), "@brief Signal declaration for QStringListModel::columnsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("columnsRemoved(const QModelIndex &, int, int)", "columnsRemoved", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QStringListModel::columnsRemoved(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal & > ("dataChanged(const QModelIndex &, const QModelIndex &, const QVector &)", "dataChanged", gsi::arg("topLeft"), gsi::arg("bottomRight"), gsi::arg("roles"), "@brief Signal declaration for QStringListModel::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector &roles)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QStringListModel::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal::target_type &, int, int > ("headerDataChanged(Qt::Orientation, int, int)", "headerDataChanged", gsi::arg("orientation"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QStringListModel::headerDataChanged(Qt::Orientation orientation, int first, int last)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal &, const qt_gsi::Converter::target_type & > ("layoutAboutToBeChanged(const QList &, QAbstractItemModel::LayoutChangeHint)", "layoutAboutToBeChanged", gsi::arg("parents"), gsi::arg("hint"), "@brief Signal declaration for QStringListModel::layoutAboutToBeChanged(const QList &parents, QAbstractItemModel::LayoutChangeHint hint)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal &, const qt_gsi::Converter::target_type & > ("layoutChanged(const QList &, QAbstractItemModel::LayoutChangeHint)", "layoutChanged", gsi::arg("parents"), gsi::arg("hint"), "@brief Signal declaration for QStringListModel::layoutChanged(const QList &parents, QAbstractItemModel::LayoutChangeHint hint)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("modelAboutToBeReset()", "modelAboutToBeReset", "@brief Signal declaration for QStringListModel::modelAboutToBeReset()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("modelReset()", "modelReset", "@brief Signal declaration for QStringListModel::modelReset()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QStringListModel::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsAboutToBeInserted(const QModelIndex &, int, int)", "rowsAboutToBeInserted", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QStringListModel::rowsAboutToBeInserted(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsAboutToBeMoved(const QModelIndex &, int, int, const QModelIndex &, int)", "rowsAboutToBeMoved", gsi::arg("sourceParent"), gsi::arg("sourceStart"), gsi::arg("sourceEnd"), gsi::arg("destinationParent"), gsi::arg("destinationRow"), "@brief Signal declaration for QStringListModel::rowsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsAboutToBeRemoved(const QModelIndex &, int, int)", "rowsAboutToBeRemoved", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QStringListModel::rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsInserted(const QModelIndex &, int, int)", "rowsInserted", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QStringListModel::rowsInserted(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsMoved(const QModelIndex &, int, int, const QModelIndex &, int)", "rowsMoved", gsi::arg("parent"), gsi::arg("start"), gsi::arg("end"), gsi::arg("destination"), gsi::arg("row"), "@brief Signal declaration for QStringListModel::rowsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsRemoved(const QModelIndex &, int, int)", "rowsRemoved", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QStringListModel::rowsRemoved(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QStringListModel::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QStringListModel::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -586,6 +601,64 @@ public: } } + // [emitter impl] void QStringListModel::columnsAboutToBeInserted(const QModelIndex &parent, int first, int last) + void emitter_QStringListModel_columnsAboutToBeInserted_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QStringListModel::columnsAboutToBeInserted(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QStringListModel::columnsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn) + void emitter_QStringListModel_columnsAboutToBeMoved_10318(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn) + { + __SUPPRESS_UNUSED_WARNING (sourceParent); + __SUPPRESS_UNUSED_WARNING (sourceStart); + __SUPPRESS_UNUSED_WARNING (sourceEnd); + __SUPPRESS_UNUSED_WARNING (destinationParent); + __SUPPRESS_UNUSED_WARNING (destinationColumn); + throw tl::Exception ("Can't emit private signal 'void QStringListModel::columnsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn)'"); + } + + // [emitter impl] void QStringListModel::columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last) + void emitter_QStringListModel_columnsAboutToBeRemoved_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QStringListModel::columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QStringListModel::columnsInserted(const QModelIndex &parent, int first, int last) + void emitter_QStringListModel_columnsInserted_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QStringListModel::columnsInserted(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QStringListModel::columnsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column) + void emitter_QStringListModel_columnsMoved_10318(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (start); + __SUPPRESS_UNUSED_WARNING (end); + __SUPPRESS_UNUSED_WARNING (destination); + __SUPPRESS_UNUSED_WARNING (column); + throw tl::Exception ("Can't emit private signal 'void QStringListModel::columnsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column)'"); + } + + // [emitter impl] void QStringListModel::columnsRemoved(const QModelIndex &parent, int first, int last) + void emitter_QStringListModel_columnsRemoved_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QStringListModel::columnsRemoved(const QModelIndex &parent, int first, int last)'"); + } + // [adaptor impl] QVariant QStringListModel::data(const QModelIndex &index, int role) QVariant cbs_data_c3054_0(const QModelIndex &index, int role) const { @@ -826,6 +899,18 @@ public: } } + // [emitter impl] void QStringListModel::modelAboutToBeReset() + void emitter_QStringListModel_modelAboutToBeReset_3767() + { + throw tl::Exception ("Can't emit private signal 'void QStringListModel::modelAboutToBeReset()'"); + } + + // [emitter impl] void QStringListModel::modelReset() + void emitter_QStringListModel_modelReset_3767() + { + throw tl::Exception ("Can't emit private signal 'void QStringListModel::modelReset()'"); + } + // [adaptor impl] bool QStringListModel::moveColumns(const QModelIndex &sourceParent, int sourceColumn, int count, const QModelIndex &destinationParent, int destinationChild) bool cbs_moveColumns_6659_0(const QModelIndex &sourceParent, int sourceColumn, int count, const QModelIndex &destinationParent, int destinationChild) { @@ -856,6 +941,13 @@ public: } } + // [emitter impl] void QStringListModel::objectNameChanged(const QString &objectName) + void emitter_QStringListModel_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QStringListModel::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] bool QStringListModel::removeColumns(int column, int count, const QModelIndex &parent) bool cbs_removeColumns_3713_1(int column, int count, const QModelIndex &parent) { @@ -931,6 +1023,64 @@ public: } } + // [emitter impl] void QStringListModel::rowsAboutToBeInserted(const QModelIndex &parent, int first, int last) + void emitter_QStringListModel_rowsAboutToBeInserted_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QStringListModel::rowsAboutToBeInserted(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QStringListModel::rowsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow) + void emitter_QStringListModel_rowsAboutToBeMoved_10318(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow) + { + __SUPPRESS_UNUSED_WARNING (sourceParent); + __SUPPRESS_UNUSED_WARNING (sourceStart); + __SUPPRESS_UNUSED_WARNING (sourceEnd); + __SUPPRESS_UNUSED_WARNING (destinationParent); + __SUPPRESS_UNUSED_WARNING (destinationRow); + throw tl::Exception ("Can't emit private signal 'void QStringListModel::rowsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow)'"); + } + + // [emitter impl] void QStringListModel::rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last) + void emitter_QStringListModel_rowsAboutToBeRemoved_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QStringListModel::rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QStringListModel::rowsInserted(const QModelIndex &parent, int first, int last) + void emitter_QStringListModel_rowsInserted_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QStringListModel::rowsInserted(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QStringListModel::rowsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row) + void emitter_QStringListModel_rowsMoved_10318(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (start); + __SUPPRESS_UNUSED_WARNING (end); + __SUPPRESS_UNUSED_WARNING (destination); + __SUPPRESS_UNUSED_WARNING (row); + throw tl::Exception ("Can't emit private signal 'void QStringListModel::rowsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row)'"); + } + + // [emitter impl] void QStringListModel::rowsRemoved(const QModelIndex &parent, int first, int last) + void emitter_QStringListModel_rowsRemoved_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QStringListModel::rowsRemoved(const QModelIndex &parent, int first, int last)'"); + } + // [adaptor impl] bool QStringListModel::setData(const QModelIndex &index, const QVariant &value, int role) bool cbs_setData_5065_1(const QModelIndex &index, const QVariant &value, int role) { @@ -1530,6 +1680,162 @@ static void _set_callback_cbs_childEvent_1701_0 (void *cls, const gsi::Callback } +// emitter void QStringListModel::columnsAboutToBeInserted(const QModelIndex &parent, int first, int last) + +static void _init_emitter_columnsAboutToBeInserted_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_columnsAboutToBeInserted_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QStringListModel_Adaptor *)cls)->emitter_QStringListModel_columnsAboutToBeInserted_7372 (arg1, arg2, arg3); +} + + +// emitter void QStringListModel::columnsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn) + +static void _init_emitter_columnsAboutToBeMoved_10318 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("sourceParent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("sourceStart"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("sourceEnd"); + decl->add_arg (argspec_2); + static gsi::ArgSpecBase argspec_3 ("destinationParent"); + decl->add_arg (argspec_3); + static gsi::ArgSpecBase argspec_4 ("destinationColumn"); + decl->add_arg (argspec_4); + decl->set_return (); +} + +static void _call_emitter_columnsAboutToBeMoved_10318 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + const QModelIndex &arg4 = gsi::arg_reader() (args, heap); + int arg5 = gsi::arg_reader() (args, heap); + ((QStringListModel_Adaptor *)cls)->emitter_QStringListModel_columnsAboutToBeMoved_10318 (arg1, arg2, arg3, arg4, arg5); +} + + +// emitter void QStringListModel::columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last) + +static void _init_emitter_columnsAboutToBeRemoved_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_columnsAboutToBeRemoved_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QStringListModel_Adaptor *)cls)->emitter_QStringListModel_columnsAboutToBeRemoved_7372 (arg1, arg2, arg3); +} + + +// emitter void QStringListModel::columnsInserted(const QModelIndex &parent, int first, int last) + +static void _init_emitter_columnsInserted_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_columnsInserted_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QStringListModel_Adaptor *)cls)->emitter_QStringListModel_columnsInserted_7372 (arg1, arg2, arg3); +} + + +// emitter void QStringListModel::columnsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column) + +static void _init_emitter_columnsMoved_10318 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("start"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("end"); + decl->add_arg (argspec_2); + static gsi::ArgSpecBase argspec_3 ("destination"); + decl->add_arg (argspec_3); + static gsi::ArgSpecBase argspec_4 ("column"); + decl->add_arg (argspec_4); + decl->set_return (); +} + +static void _call_emitter_columnsMoved_10318 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + const QModelIndex &arg4 = gsi::arg_reader() (args, heap); + int arg5 = gsi::arg_reader() (args, heap); + ((QStringListModel_Adaptor *)cls)->emitter_QStringListModel_columnsMoved_10318 (arg1, arg2, arg3, arg4, arg5); +} + + +// emitter void QStringListModel::columnsRemoved(const QModelIndex &parent, int first, int last) + +static void _init_emitter_columnsRemoved_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_columnsRemoved_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QStringListModel_Adaptor *)cls)->emitter_QStringListModel_columnsRemoved_7372 (arg1, arg2, arg3); +} + + // exposed QModelIndex QStringListModel::createIndex(int row, int column, void *data) static void _init_fp_createIndex_c2374 (qt_gsi::GenericMethod *decl) @@ -2279,6 +2585,34 @@ static void _set_callback_cbs_mimeTypes_c0_0 (void *cls, const gsi::Callback &cb } +// emitter void QStringListModel::modelAboutToBeReset() + +static void _init_emitter_modelAboutToBeReset_3767 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_emitter_modelAboutToBeReset_3767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + ((QStringListModel_Adaptor *)cls)->emitter_QStringListModel_modelAboutToBeReset_3767 (); +} + + +// emitter void QStringListModel::modelReset() + +static void _init_emitter_modelReset_3767 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_emitter_modelReset_3767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + ((QStringListModel_Adaptor *)cls)->emitter_QStringListModel_modelReset_3767 (); +} + + // bool QStringListModel::moveColumns(const QModelIndex &sourceParent, int sourceColumn, int count, const QModelIndex &destinationParent, int destinationChild) static void _init_cbs_moveColumns_6659_0 (qt_gsi::GenericMethod *decl) @@ -2349,6 +2683,24 @@ static void _set_callback_cbs_moveRows_6659_0 (void *cls, const gsi::Callback &c } +// emitter void QStringListModel::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QStringListModel_Adaptor *)cls)->emitter_QStringListModel_objectNameChanged_4567 (arg1); +} + + // exposed QList QStringListModel::persistentIndexList() static void _init_fp_persistentIndexList_c0 (qt_gsi::GenericMethod *decl) @@ -2516,6 +2868,162 @@ static void _set_callback_cbs_rowCount_c2395_1 (void *cls, const gsi::Callback & } +// emitter void QStringListModel::rowsAboutToBeInserted(const QModelIndex &parent, int first, int last) + +static void _init_emitter_rowsAboutToBeInserted_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_rowsAboutToBeInserted_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QStringListModel_Adaptor *)cls)->emitter_QStringListModel_rowsAboutToBeInserted_7372 (arg1, arg2, arg3); +} + + +// emitter void QStringListModel::rowsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow) + +static void _init_emitter_rowsAboutToBeMoved_10318 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("sourceParent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("sourceStart"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("sourceEnd"); + decl->add_arg (argspec_2); + static gsi::ArgSpecBase argspec_3 ("destinationParent"); + decl->add_arg (argspec_3); + static gsi::ArgSpecBase argspec_4 ("destinationRow"); + decl->add_arg (argspec_4); + decl->set_return (); +} + +static void _call_emitter_rowsAboutToBeMoved_10318 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + const QModelIndex &arg4 = gsi::arg_reader() (args, heap); + int arg5 = gsi::arg_reader() (args, heap); + ((QStringListModel_Adaptor *)cls)->emitter_QStringListModel_rowsAboutToBeMoved_10318 (arg1, arg2, arg3, arg4, arg5); +} + + +// emitter void QStringListModel::rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last) + +static void _init_emitter_rowsAboutToBeRemoved_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_rowsAboutToBeRemoved_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QStringListModel_Adaptor *)cls)->emitter_QStringListModel_rowsAboutToBeRemoved_7372 (arg1, arg2, arg3); +} + + +// emitter void QStringListModel::rowsInserted(const QModelIndex &parent, int first, int last) + +static void _init_emitter_rowsInserted_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_rowsInserted_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QStringListModel_Adaptor *)cls)->emitter_QStringListModel_rowsInserted_7372 (arg1, arg2, arg3); +} + + +// emitter void QStringListModel::rowsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row) + +static void _init_emitter_rowsMoved_10318 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("start"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("end"); + decl->add_arg (argspec_2); + static gsi::ArgSpecBase argspec_3 ("destination"); + decl->add_arg (argspec_3); + static gsi::ArgSpecBase argspec_4 ("row"); + decl->add_arg (argspec_4); + decl->set_return (); +} + +static void _call_emitter_rowsMoved_10318 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + const QModelIndex &arg4 = gsi::arg_reader() (args, heap); + int arg5 = gsi::arg_reader() (args, heap); + ((QStringListModel_Adaptor *)cls)->emitter_QStringListModel_rowsMoved_10318 (arg1, arg2, arg3, arg4, arg5); +} + + +// emitter void QStringListModel::rowsRemoved(const QModelIndex &parent, int first, int last) + +static void _init_emitter_rowsRemoved_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_rowsRemoved_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QStringListModel_Adaptor *)cls)->emitter_QStringListModel_rowsRemoved_7372 (arg1, arg2, arg3); +} + + // exposed QObject *QStringListModel::sender() static void _init_fp_sender_c0 (qt_gsi::GenericMethod *decl) @@ -2817,6 +3325,12 @@ static gsi::Methods methods_QStringListModel_Adaptor () { methods += new qt_gsi::GenericMethod ("*changePersistentIndexList", "@brief Method void QStringListModel::changePersistentIndexList(const QList &from, const QList &to)\nThis method is protected and can only be called from inside a derived class.", false, &_init_fp_changePersistentIndexList_5912, &_call_fp_changePersistentIndexList_5912); methods += new qt_gsi::GenericMethod ("*childEvent", "@brief Virtual method void QStringListModel::childEvent(QChildEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); + methods += new qt_gsi::GenericMethod ("emit_columnsAboutToBeInserted", "@brief Emitter for signal void QStringListModel::columnsAboutToBeInserted(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_columnsAboutToBeInserted_7372, &_call_emitter_columnsAboutToBeInserted_7372); + methods += new qt_gsi::GenericMethod ("emit_columnsAboutToBeMoved", "@brief Emitter for signal void QStringListModel::columnsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn)\nCall this method to emit this signal.", false, &_init_emitter_columnsAboutToBeMoved_10318, &_call_emitter_columnsAboutToBeMoved_10318); + methods += new qt_gsi::GenericMethod ("emit_columnsAboutToBeRemoved", "@brief Emitter for signal void QStringListModel::columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_columnsAboutToBeRemoved_7372, &_call_emitter_columnsAboutToBeRemoved_7372); + methods += new qt_gsi::GenericMethod ("emit_columnsInserted", "@brief Emitter for signal void QStringListModel::columnsInserted(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_columnsInserted_7372, &_call_emitter_columnsInserted_7372); + methods += new qt_gsi::GenericMethod ("emit_columnsMoved", "@brief Emitter for signal void QStringListModel::columnsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column)\nCall this method to emit this signal.", false, &_init_emitter_columnsMoved_10318, &_call_emitter_columnsMoved_10318); + methods += new qt_gsi::GenericMethod ("emit_columnsRemoved", "@brief Emitter for signal void QStringListModel::columnsRemoved(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_columnsRemoved_7372, &_call_emitter_columnsRemoved_7372); methods += new qt_gsi::GenericMethod ("*createIndex", "@brief Method QModelIndex QStringListModel::createIndex(int row, int column, void *data)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_createIndex_c2374, &_call_fp_createIndex_c2374); methods += new qt_gsi::GenericMethod ("*createIndex", "@brief Method QModelIndex QStringListModel::createIndex(int row, int column, quintptr id)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_createIndex_c2657, &_call_fp_createIndex_c2657); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QStringListModel::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); @@ -2866,10 +3380,13 @@ static gsi::Methods methods_QStringListModel_Adaptor () { methods += new qt_gsi::GenericMethod ("mimeData", "@hide", true, &_init_cbs_mimeData_c3010_0, &_call_cbs_mimeData_c3010_0, &_set_callback_cbs_mimeData_c3010_0); methods += new qt_gsi::GenericMethod ("mimeTypes", "@brief Virtual method QStringList QStringListModel::mimeTypes()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_mimeTypes_c0_0, &_call_cbs_mimeTypes_c0_0); methods += new qt_gsi::GenericMethod ("mimeTypes", "@hide", true, &_init_cbs_mimeTypes_c0_0, &_call_cbs_mimeTypes_c0_0, &_set_callback_cbs_mimeTypes_c0_0); + methods += new qt_gsi::GenericMethod ("emit_modelAboutToBeReset", "@brief Emitter for signal void QStringListModel::modelAboutToBeReset()\nCall this method to emit this signal.", false, &_init_emitter_modelAboutToBeReset_3767, &_call_emitter_modelAboutToBeReset_3767); + methods += new qt_gsi::GenericMethod ("emit_modelReset", "@brief Emitter for signal void QStringListModel::modelReset()\nCall this method to emit this signal.", false, &_init_emitter_modelReset_3767, &_call_emitter_modelReset_3767); methods += new qt_gsi::GenericMethod ("moveColumns", "@brief Virtual method bool QStringListModel::moveColumns(const QModelIndex &sourceParent, int sourceColumn, int count, const QModelIndex &destinationParent, int destinationChild)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_moveColumns_6659_0, &_call_cbs_moveColumns_6659_0); methods += new qt_gsi::GenericMethod ("moveColumns", "@hide", false, &_init_cbs_moveColumns_6659_0, &_call_cbs_moveColumns_6659_0, &_set_callback_cbs_moveColumns_6659_0); methods += new qt_gsi::GenericMethod ("moveRows", "@brief Virtual method bool QStringListModel::moveRows(const QModelIndex &sourceParent, int sourceRow, int count, const QModelIndex &destinationParent, int destinationChild)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_moveRows_6659_0, &_call_cbs_moveRows_6659_0); methods += new qt_gsi::GenericMethod ("moveRows", "@hide", false, &_init_cbs_moveRows_6659_0, &_call_cbs_moveRows_6659_0, &_set_callback_cbs_moveRows_6659_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QStringListModel::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*persistentIndexList", "@brief Method QList QStringListModel::persistentIndexList()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_persistentIndexList_c0, &_call_fp_persistentIndexList_c0); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QStringListModel::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("removeColumns", "@brief Virtual method bool QStringListModel::removeColumns(int column, int count, const QModelIndex &parent)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_removeColumns_3713_1, &_call_cbs_removeColumns_3713_1); @@ -2883,6 +3400,12 @@ static gsi::Methods methods_QStringListModel_Adaptor () { methods += new qt_gsi::GenericMethod ("roleNames", "@hide", true, &_init_cbs_roleNames_c0_0, &_call_cbs_roleNames_c0_0, &_set_callback_cbs_roleNames_c0_0); methods += new qt_gsi::GenericMethod ("rowCount", "@brief Virtual method int QStringListModel::rowCount(const QModelIndex &parent)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_rowCount_c2395_1, &_call_cbs_rowCount_c2395_1); methods += new qt_gsi::GenericMethod ("rowCount", "@hide", true, &_init_cbs_rowCount_c2395_1, &_call_cbs_rowCount_c2395_1, &_set_callback_cbs_rowCount_c2395_1); + methods += new qt_gsi::GenericMethod ("emit_rowsAboutToBeInserted", "@brief Emitter for signal void QStringListModel::rowsAboutToBeInserted(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_rowsAboutToBeInserted_7372, &_call_emitter_rowsAboutToBeInserted_7372); + methods += new qt_gsi::GenericMethod ("emit_rowsAboutToBeMoved", "@brief Emitter for signal void QStringListModel::rowsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow)\nCall this method to emit this signal.", false, &_init_emitter_rowsAboutToBeMoved_10318, &_call_emitter_rowsAboutToBeMoved_10318); + methods += new qt_gsi::GenericMethod ("emit_rowsAboutToBeRemoved", "@brief Emitter for signal void QStringListModel::rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_rowsAboutToBeRemoved_7372, &_call_emitter_rowsAboutToBeRemoved_7372); + methods += new qt_gsi::GenericMethod ("emit_rowsInserted", "@brief Emitter for signal void QStringListModel::rowsInserted(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_rowsInserted_7372, &_call_emitter_rowsInserted_7372); + methods += new qt_gsi::GenericMethod ("emit_rowsMoved", "@brief Emitter for signal void QStringListModel::rowsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row)\nCall this method to emit this signal.", false, &_init_emitter_rowsMoved_10318, &_call_emitter_rowsMoved_10318); + methods += new qt_gsi::GenericMethod ("emit_rowsRemoved", "@brief Emitter for signal void QStringListModel::rowsRemoved(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_rowsRemoved_7372, &_call_emitter_rowsRemoved_7372); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QStringListModel::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QStringListModel::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); methods += new qt_gsi::GenericMethod ("setData", "@brief Virtual method bool QStringListModel::setData(const QModelIndex &index, const QVariant &value, int role)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_setData_5065_1, &_call_cbs_setData_5065_1); diff --git a/src/gsiqt/qt5/QtCore/gsiDeclQTemporaryFile.cc b/src/gsiqt/qt5/QtCore/gsiDeclQTemporaryFile.cc index a7002ac9f..09642759a 100644 --- a/src/gsiqt/qt5/QtCore/gsiDeclQTemporaryFile.cc +++ b/src/gsiqt/qt5/QtCore/gsiDeclQTemporaryFile.cc @@ -375,6 +375,7 @@ static gsi::Methods methods_QTemporaryFile () { methods += gsi::qt_signal ("aboutToClose()", "aboutToClose", "@brief Signal declaration for QTemporaryFile::aboutToClose()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("bytesWritten(qint64)", "bytesWritten", gsi::arg("bytes"), "@brief Signal declaration for QTemporaryFile::bytesWritten(qint64 bytes)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QTemporaryFile::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QTemporaryFile::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("readChannelFinished()", "readChannelFinished", "@brief Signal declaration for QTemporaryFile::readChannelFinished()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("readyRead()", "readyRead", "@brief Signal declaration for QTemporaryFile::readyRead()\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("createLocalFile", "@brief Static method QTemporaryFile *QTemporaryFile::createLocalFile(const QString &fileName)\nThis method is static and can be called without an instance.", &_init_f_createLocalFile_2025, &_call_f_createLocalFile_2025); diff --git a/src/gsiqt/qt5/QtCore/gsiDeclQThread.cc b/src/gsiqt/qt5/QtCore/gsiDeclQThread.cc index 01e503468..34c6297e9 100644 --- a/src/gsiqt/qt5/QtCore/gsiDeclQThread.cc +++ b/src/gsiqt/qt5/QtCore/gsiDeclQThread.cc @@ -536,6 +536,9 @@ static gsi::Methods methods_QThread () { methods += new qt_gsi::GenericMethod ("terminate", "@brief Method void QThread::terminate()\n", false, &_init_f_terminate_0, &_call_f_terminate_0); methods += new qt_gsi::GenericMethod ("wait", "@brief Method bool QThread::wait(unsigned long int time)\n", false, &_init_f_wait_2348, &_call_f_wait_2348); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QThread::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("finished()", "finished", "@brief Signal declaration for QThread::finished()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QThread::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("started()", "started", "@brief Signal declaration for QThread::started()\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("currentThread", "@brief Static method QThread *QThread::currentThread()\nThis method is static and can be called without an instance.", &_init_f_currentThread_0, &_call_f_currentThread_0); methods += new qt_gsi::GenericStaticMethod ("currentThreadId", "@brief Static method Qt::HANDLE QThread::currentThreadId()\nThis method is static and can be called without an instance.", &_init_f_currentThreadId_0, &_call_f_currentThreadId_0); methods += new qt_gsi::GenericStaticMethod ("idealThreadCount", "@brief Static method int QThread::idealThreadCount()\nThis method is static and can be called without an instance.", &_init_f_idealThreadCount_0, &_call_f_idealThreadCount_0); @@ -643,6 +646,25 @@ public: } } + // [emitter impl] void QThread::finished() + void emitter_QThread_finished_2651() + { + throw tl::Exception ("Can't emit private signal 'void QThread::finished()'"); + } + + // [emitter impl] void QThread::objectNameChanged(const QString &objectName) + void emitter_QThread_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QThread::objectNameChanged(const QString &objectName)'"); + } + + // [emitter impl] void QThread::started() + void emitter_QThread_started_2651() + { + throw tl::Exception ("Can't emit private signal 'void QThread::started()'"); + } + // [adaptor impl] void QThread::childEvent(QChildEvent *) void cbs_childEvent_1701_0(QChildEvent *arg1) { @@ -900,6 +922,20 @@ static void _call_fp_exec_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, } +// emitter void QThread::finished() + +static void _init_emitter_finished_2651 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_emitter_finished_2651 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + ((QThread_Adaptor *)cls)->emitter_QThread_finished_2651 (); +} + + // exposed bool QThread::isSignalConnected(const QMetaMethod &signal) static void _init_fp_isSignalConnected_c2394 (qt_gsi::GenericMethod *decl) @@ -918,6 +954,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QThread::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QThread_Adaptor *)cls)->emitter_QThread_objectNameChanged_4567 (arg1); +} + + // exposed int QThread::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -1003,6 +1057,20 @@ static void _call_fp_setTerminationEnabled_864 (const qt_gsi::GenericStaticMetho } +// emitter void QThread::started() + +static void _init_emitter_started_2651 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_emitter_started_2651 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + ((QThread_Adaptor *)cls)->emitter_QThread_started_2651 (); +} + + // void QThread::timerEvent(QTimerEvent *) static void _init_cbs_timerEvent_1730_0 (qt_gsi::GenericMethod *decl) @@ -1047,13 +1115,16 @@ static gsi::Methods methods_QThread_Adaptor () { methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QThread::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("*exec", "@brief Method int QThread::exec()\nThis method is protected and can only be called from inside a derived class.", false, &_init_fp_exec_0, &_call_fp_exec_0); + methods += new qt_gsi::GenericMethod ("emit_finished", "@brief Emitter for signal void QThread::finished()\nCall this method to emit this signal.", false, &_init_emitter_finished_2651, &_call_emitter_finished_2651); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QThread::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QThread::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QThread::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*run", "@brief Virtual method void QThread::run()\nThis method can be reimplemented in a derived class.", false, &_init_cbs_run_0_0, &_call_cbs_run_0_0); methods += new qt_gsi::GenericMethod ("*run", "@hide", false, &_init_cbs_run_0_0, &_call_cbs_run_0_0, &_set_callback_cbs_run_0_0); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QThread::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QThread::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); methods += new qt_gsi::GenericStaticMethod ("*setTerminationEnabled", "@brief Method void QThread::setTerminationEnabled(bool enabled)\nThis method is protected and can only be called from inside a derived class.", &_init_fp_setTerminationEnabled_864, &_call_fp_setTerminationEnabled_864); + methods += new qt_gsi::GenericMethod ("emit_started", "@brief Emitter for signal void QThread::started()\nCall this method to emit this signal.", false, &_init_emitter_started_2651, &_call_emitter_started_2651); methods += new qt_gsi::GenericMethod ("*timerEvent", "@brief Virtual method void QThread::timerEvent(QTimerEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_timerEvent_1730_0, &_call_cbs_timerEvent_1730_0); methods += new qt_gsi::GenericMethod ("*timerEvent", "@hide", false, &_init_cbs_timerEvent_1730_0, &_call_cbs_timerEvent_1730_0, &_set_callback_cbs_timerEvent_1730_0); return methods; diff --git a/src/gsiqt/qt5/QtCore/gsiDeclQThreadPool.cc b/src/gsiqt/qt5/QtCore/gsiDeclQThreadPool.cc index 055db37bd..c90bbe5a8 100644 --- a/src/gsiqt/qt5/QtCore/gsiDeclQThreadPool.cc +++ b/src/gsiqt/qt5/QtCore/gsiDeclQThreadPool.cc @@ -354,6 +354,7 @@ static gsi::Methods methods_QThreadPool () { methods += new qt_gsi::GenericMethod ("tryStart", "@brief Method bool QThreadPool::tryStart(QRunnable *runnable)\n", false, &_init_f_tryStart_1526, &_call_f_tryStart_1526); methods += new qt_gsi::GenericMethod ("waitForDone", "@brief Method bool QThreadPool::waitForDone(int msecs)\n", false, &_init_f_waitForDone_767, &_call_f_waitForDone_767); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QThreadPool::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QThreadPool::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("globalInstance", "@brief Static method QThreadPool *QThreadPool::globalInstance()\nThis method is static and can be called without an instance.", &_init_f_globalInstance_0, &_call_f_globalInstance_0); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QThreadPool::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QThreadPool::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); @@ -445,6 +446,13 @@ public: } } + // [emitter impl] void QThreadPool::objectNameChanged(const QString &objectName) + void emitter_QThreadPool_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QThreadPool::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] void QThreadPool::childEvent(QChildEvent *) void cbs_childEvent_1701_0(QChildEvent *arg1) { @@ -690,6 +698,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QThreadPool::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QThreadPool_Adaptor *)cls)->emitter_QThreadPool_objectNameChanged_4567 (arg1); +} + + // exposed int QThreadPool::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -780,6 +806,7 @@ static gsi::Methods methods_QThreadPool_Adaptor () { methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QThreadPool::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QThreadPool::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QThreadPool::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QThreadPool::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QThreadPool::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QThreadPool::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); diff --git a/src/gsiqt/qt5/QtCore/gsiDeclQTimeLine.cc b/src/gsiqt/qt5/QtCore/gsiDeclQTimeLine.cc index 3530fc3af..e2be41821 100644 --- a/src/gsiqt/qt5/QtCore/gsiDeclQTimeLine.cc +++ b/src/gsiqt/qt5/QtCore/gsiDeclQTimeLine.cc @@ -647,6 +647,11 @@ static gsi::Methods methods_QTimeLine () { methods += new qt_gsi::GenericMethod (":updateInterval", "@brief Method int QTimeLine::updateInterval()\n", true, &_init_f_updateInterval_c0, &_call_f_updateInterval_c0); methods += new qt_gsi::GenericMethod ("valueForTime", "@brief Method double QTimeLine::valueForTime(int msec)\n", true, &_init_f_valueForTime_c767, &_call_f_valueForTime_c767); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QTimeLine::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("finished()", "finished", "@brief Signal declaration for QTimeLine::finished()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("frameChanged(int)", "frameChanged", gsi::arg("arg1"), "@brief Signal declaration for QTimeLine::frameChanged(int)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QTimeLine::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal::target_type & > ("stateChanged(QTimeLine::State)", "stateChanged", gsi::arg("newState"), "@brief Signal declaration for QTimeLine::stateChanged(QTimeLine::State newState)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("valueChanged(double)", "valueChanged", gsi::arg("x"), "@brief Signal declaration for QTimeLine::valueChanged(double x)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QTimeLine::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QTimeLine::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -743,6 +748,40 @@ public: } } + // [emitter impl] void QTimeLine::finished() + void emitter_QTimeLine_finished_2842() + { + throw tl::Exception ("Can't emit private signal 'void QTimeLine::finished()'"); + } + + // [emitter impl] void QTimeLine::frameChanged(int) + void emitter_QTimeLine_frameChanged_3501(int arg1) + { + __SUPPRESS_UNUSED_WARNING (arg1); + throw tl::Exception ("Can't emit private signal 'void QTimeLine::frameChanged(int)'"); + } + + // [emitter impl] void QTimeLine::objectNameChanged(const QString &objectName) + void emitter_QTimeLine_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QTimeLine::objectNameChanged(const QString &objectName)'"); + } + + // [emitter impl] void QTimeLine::stateChanged(QTimeLine::State newState) + void emitter_QTimeLine_stateChanged_4671(QTimeLine::State newState) + { + __SUPPRESS_UNUSED_WARNING (newState); + throw tl::Exception ("Can't emit private signal 'void QTimeLine::stateChanged(QTimeLine::State newState)'"); + } + + // [emitter impl] void QTimeLine::valueChanged(double x) + void emitter_QTimeLine_valueChanged_3805(double x) + { + __SUPPRESS_UNUSED_WARNING (x); + throw tl::Exception ("Can't emit private signal 'void QTimeLine::valueChanged(double x)'"); + } + // [adaptor impl] double QTimeLine::valueForTime(int msec) double cbs_valueForTime_c767_0(int msec) const { @@ -989,6 +1028,38 @@ static void _set_callback_cbs_eventFilter_2411_0 (void *cls, const gsi::Callback } +// emitter void QTimeLine::finished() + +static void _init_emitter_finished_2842 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_emitter_finished_2842 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + ((QTimeLine_Adaptor *)cls)->emitter_QTimeLine_finished_2842 (); +} + + +// emitter void QTimeLine::frameChanged(int) + +static void _init_emitter_frameChanged_3501 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("arg1"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_frameChanged_3501 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + int arg1 = gsi::arg_reader() (args, heap); + ((QTimeLine_Adaptor *)cls)->emitter_QTimeLine_frameChanged_3501 (arg1); +} + + // exposed bool QTimeLine::isSignalConnected(const QMetaMethod &signal) static void _init_fp_isSignalConnected_c2394 (qt_gsi::GenericMethod *decl) @@ -1007,6 +1078,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QTimeLine::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QTimeLine_Adaptor *)cls)->emitter_QTimeLine_objectNameChanged_4567 (arg1); +} + + // exposed int QTimeLine::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -1053,6 +1142,24 @@ static void _call_fp_senderSignalIndex_c0 (const qt_gsi::GenericMethod * /*decl* } +// emitter void QTimeLine::stateChanged(QTimeLine::State newState) + +static void _init_emitter_stateChanged_4671 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("newState"); + decl->add_arg::target_type & > (argspec_0); + decl->set_return (); +} + +static void _call_emitter_stateChanged_4671 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); + ((QTimeLine_Adaptor *)cls)->emitter_QTimeLine_stateChanged_4671 (arg1); +} + + // void QTimeLine::timerEvent(QTimerEvent *event) static void _init_cbs_timerEvent_1730_0 (qt_gsi::GenericMethod *decl) @@ -1077,6 +1184,24 @@ static void _set_callback_cbs_timerEvent_1730_0 (void *cls, const gsi::Callback } +// emitter void QTimeLine::valueChanged(double x) + +static void _init_emitter_valueChanged_3805 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("x"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_valueChanged_3805 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + double arg1 = gsi::arg_reader() (args, heap); + ((QTimeLine_Adaptor *)cls)->emitter_QTimeLine_valueChanged_3805 (arg1); +} + + // double QTimeLine::valueForTime(int msec) static void _init_cbs_valueForTime_c767_0 (qt_gsi::GenericMethod *decl) @@ -1119,12 +1244,17 @@ static gsi::Methods methods_QTimeLine_Adaptor () { methods += new qt_gsi::GenericMethod ("event", "@hide", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0, &_set_callback_cbs_event_1217_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QTimeLine::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); + methods += new qt_gsi::GenericMethod ("emit_finished", "@brief Emitter for signal void QTimeLine::finished()\nCall this method to emit this signal.", false, &_init_emitter_finished_2842, &_call_emitter_finished_2842); + methods += new qt_gsi::GenericMethod ("emit_frameChanged", "@brief Emitter for signal void QTimeLine::frameChanged(int)\nCall this method to emit this signal.", false, &_init_emitter_frameChanged_3501, &_call_emitter_frameChanged_3501); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QTimeLine::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QTimeLine::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QTimeLine::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QTimeLine::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QTimeLine::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); + methods += new qt_gsi::GenericMethod ("emit_stateChanged", "@brief Emitter for signal void QTimeLine::stateChanged(QTimeLine::State newState)\nCall this method to emit this signal.", false, &_init_emitter_stateChanged_4671, &_call_emitter_stateChanged_4671); methods += new qt_gsi::GenericMethod ("*timerEvent", "@brief Virtual method void QTimeLine::timerEvent(QTimerEvent *event)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_timerEvent_1730_0, &_call_cbs_timerEvent_1730_0); methods += new qt_gsi::GenericMethod ("*timerEvent", "@hide", false, &_init_cbs_timerEvent_1730_0, &_call_cbs_timerEvent_1730_0, &_set_callback_cbs_timerEvent_1730_0); + methods += new qt_gsi::GenericMethod ("emit_valueChanged", "@brief Emitter for signal void QTimeLine::valueChanged(double x)\nCall this method to emit this signal.", false, &_init_emitter_valueChanged_3805, &_call_emitter_valueChanged_3805); methods += new qt_gsi::GenericMethod ("valueForTime", "@brief Virtual method double QTimeLine::valueForTime(int msec)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_valueForTime_c767_0, &_call_cbs_valueForTime_c767_0); methods += new qt_gsi::GenericMethod ("valueForTime", "@hide", true, &_init_cbs_valueForTime_c767_0, &_call_cbs_valueForTime_c767_0, &_set_callback_cbs_valueForTime_c767_0); return methods; diff --git a/src/gsiqt/qt5/QtCore/gsiDeclQTimer.cc b/src/gsiqt/qt5/QtCore/gsiDeclQTimer.cc index b00821f88..2dd31c39f 100644 --- a/src/gsiqt/qt5/QtCore/gsiDeclQTimer.cc +++ b/src/gsiqt/qt5/QtCore/gsiDeclQTimer.cc @@ -326,6 +326,8 @@ static gsi::Methods methods_QTimer () { methods += new qt_gsi::GenericMethod ("timerId", "@brief Method int QTimer::timerId()\n", true, &_init_f_timerId_c0, &_call_f_timerId_c0); methods += new qt_gsi::GenericMethod (":timerType", "@brief Method Qt::TimerType QTimer::timerType()\n", true, &_init_f_timerType_c0, &_call_f_timerType_c0); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QTimer::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QTimer::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("timeout()", "timeout", "@brief Signal declaration for QTimer::timeout()\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QTimer::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QTimer::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -416,6 +418,19 @@ public: } } + // [emitter impl] void QTimer::objectNameChanged(const QString &objectName) + void emitter_QTimer_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QTimer::objectNameChanged(const QString &objectName)'"); + } + + // [emitter impl] void QTimer::timeout() + void emitter_QTimer_timeout_2564() + { + throw tl::Exception ("Can't emit private signal 'void QTimer::timeout()'"); + } + // [adaptor impl] void QTimer::childEvent(QChildEvent *) void cbs_childEvent_1701_0(QChildEvent *arg1) { @@ -661,6 +676,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QTimer::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QTimer_Adaptor *)cls)->emitter_QTimer_objectNameChanged_4567 (arg1); +} + + // exposed int QTimer::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -707,6 +740,20 @@ static void _call_fp_senderSignalIndex_c0 (const qt_gsi::GenericMethod * /*decl* } +// emitter void QTimer::timeout() + +static void _init_emitter_timeout_2564 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_emitter_timeout_2564 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + ((QTimer_Adaptor *)cls)->emitter_QTimer_timeout_2564 (); +} + + // void QTimer::timerEvent(QTimerEvent *) static void _init_cbs_timerEvent_1730_0 (qt_gsi::GenericMethod *decl) @@ -751,9 +798,11 @@ static gsi::Methods methods_QTimer_Adaptor () { methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QTimer::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QTimer::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QTimer::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QTimer::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QTimer::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QTimer::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); + methods += new qt_gsi::GenericMethod ("emit_timeout", "@brief Emitter for signal void QTimer::timeout()\nCall this method to emit this signal.", false, &_init_emitter_timeout_2564, &_call_emitter_timeout_2564); methods += new qt_gsi::GenericMethod ("*timerEvent", "@brief Virtual method void QTimer::timerEvent(QTimerEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_timerEvent_1730_0, &_call_cbs_timerEvent_1730_0); methods += new qt_gsi::GenericMethod ("*timerEvent", "@hide", false, &_init_cbs_timerEvent_1730_0, &_call_cbs_timerEvent_1730_0, &_set_callback_cbs_timerEvent_1730_0); return methods; diff --git a/src/gsiqt/qt5/QtCore/gsiDeclQTranslator.cc b/src/gsiqt/qt5/QtCore/gsiDeclQTranslator.cc index 8bc4fec1f..2422361bd 100644 --- a/src/gsiqt/qt5/QtCore/gsiDeclQTranslator.cc +++ b/src/gsiqt/qt5/QtCore/gsiDeclQTranslator.cc @@ -245,6 +245,7 @@ static gsi::Methods methods_QTranslator () { methods += new qt_gsi::GenericMethod ("load", "@brief Method bool QTranslator::load(const unsigned char *data, int len, const QString &directory)\n", false, &_init_f_load_5312, &_call_f_load_5312); methods += new qt_gsi::GenericMethod ("translate", "@brief Method QString QTranslator::translate(const char *context, const char *sourceText, const char *disambiguation, int n)\n", true, &_init_f_translate_c5636, &_call_f_translate_c5636); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QTranslator::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QTranslator::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QTranslator::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QTranslator::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -350,6 +351,13 @@ public: } } + // [emitter impl] void QTranslator::objectNameChanged(const QString &objectName) + void emitter_QTranslator_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QTranslator::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QString QTranslator::translate(const char *context, const char *sourceText, const char *disambiguation, int n) QString cbs_translate_c5636_2(const char *context, const char *sourceText, const char *disambiguation, int n) const { @@ -631,6 +639,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QTranslator::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QTranslator_Adaptor *)cls)->emitter_QTranslator_objectNameChanged_4567 (arg1); +} + + // exposed int QTranslator::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -755,6 +781,7 @@ static gsi::Methods methods_QTranslator_Adaptor () { methods += new qt_gsi::GenericMethod ("isEmpty", "@brief Virtual method bool QTranslator::isEmpty()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_isEmpty_c0_0, &_call_cbs_isEmpty_c0_0); methods += new qt_gsi::GenericMethod ("isEmpty", "@hide", true, &_init_cbs_isEmpty_c0_0, &_call_cbs_isEmpty_c0_0, &_set_callback_cbs_isEmpty_c0_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QTranslator::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QTranslator::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QTranslator::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QTranslator::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QTranslator::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); diff --git a/src/gsiqt/qt5/QtCore/gsiDeclQVariantAnimation.cc b/src/gsiqt/qt5/QtCore/gsiDeclQVariantAnimation.cc index 3aaee124c..5b100eef8 100644 --- a/src/gsiqt/qt5/QtCore/gsiDeclQVariantAnimation.cc +++ b/src/gsiqt/qt5/QtCore/gsiDeclQVariantAnimation.cc @@ -362,6 +362,7 @@ static gsi::Methods methods_QVariantAnimation () { methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QVariantAnimation::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal::target_type & > ("directionChanged(QAbstractAnimation::Direction)", "directionChanged", gsi::arg("arg1"), "@brief Signal declaration for QVariantAnimation::directionChanged(QAbstractAnimation::Direction)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("finished()", "finished", "@brief Signal declaration for QVariantAnimation::finished()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QVariantAnimation::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal::target_type &, const qt_gsi::Converter::target_type & > ("stateChanged(QAbstractAnimation::State, QAbstractAnimation::State)", "stateChanged", gsi::arg("newState"), gsi::arg("oldState"), "@brief Signal declaration for QVariantAnimation::stateChanged(QAbstractAnimation::State newState, QAbstractAnimation::State oldState)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("valueChanged(const QVariant &)", "valueChanged", gsi::arg("value"), "@brief Signal declaration for QVariantAnimation::valueChanged(const QVariant &value)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QVariantAnimation::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); @@ -472,6 +473,13 @@ public: emit QVariantAnimation::finished(); } + // [emitter impl] void QVariantAnimation::objectNameChanged(const QString &objectName) + void emitter_QVariantAnimation_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QVariantAnimation::objectNameChanged(const QString &objectName)'"); + } + // [emitter impl] void QVariantAnimation::stateChanged(QAbstractAnimation::State newState, QAbstractAnimation::State oldState) void emitter_QVariantAnimation_stateChanged_5680(QAbstractAnimation::State newState, QAbstractAnimation::State oldState) { @@ -923,6 +931,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QVariantAnimation::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QVariantAnimation_Adaptor *)cls)->emitter_QVariantAnimation_objectNameChanged_4567 (arg1); +} + + // exposed int QVariantAnimation::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -1158,6 +1184,7 @@ static gsi::Methods methods_QVariantAnimation_Adaptor () { methods += new qt_gsi::GenericMethod ("*interpolated", "@brief Virtual method QVariant QVariantAnimation::interpolated(const QVariant &from, const QVariant &to, double progress)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_interpolated_c5093_0, &_call_cbs_interpolated_c5093_0); methods += new qt_gsi::GenericMethod ("*interpolated", "@hide", true, &_init_cbs_interpolated_c5093_0, &_call_cbs_interpolated_c5093_0, &_set_callback_cbs_interpolated_c5093_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QVariantAnimation::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QVariantAnimation::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QVariantAnimation::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QVariantAnimation::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QVariantAnimation::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); diff --git a/src/gsiqt/qt5/QtGui/gsiDeclQAbstractTextDocumentLayout.cc b/src/gsiqt/qt5/QtGui/gsiDeclQAbstractTextDocumentLayout.cc index eb7fa34f4..9bbadf07c 100644 --- a/src/gsiqt/qt5/QtGui/gsiDeclQAbstractTextDocumentLayout.cc +++ b/src/gsiqt/qt5/QtGui/gsiDeclQAbstractTextDocumentLayout.cc @@ -385,6 +385,7 @@ static gsi::Methods methods_QAbstractTextDocumentLayout () { methods += new qt_gsi::GenericMethod ("unregisterHandler", "@brief Method void QAbstractTextDocumentLayout::unregisterHandler(int objectType, QObject *component)\n", false, &_init_f_unregisterHandler_1961, &_call_f_unregisterHandler_1961); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QAbstractTextDocumentLayout::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("documentSizeChanged(const QSizeF &)", "documentSizeChanged", gsi::arg("newSize"), "@brief Signal declaration for QAbstractTextDocumentLayout::documentSizeChanged(const QSizeF &newSize)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QAbstractTextDocumentLayout::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("pageCountChanged(int)", "pageCountChanged", gsi::arg("newPages"), "@brief Signal declaration for QAbstractTextDocumentLayout::pageCountChanged(int newPages)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("update(const QRectF &)", "update", gsi::arg("arg1"), "@brief Signal declaration for QAbstractTextDocumentLayout::update(const QRectF &)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("updateBlock(const QTextBlock &)", "updateBlock", gsi::arg("block"), "@brief Signal declaration for QAbstractTextDocumentLayout::updateBlock(const QTextBlock &block)\nYou can bind a procedure to this signal."); @@ -569,6 +570,13 @@ public: } } + // [emitter impl] void QAbstractTextDocumentLayout::objectNameChanged(const QString &objectName) + void emitter_QAbstractTextDocumentLayout_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QAbstractTextDocumentLayout::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] int QAbstractTextDocumentLayout::pageCount() int cbs_pageCount_c0_0() const { @@ -1158,6 +1166,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QAbstractTextDocumentLayout::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QAbstractTextDocumentLayout_Adaptor *)cls)->emitter_QAbstractTextDocumentLayout_objectNameChanged_4567 (arg1); +} + + // int QAbstractTextDocumentLayout::pageCount() static void _init_cbs_pageCount_c0_0 (qt_gsi::GenericMethod *decl) @@ -1398,6 +1424,7 @@ static gsi::Methods methods_QAbstractTextDocumentLayout_Adaptor () { methods += new qt_gsi::GenericMethod ("hitTest", "@brief Virtual method int QAbstractTextDocumentLayout::hitTest(const QPointF &point, Qt::HitTestAccuracy accuracy)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_hitTest_c4147_0, &_call_cbs_hitTest_c4147_0); methods += new qt_gsi::GenericMethod ("hitTest", "@hide", true, &_init_cbs_hitTest_c4147_0, &_call_cbs_hitTest_c4147_0, &_set_callback_cbs_hitTest_c4147_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QAbstractTextDocumentLayout::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QAbstractTextDocumentLayout::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("pageCount", "@brief Virtual method int QAbstractTextDocumentLayout::pageCount()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_pageCount_c0_0, &_call_cbs_pageCount_c0_0); methods += new qt_gsi::GenericMethod ("pageCount", "@hide", true, &_init_cbs_pageCount_c0_0, &_call_cbs_pageCount_c0_0, &_set_callback_cbs_pageCount_c0_0); methods += new qt_gsi::GenericMethod ("emit_pageCountChanged", "@brief Emitter for signal void QAbstractTextDocumentLayout::pageCountChanged(int newPages)\nCall this method to emit this signal.", false, &_init_emitter_pageCountChanged_767, &_call_emitter_pageCountChanged_767); diff --git a/src/gsiqt/qt5/QtGui/gsiDeclQClipboard.cc b/src/gsiqt/qt5/QtGui/gsiDeclQClipboard.cc index 60b913e32..b49331f60 100644 --- a/src/gsiqt/qt5/QtGui/gsiDeclQClipboard.cc +++ b/src/gsiqt/qt5/QtGui/gsiDeclQClipboard.cc @@ -417,6 +417,7 @@ static gsi::Methods methods_QClipboard () { methods += gsi::qt_signal ("dataChanged()", "dataChanged", "@brief Signal declaration for QClipboard::dataChanged()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QClipboard::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("findBufferChanged()", "findBufferChanged", "@brief Signal declaration for QClipboard::findBufferChanged()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QClipboard::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("selectionChanged()", "selectionChanged", "@brief Signal declaration for QClipboard::selectionChanged()\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QClipboard::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QClipboard::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); diff --git a/src/gsiqt/qt5/QtGui/gsiDeclQDoubleValidator.cc b/src/gsiqt/qt5/QtGui/gsiDeclQDoubleValidator.cc index 5dd9e8b52..36bf36d88 100644 --- a/src/gsiqt/qt5/QtGui/gsiDeclQDoubleValidator.cc +++ b/src/gsiqt/qt5/QtGui/gsiDeclQDoubleValidator.cc @@ -315,6 +315,7 @@ static gsi::Methods methods_QDoubleValidator () { methods += gsi::qt_signal ("decimalsChanged(int)", "decimalsChanged", gsi::arg("decimals"), "@brief Signal declaration for QDoubleValidator::decimalsChanged(int decimals)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QDoubleValidator::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal::target_type & > ("notationChanged(QDoubleValidator::Notation)", "notationChanged", gsi::arg("notation"), "@brief Signal declaration for QDoubleValidator::notationChanged(QDoubleValidator::Notation notation)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QDoubleValidator::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("topChanged(double)", "topChanged", gsi::arg("top"), "@brief Signal declaration for QDoubleValidator::topChanged(double top)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QDoubleValidator::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QDoubleValidator::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); @@ -457,6 +458,13 @@ public: emit QDoubleValidator::notationChanged(notation); } + // [emitter impl] void QDoubleValidator::objectNameChanged(const QString &objectName) + void emitter_QDoubleValidator_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QDoubleValidator::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] void QDoubleValidator::setRange(double bottom, double top, int decimals) void cbs_setRange_2693_1(double bottom, double top, int decimals) { @@ -860,6 +868,24 @@ static void _call_emitter_notationChanged_3014 (const qt_gsi::GenericMethod * /* } +// emitter void QDoubleValidator::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QDoubleValidator_Adaptor *)cls)->emitter_QDoubleValidator_objectNameChanged_4567 (arg1); +} + + // exposed int QDoubleValidator::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -1031,6 +1057,7 @@ static gsi::Methods methods_QDoubleValidator_Adaptor () { methods += new qt_gsi::GenericMethod ("fixup", "@hide", true, &_init_cbs_fixup_c1330_0, &_call_cbs_fixup_c1330_0, &_set_callback_cbs_fixup_c1330_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QDoubleValidator::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); methods += new qt_gsi::GenericMethod ("emit_notationChanged", "@brief Emitter for signal void QDoubleValidator::notationChanged(QDoubleValidator::Notation notation)\nCall this method to emit this signal.", false, &_init_emitter_notationChanged_3014, &_call_emitter_notationChanged_3014); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QDoubleValidator::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QDoubleValidator::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QDoubleValidator::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QDoubleValidator::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); diff --git a/src/gsiqt/qt5/QtGui/gsiDeclQDrag.cc b/src/gsiqt/qt5/QtGui/gsiDeclQDrag.cc index 497525519..f8f19a7c1 100644 --- a/src/gsiqt/qt5/QtGui/gsiDeclQDrag.cc +++ b/src/gsiqt/qt5/QtGui/gsiDeclQDrag.cc @@ -398,6 +398,7 @@ static gsi::Methods methods_QDrag () { methods += new qt_gsi::GenericMethod ("target", "@brief Method QObject *QDrag::target()\n", true, &_init_f_target_c0, &_call_f_target_c0); methods += gsi::qt_signal::target_type & > ("actionChanged(Qt::DropAction)", "actionChanged", gsi::arg("action"), "@brief Signal declaration for QDrag::actionChanged(Qt::DropAction action)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QDrag::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QDrag::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("targetChanged(QObject *)", "targetChanged", gsi::arg("newTarget"), "@brief Signal declaration for QDrag::targetChanged(QObject *newTarget)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QDrag::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QDrag::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); @@ -489,6 +490,13 @@ public: } } + // [emitter impl] void QDrag::objectNameChanged(const QString &objectName) + void emitter_QDrag_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QDrag::objectNameChanged(const QString &objectName)'"); + } + // [emitter impl] void QDrag::targetChanged(QObject *newTarget) void emitter_QDrag_targetChanged_1302(QObject *newTarget) { @@ -758,6 +766,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QDrag::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QDrag_Adaptor *)cls)->emitter_QDrag_objectNameChanged_4567 (arg1); +} + + // exposed int QDrag::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -867,6 +893,7 @@ static gsi::Methods methods_QDrag_Adaptor () { methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QDrag::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QDrag::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QDrag::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QDrag::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QDrag::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QDrag::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); diff --git a/src/gsiqt/qt5/QtGui/gsiDeclQGenericPlugin.cc b/src/gsiqt/qt5/QtGui/gsiDeclQGenericPlugin.cc index b5197f2c8..a6bf9cc08 100644 --- a/src/gsiqt/qt5/QtGui/gsiDeclQGenericPlugin.cc +++ b/src/gsiqt/qt5/QtGui/gsiDeclQGenericPlugin.cc @@ -135,6 +135,7 @@ static gsi::Methods methods_QGenericPlugin () { methods += new qt_gsi::GenericStaticMethod ("staticMetaObject", "@brief Obtains the static MetaObject for this class.", &_init_smo, &_call_smo); methods += new qt_gsi::GenericMethod ("qt_create", "@brief Method QObject *QGenericPlugin::create(const QString &name, const QString &spec)\n", false, &_init_f_create_3942, &_call_f_create_3942); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QGenericPlugin::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QGenericPlugin::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QGenericPlugin::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QGenericPlugin::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -242,6 +243,13 @@ public: } } + // [emitter impl] void QGenericPlugin::objectNameChanged(const QString &objectName) + void emitter_QGenericPlugin_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QGenericPlugin::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] void QGenericPlugin::childEvent(QChildEvent *) void cbs_childEvent_1701_0(QChildEvent *arg1) { @@ -514,6 +522,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QGenericPlugin::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QGenericPlugin_Adaptor *)cls)->emitter_QGenericPlugin_objectNameChanged_4567 (arg1); +} + + // exposed int QGenericPlugin::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -606,6 +632,7 @@ static gsi::Methods methods_QGenericPlugin_Adaptor () { methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QGenericPlugin::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QGenericPlugin::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QGenericPlugin::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QGenericPlugin::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QGenericPlugin::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QGenericPlugin::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); diff --git a/src/gsiqt/qt5/QtGui/gsiDeclQGuiApplication.cc b/src/gsiqt/qt5/QtGui/gsiDeclQGuiApplication.cc index 68af47553..b48a20688 100644 --- a/src/gsiqt/qt5/QtGui/gsiDeclQGuiApplication.cc +++ b/src/gsiqt/qt5/QtGui/gsiDeclQGuiApplication.cc @@ -834,6 +834,7 @@ static gsi::Methods methods_QGuiApplication () { methods += new qt_gsi::GenericMethod ("notify", "@brief Method bool QGuiApplication::notify(QObject *, QEvent *)\nThis is a reimplementation of QCoreApplication::notify", false, &_init_f_notify_2411, &_call_f_notify_2411); methods += new qt_gsi::GenericMethod ("sessionId", "@brief Method QString QGuiApplication::sessionId()\n", true, &_init_f_sessionId_c0, &_call_f_sessionId_c0); methods += new qt_gsi::GenericMethod ("sessionKey", "@brief Method QString QGuiApplication::sessionKey()\n", true, &_init_f_sessionKey_c0, &_call_f_sessionKey_c0); + methods += gsi::qt_signal ("aboutToQuit()", "aboutToQuit", "@brief Signal declaration for QGuiApplication::aboutToQuit()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("applicationNameChanged()", "applicationNameChanged", "@brief Signal declaration for QGuiApplication::applicationNameChanged()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal::target_type & > ("applicationStateChanged(Qt::ApplicationState)", "applicationStateChanged", gsi::arg("state"), "@brief Signal declaration for QGuiApplication::applicationStateChanged(Qt::ApplicationState state)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("applicationVersionChanged()", "applicationVersionChanged", "@brief Signal declaration for QGuiApplication::applicationVersionChanged()\nYou can bind a procedure to this signal."); @@ -844,6 +845,7 @@ static gsi::Methods methods_QGuiApplication () { methods += gsi::qt_signal ("fontDatabaseChanged()", "fontDatabaseChanged", "@brief Signal declaration for QGuiApplication::fontDatabaseChanged()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("lastWindowClosed()", "lastWindowClosed", "@brief Signal declaration for QGuiApplication::lastWindowClosed()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal::target_type & > ("layoutDirectionChanged(Qt::LayoutDirection)", "layoutDirectionChanged", gsi::arg("direction"), "@brief Signal declaration for QGuiApplication::layoutDirectionChanged(Qt::LayoutDirection direction)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QGuiApplication::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("organizationDomainChanged()", "organizationDomainChanged", "@brief Signal declaration for QGuiApplication::organizationDomainChanged()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("organizationNameChanged()", "organizationNameChanged", "@brief Signal declaration for QGuiApplication::organizationNameChanged()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("paletteChanged(const QPalette &)", "paletteChanged", gsi::arg("pal"), "@brief Signal declaration for QGuiApplication::paletteChanged(const QPalette &pal)\nYou can bind a procedure to this signal."); @@ -951,6 +953,12 @@ public: return QGuiApplication::senderSignalIndex(); } + // [emitter impl] void QGuiApplication::aboutToQuit() + void emitter_QGuiApplication_aboutToQuit_3584() + { + throw tl::Exception ("Can't emit private signal 'void QGuiApplication::aboutToQuit()'"); + } + // [emitter impl] void QGuiApplication::applicationNameChanged() void emitter_QGuiApplication_applicationNameChanged_0() { @@ -1041,6 +1049,13 @@ public: } } + // [emitter impl] void QGuiApplication::objectNameChanged(const QString &objectName) + void emitter_QGuiApplication_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QGuiApplication::objectNameChanged(const QString &objectName)'"); + } + // [emitter impl] void QGuiApplication::organizationDomainChanged() void emitter_QGuiApplication_organizationDomainChanged_0() { @@ -1163,6 +1178,20 @@ public: QGuiApplication_Adaptor::~QGuiApplication_Adaptor() { } +// emitter void QGuiApplication::aboutToQuit() + +static void _init_emitter_aboutToQuit_3584 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_emitter_aboutToQuit_3584 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + ((QGuiApplication_Adaptor *)cls)->emitter_QGuiApplication_aboutToQuit_3584 (); +} + + // emitter void QGuiApplication::applicationNameChanged() static void _init_emitter_applicationNameChanged_0 (qt_gsi::GenericMethod *decl) @@ -1492,6 +1521,24 @@ static void _set_callback_cbs_notify_2411_0 (void *cls, const gsi::Callback &cb) } +// emitter void QGuiApplication::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QGuiApplication_Adaptor *)cls)->emitter_QGuiApplication_objectNameChanged_4567 (arg1); +} + + // emitter void QGuiApplication::organizationDomainChanged() static void _init_emitter_organizationDomainChanged_0 (qt_gsi::GenericMethod *decl) @@ -1669,6 +1716,7 @@ gsi::Class &qtdecl_QGuiApplication (); static gsi::Methods methods_QGuiApplication_Adaptor () { gsi::Methods methods; + methods += new qt_gsi::GenericMethod ("emit_aboutToQuit", "@brief Emitter for signal void QGuiApplication::aboutToQuit()\nCall this method to emit this signal.", false, &_init_emitter_aboutToQuit_3584, &_call_emitter_aboutToQuit_3584); methods += new qt_gsi::GenericMethod ("emit_applicationNameChanged", "@brief Emitter for signal void QGuiApplication::applicationNameChanged()\nCall this method to emit this signal.", false, &_init_emitter_applicationNameChanged_0, &_call_emitter_applicationNameChanged_0); methods += new qt_gsi::GenericMethod ("emit_applicationStateChanged", "@brief Emitter for signal void QGuiApplication::applicationStateChanged(Qt::ApplicationState state)\nCall this method to emit this signal.", false, &_init_emitter_applicationStateChanged_2402, &_call_emitter_applicationStateChanged_2402); methods += new qt_gsi::GenericMethod ("emit_applicationVersionChanged", "@brief Emitter for signal void QGuiApplication::applicationVersionChanged()\nCall this method to emit this signal.", false, &_init_emitter_applicationVersionChanged_0, &_call_emitter_applicationVersionChanged_0); @@ -1692,6 +1740,7 @@ static gsi::Methods methods_QGuiApplication_Adaptor () { methods += new qt_gsi::GenericMethod ("emit_layoutDirectionChanged", "@brief Emitter for signal void QGuiApplication::layoutDirectionChanged(Qt::LayoutDirection direction)\nCall this method to emit this signal.", false, &_init_emitter_layoutDirectionChanged_2316, &_call_emitter_layoutDirectionChanged_2316); methods += new qt_gsi::GenericMethod ("notify", "@brief Virtual method bool QGuiApplication::notify(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_notify_2411_0, &_call_cbs_notify_2411_0); methods += new qt_gsi::GenericMethod ("notify", "@hide", false, &_init_cbs_notify_2411_0, &_call_cbs_notify_2411_0, &_set_callback_cbs_notify_2411_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QGuiApplication::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("emit_organizationDomainChanged", "@brief Emitter for signal void QGuiApplication::organizationDomainChanged()\nCall this method to emit this signal.", false, &_init_emitter_organizationDomainChanged_0, &_call_emitter_organizationDomainChanged_0); methods += new qt_gsi::GenericMethod ("emit_organizationNameChanged", "@brief Emitter for signal void QGuiApplication::organizationNameChanged()\nCall this method to emit this signal.", false, &_init_emitter_organizationNameChanged_0, &_call_emitter_organizationNameChanged_0); methods += new qt_gsi::GenericMethod ("emit_paletteChanged", "@brief Emitter for signal void QGuiApplication::paletteChanged(const QPalette &pal)\nCall this method to emit this signal.", false, &_init_emitter_paletteChanged_2113, &_call_emitter_paletteChanged_2113); diff --git a/src/gsiqt/qt5/QtGui/gsiDeclQIconEnginePlugin.cc b/src/gsiqt/qt5/QtGui/gsiDeclQIconEnginePlugin.cc index a002b389a..b8e9b82a7 100644 --- a/src/gsiqt/qt5/QtGui/gsiDeclQIconEnginePlugin.cc +++ b/src/gsiqt/qt5/QtGui/gsiDeclQIconEnginePlugin.cc @@ -133,6 +133,7 @@ static gsi::Methods methods_QIconEnginePlugin () { methods += new qt_gsi::GenericStaticMethod ("staticMetaObject", "@brief Obtains the static MetaObject for this class.", &_init_smo, &_call_smo); methods += new qt_gsi::GenericMethod ("qt_create", "@brief Method QIconEngine *QIconEnginePlugin::create(const QString &filename)\n", false, &_init_f_create_2025, &_call_f_create_2025); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QIconEnginePlugin::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QIconEnginePlugin::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QIconEnginePlugin::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QIconEnginePlugin::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -239,6 +240,13 @@ public: } } + // [emitter impl] void QIconEnginePlugin::objectNameChanged(const QString &objectName) + void emitter_QIconEnginePlugin_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QIconEnginePlugin::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] void QIconEnginePlugin::childEvent(QChildEvent *) void cbs_childEvent_1701_0(QChildEvent *arg1) { @@ -508,6 +516,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QIconEnginePlugin::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QIconEnginePlugin_Adaptor *)cls)->emitter_QIconEnginePlugin_objectNameChanged_4567 (arg1); +} + + // exposed int QIconEnginePlugin::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -600,6 +626,7 @@ static gsi::Methods methods_QIconEnginePlugin_Adaptor () { methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QIconEnginePlugin::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QIconEnginePlugin::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QIconEnginePlugin::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QIconEnginePlugin::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QIconEnginePlugin::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QIconEnginePlugin::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); diff --git a/src/gsiqt/qt5/QtGui/gsiDeclQImageIOPlugin.cc b/src/gsiqt/qt5/QtGui/gsiDeclQImageIOPlugin.cc index c5df0e057..eb5a7f11c 100644 --- a/src/gsiqt/qt5/QtGui/gsiDeclQImageIOPlugin.cc +++ b/src/gsiqt/qt5/QtGui/gsiDeclQImageIOPlugin.cc @@ -160,6 +160,7 @@ static gsi::Methods methods_QImageIOPlugin () { methods += new qt_gsi::GenericMethod ("capabilities", "@brief Method QFlags QImageIOPlugin::capabilities(QIODevice *device, const QByteArray &format)\n", true, &_init_f_capabilities_c3648, &_call_f_capabilities_c3648); methods += new qt_gsi::GenericMethod ("qt_create", "@brief Method QImageIOHandler *QImageIOPlugin::create(QIODevice *device, const QByteArray &format)\n", true, &_init_f_create_c3648, &_call_f_create_c3648); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QImageIOPlugin::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QImageIOPlugin::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QImageIOPlugin::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QImageIOPlugin::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -284,6 +285,13 @@ public: } } + // [emitter impl] void QImageIOPlugin::objectNameChanged(const QString &objectName) + void emitter_QImageIOPlugin_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QImageIOPlugin::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] void QImageIOPlugin::childEvent(QChildEvent *) void cbs_childEvent_1701_0(QChildEvent *arg1) { @@ -583,6 +591,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QImageIOPlugin::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QImageIOPlugin_Adaptor *)cls)->emitter_QImageIOPlugin_objectNameChanged_4567 (arg1); +} + + // exposed int QImageIOPlugin::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -677,6 +703,7 @@ static gsi::Methods methods_QImageIOPlugin_Adaptor () { methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QImageIOPlugin::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QImageIOPlugin::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QImageIOPlugin::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QImageIOPlugin::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QImageIOPlugin::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QImageIOPlugin::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); diff --git a/src/gsiqt/qt5/QtGui/gsiDeclQInputMethod.cc b/src/gsiqt/qt5/QtGui/gsiDeclQInputMethod.cc index f0d84293d..a0fb53224 100644 --- a/src/gsiqt/qt5/QtGui/gsiDeclQInputMethod.cc +++ b/src/gsiqt/qt5/QtGui/gsiDeclQInputMethod.cc @@ -445,6 +445,7 @@ static gsi::Methods methods_QInputMethod () { methods += gsi::qt_signal::target_type & > ("inputDirectionChanged(Qt::LayoutDirection)", "inputDirectionChanged", gsi::arg("newDirection"), "@brief Signal declaration for QInputMethod::inputDirectionChanged(Qt::LayoutDirection newDirection)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("keyboardRectangleChanged()", "keyboardRectangleChanged", "@brief Signal declaration for QInputMethod::keyboardRectangleChanged()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("localeChanged()", "localeChanged", "@brief Signal declaration for QInputMethod::localeChanged()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QInputMethod::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("visibleChanged()", "visibleChanged", "@brief Signal declaration for QInputMethod::visibleChanged()\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("queryFocusObject", "@brief Static method QVariant QInputMethod::queryFocusObject(Qt::InputMethodQuery query, QVariant argument)\nThis method is static and can be called without an instance.", &_init_f_queryFocusObject_3554, &_call_f_queryFocusObject_3554); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QInputMethod::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); diff --git a/src/gsiqt/qt5/QtGui/gsiDeclQIntValidator.cc b/src/gsiqt/qt5/QtGui/gsiDeclQIntValidator.cc index 5006af00d..60452693e 100644 --- a/src/gsiqt/qt5/QtGui/gsiDeclQIntValidator.cc +++ b/src/gsiqt/qt5/QtGui/gsiDeclQIntValidator.cc @@ -257,6 +257,7 @@ static gsi::Methods methods_QIntValidator () { methods += gsi::qt_signal ("bottomChanged(int)", "bottomChanged", gsi::arg("bottom"), "@brief Signal declaration for QIntValidator::bottomChanged(int bottom)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("changed()", "changed", "@brief Signal declaration for QIntValidator::changed()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QIntValidator::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QIntValidator::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("topChanged(int)", "topChanged", gsi::arg("top"), "@brief Signal declaration for QIntValidator::topChanged(int top)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QIntValidator::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QIntValidator::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); @@ -387,6 +388,13 @@ public: } } + // [emitter impl] void QIntValidator::objectNameChanged(const QString &objectName) + void emitter_QIntValidator_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QIntValidator::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] void QIntValidator::setRange(int bottom, int top) void cbs_setRange_1426_0(int bottom, int top) { @@ -751,6 +759,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QIntValidator::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QIntValidator_Adaptor *)cls)->emitter_QIntValidator_objectNameChanged_4567 (arg1); +} + + // exposed int QIntValidator::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -917,6 +943,7 @@ static gsi::Methods methods_QIntValidator_Adaptor () { methods += new qt_gsi::GenericMethod ("fixup", "@brief Virtual method void QIntValidator::fixup(QString &input)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_fixup_c1330_0, &_call_cbs_fixup_c1330_0); methods += new qt_gsi::GenericMethod ("fixup", "@hide", true, &_init_cbs_fixup_c1330_0, &_call_cbs_fixup_c1330_0, &_set_callback_cbs_fixup_c1330_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QIntValidator::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QIntValidator::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QIntValidator::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QIntValidator::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QIntValidator::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); diff --git a/src/gsiqt/qt5/QtGui/gsiDeclQMovie.cc b/src/gsiqt/qt5/QtGui/gsiDeclQMovie.cc index 26f992d63..8f97ec6b4 100644 --- a/src/gsiqt/qt5/QtGui/gsiDeclQMovie.cc +++ b/src/gsiqt/qt5/QtGui/gsiDeclQMovie.cc @@ -630,6 +630,7 @@ static gsi::Methods methods_QMovie () { methods += gsi::qt_signal::target_type & > ("error(QImageReader::ImageReaderError)", "error", gsi::arg("error"), "@brief Signal declaration for QMovie::error(QImageReader::ImageReaderError error)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("finished()", "finished", "@brief Signal declaration for QMovie::finished()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("frameChanged(int)", "frameChanged", gsi::arg("frameNumber"), "@brief Signal declaration for QMovie::frameChanged(int frameNumber)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QMovie::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("resized(const QSize &)", "resized", gsi::arg("size"), "@brief Signal declaration for QMovie::resized(const QSize &size)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("started()", "started", "@brief Signal declaration for QMovie::started()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal::target_type & > ("stateChanged(QMovie::MovieState)", "stateChanged", gsi::arg("state"), "@brief Signal declaration for QMovie::stateChanged(QMovie::MovieState state)\nYou can bind a procedure to this signal."); @@ -779,6 +780,13 @@ public: emit QMovie::frameChanged(frameNumber); } + // [emitter impl] void QMovie::objectNameChanged(const QString &objectName) + void emitter_QMovie_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QMovie::objectNameChanged(const QString &objectName)'"); + } + // [emitter impl] void QMovie::resized(const QSize &size) void emitter_QMovie_resized_1805(const QSize &size) { @@ -1146,6 +1154,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QMovie::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QMovie_Adaptor *)cls)->emitter_QMovie_objectNameChanged_4567 (arg1); +} + + // exposed int QMovie::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -1309,6 +1335,7 @@ static gsi::Methods methods_QMovie_Adaptor () { methods += new qt_gsi::GenericMethod ("emit_finished", "@brief Emitter for signal void QMovie::finished()\nCall this method to emit this signal.", false, &_init_emitter_finished_0, &_call_emitter_finished_0); methods += new qt_gsi::GenericMethod ("emit_frameChanged", "@brief Emitter for signal void QMovie::frameChanged(int frameNumber)\nCall this method to emit this signal.", false, &_init_emitter_frameChanged_767, &_call_emitter_frameChanged_767); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QMovie::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QMovie::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QMovie::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("emit_resized", "@brief Emitter for signal void QMovie::resized(const QSize &size)\nCall this method to emit this signal.", false, &_init_emitter_resized_1805, &_call_emitter_resized_1805); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QMovie::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); diff --git a/src/gsiqt/qt5/QtGui/gsiDeclQOffscreenSurface.cc b/src/gsiqt/qt5/QtGui/gsiDeclQOffscreenSurface.cc index 180970e0e..6d58d00c7 100644 --- a/src/gsiqt/qt5/QtGui/gsiDeclQOffscreenSurface.cc +++ b/src/gsiqt/qt5/QtGui/gsiDeclQOffscreenSurface.cc @@ -324,6 +324,7 @@ static gsi::Methods methods_QOffscreenSurface () { methods += new qt_gsi::GenericMethod ("size", "@brief Method QSize QOffscreenSurface::size()\nThis is a reimplementation of QSurface::size", true, &_init_f_size_c0, &_call_f_size_c0); methods += new qt_gsi::GenericMethod ("surfaceType", "@brief Method QSurface::SurfaceType QOffscreenSurface::surfaceType()\nThis is a reimplementation of QSurface::surfaceType", true, &_init_f_surfaceType_c0, &_call_f_surfaceType_c0); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QOffscreenSurface::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QOffscreenSurface::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("screenChanged(QScreen *)", "screenChanged", gsi::arg("screen"), "@brief Signal declaration for QOffscreenSurface::screenChanged(QScreen *screen)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QOffscreenSurface::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QOffscreenSurface::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); @@ -434,6 +435,13 @@ public: } } + // [emitter impl] void QOffscreenSurface::objectNameChanged(const QString &objectName) + void emitter_QOffscreenSurface_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QOffscreenSurface::objectNameChanged(const QString &objectName)'"); + } + // [emitter impl] void QOffscreenSurface::screenChanged(QScreen *screen) void emitter_QOffscreenSurface_screenChanged_1311(QScreen *screen) { @@ -737,6 +745,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QOffscreenSurface::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QOffscreenSurface_Adaptor *)cls)->emitter_QOffscreenSurface_objectNameChanged_4567 (arg1); +} + + // exposed int QOffscreenSurface::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -885,6 +911,7 @@ static gsi::Methods methods_QOffscreenSurface_Adaptor () { methods += new qt_gsi::GenericMethod ("format", "@brief Virtual method QSurfaceFormat QOffscreenSurface::format()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_format_c0_0, &_call_cbs_format_c0_0); methods += new qt_gsi::GenericMethod ("format", "@hide", true, &_init_cbs_format_c0_0, &_call_cbs_format_c0_0, &_set_callback_cbs_format_c0_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QOffscreenSurface::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QOffscreenSurface::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QOffscreenSurface::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("emit_screenChanged", "@brief Emitter for signal void QOffscreenSurface::screenChanged(QScreen *screen)\nCall this method to emit this signal.", false, &_init_emitter_screenChanged_1311, &_call_emitter_screenChanged_1311); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QOffscreenSurface::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); diff --git a/src/gsiqt/qt5/QtGui/gsiDeclQPaintDeviceWindow.cc b/src/gsiqt/qt5/QtGui/gsiDeclQPaintDeviceWindow.cc index 98826b2ef..4d2d83f27 100644 --- a/src/gsiqt/qt5/QtGui/gsiDeclQPaintDeviceWindow.cc +++ b/src/gsiqt/qt5/QtGui/gsiDeclQPaintDeviceWindow.cc @@ -298,6 +298,7 @@ static gsi::Methods methods_QPaintDeviceWindow () { methods += gsi::qt_signal ("minimumHeightChanged(int)", "minimumHeightChanged", gsi::arg("arg"), "@brief Signal declaration for QPaintDeviceWindow::minimumHeightChanged(int arg)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("minimumWidthChanged(int)", "minimumWidthChanged", gsi::arg("arg"), "@brief Signal declaration for QPaintDeviceWindow::minimumWidthChanged(int arg)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal::target_type & > ("modalityChanged(Qt::WindowModality)", "modalityChanged", gsi::arg("modality"), "@brief Signal declaration for QPaintDeviceWindow::modalityChanged(Qt::WindowModality modality)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QPaintDeviceWindow::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("opacityChanged(double)", "opacityChanged", gsi::arg("opacity"), "@brief Signal declaration for QPaintDeviceWindow::opacityChanged(double opacity)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("screenChanged(QScreen *)", "screenChanged", gsi::arg("screen"), "@brief Signal declaration for QPaintDeviceWindow::screenChanged(QScreen *screen)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal::target_type & > ("visibilityChanged(QWindow::Visibility)", "visibilityChanged", gsi::arg("visibility"), "@brief Signal declaration for QPaintDeviceWindow::visibilityChanged(QWindow::Visibility visibility)\nYou can bind a procedure to this signal."); @@ -473,6 +474,13 @@ public: emit QPaintDeviceWindow::modalityChanged(modality); } + // [emitter impl] void QPaintDeviceWindow::objectNameChanged(const QString &objectName) + void emitter_QPaintDeviceWindow_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QPaintDeviceWindow::objectNameChanged(const QString &objectName)'"); + } + // [emitter impl] void QPaintDeviceWindow::opacityChanged(double opacity) void emitter_QPaintDeviceWindow_opacityChanged_1071(double opacity) { @@ -1711,6 +1719,24 @@ static void _set_callback_cbs_nativeEvent_4678_0 (void *cls, const gsi::Callback } +// emitter void QPaintDeviceWindow::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QPaintDeviceWindow_Adaptor *)cls)->emitter_QPaintDeviceWindow_objectNameChanged_4567 (arg1); +} + + // emitter void QPaintDeviceWindow::opacityChanged(double opacity) static void _init_emitter_opacityChanged_1071 (qt_gsi::GenericMethod *decl) @@ -2229,6 +2255,7 @@ static gsi::Methods methods_QPaintDeviceWindow_Adaptor () { methods += new qt_gsi::GenericMethod ("*moveEvent", "@hide", false, &_init_cbs_moveEvent_1624_0, &_call_cbs_moveEvent_1624_0, &_set_callback_cbs_moveEvent_1624_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@brief Virtual method bool QPaintDeviceWindow::nativeEvent(const QByteArray &eventType, void *message, long int *result)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QPaintDeviceWindow::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("emit_opacityChanged", "@brief Emitter for signal void QPaintDeviceWindow::opacityChanged(double opacity)\nCall this method to emit this signal.", false, &_init_emitter_opacityChanged_1071, &_call_emitter_opacityChanged_1071); methods += new qt_gsi::GenericMethod ("*paintEvent", "@brief Virtual method void QPaintDeviceWindow::paintEvent(QPaintEvent *event)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_paintEvent_1725_0, &_call_cbs_paintEvent_1725_0); methods += new qt_gsi::GenericMethod ("*paintEvent", "@hide", false, &_init_cbs_paintEvent_1725_0, &_call_cbs_paintEvent_1725_0, &_set_callback_cbs_paintEvent_1725_0); diff --git a/src/gsiqt/qt5/QtGui/gsiDeclQPdfWriter.cc b/src/gsiqt/qt5/QtGui/gsiDeclQPdfWriter.cc index 5423e4930..260ecaf6a 100644 --- a/src/gsiqt/qt5/QtGui/gsiDeclQPdfWriter.cc +++ b/src/gsiqt/qt5/QtGui/gsiDeclQPdfWriter.cc @@ -355,6 +355,7 @@ static gsi::Methods methods_QPdfWriter () { methods += new qt_gsi::GenericMethod ("setTitle|title=", "@brief Method void QPdfWriter::setTitle(const QString &title)\n", false, &_init_f_setTitle_2025, &_call_f_setTitle_2025); methods += new qt_gsi::GenericMethod (":title", "@brief Method QString QPdfWriter::title()\n", true, &_init_f_title_c0, &_call_f_title_c0); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QPdfWriter::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QPdfWriter::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QPdfWriter::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QPdfWriter::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); methods += new qt_gsi::GenericMethod ("asQObject", "@brief Delivers the base class interface QObject of QPdfWriter\nClass QPdfWriter is derived from multiple base classes. This method delivers the QObject base class aspect.", false, &_init_f_QPdfWriter_as_QObject, &_call_f_QPdfWriter_as_QObject); @@ -474,6 +475,13 @@ public: } } + // [emitter impl] void QPdfWriter::objectNameChanged(const QString &objectName) + void emitter_QPdfWriter_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QPdfWriter::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] void QPdfWriter::setMargins(const QPagedPaintDevice::Margins &m) void cbs_setMargins_3812_0(const QPagedPaintDevice::Margins &m) { @@ -960,6 +968,24 @@ static void _set_callback_cbs_newPage_0_0 (void *cls, const gsi::Callback &cb) } +// emitter void QPdfWriter::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QPdfWriter_Adaptor *)cls)->emitter_QPdfWriter_objectNameChanged_4567 (arg1); +} + + // QPaintEngine *QPdfWriter::paintEngine() static void _init_cbs_paintEngine_c0_0 (qt_gsi::GenericMethod *decl) @@ -1192,6 +1218,7 @@ static gsi::Methods methods_QPdfWriter_Adaptor () { methods += new qt_gsi::GenericMethod ("*metric", "@hide", true, &_init_cbs_metric_c3445_0, &_call_cbs_metric_c3445_0, &_set_callback_cbs_metric_c3445_0); methods += new qt_gsi::GenericMethod ("newPage", "@brief Virtual method bool QPdfWriter::newPage()\nThis method can be reimplemented in a derived class.", false, &_init_cbs_newPage_0_0, &_call_cbs_newPage_0_0); methods += new qt_gsi::GenericMethod ("newPage", "@hide", false, &_init_cbs_newPage_0_0, &_call_cbs_newPage_0_0, &_set_callback_cbs_newPage_0_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QPdfWriter::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*paintEngine", "@brief Virtual method QPaintEngine *QPdfWriter::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("*paintEngine", "@hide", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0, &_set_callback_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QPdfWriter::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); diff --git a/src/gsiqt/qt5/QtGui/gsiDeclQPictureFormatPlugin.cc b/src/gsiqt/qt5/QtGui/gsiDeclQPictureFormatPlugin.cc index 00a72455a..49d3e5c09 100644 --- a/src/gsiqt/qt5/QtGui/gsiDeclQPictureFormatPlugin.cc +++ b/src/gsiqt/qt5/QtGui/gsiDeclQPictureFormatPlugin.cc @@ -185,6 +185,7 @@ static gsi::Methods methods_QPictureFormatPlugin () { methods += new qt_gsi::GenericMethod ("loadPicture", "@brief Method bool QPictureFormatPlugin::loadPicture(const QString &format, const QString &filename, QPicture *pic)\n", false, &_init_f_loadPicture_5269, &_call_f_loadPicture_5269); methods += new qt_gsi::GenericMethod ("savePicture", "@brief Method bool QPictureFormatPlugin::savePicture(const QString &format, const QString &filename, const QPicture &pic)\n", false, &_init_f_savePicture_5960, &_call_f_savePicture_5960); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QPictureFormatPlugin::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QPictureFormatPlugin::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QPictureFormatPlugin::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QPictureFormatPlugin::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -306,6 +307,13 @@ public: } } + // [emitter impl] void QPictureFormatPlugin::objectNameChanged(const QString &objectName) + void emitter_QPictureFormatPlugin_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QPictureFormatPlugin::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] bool QPictureFormatPlugin::savePicture(const QString &format, const QString &filename, const QPicture &pic) bool cbs_savePicture_5960_0(const QString &format, const QString &filename, const QPicture &pic) { @@ -621,6 +629,24 @@ static void _set_callback_cbs_loadPicture_5269_0 (void *cls, const gsi::Callback } +// emitter void QPictureFormatPlugin::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QPictureFormatPlugin_Adaptor *)cls)->emitter_QPictureFormatPlugin_objectNameChanged_4567 (arg1); +} + + // exposed int QPictureFormatPlugin::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -744,6 +770,7 @@ static gsi::Methods methods_QPictureFormatPlugin_Adaptor () { methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QPictureFormatPlugin::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); methods += new qt_gsi::GenericMethod ("loadPicture", "@brief Virtual method bool QPictureFormatPlugin::loadPicture(const QString &format, const QString &filename, QPicture *pic)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_loadPicture_5269_0, &_call_cbs_loadPicture_5269_0); methods += new qt_gsi::GenericMethod ("loadPicture", "@hide", false, &_init_cbs_loadPicture_5269_0, &_call_cbs_loadPicture_5269_0, &_set_callback_cbs_loadPicture_5269_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QPictureFormatPlugin::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QPictureFormatPlugin::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("savePicture", "@brief Virtual method bool QPictureFormatPlugin::savePicture(const QString &format, const QString &filename, const QPicture &pic)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_savePicture_5960_0, &_call_cbs_savePicture_5960_0); methods += new qt_gsi::GenericMethod ("savePicture", "@hide", false, &_init_cbs_savePicture_5960_0, &_call_cbs_savePicture_5960_0, &_set_callback_cbs_savePicture_5960_0); diff --git a/src/gsiqt/qt5/QtGui/gsiDeclQRasterWindow.cc b/src/gsiqt/qt5/QtGui/gsiDeclQRasterWindow.cc index 38141fadf..f546946e2 100644 --- a/src/gsiqt/qt5/QtGui/gsiDeclQRasterWindow.cc +++ b/src/gsiqt/qt5/QtGui/gsiDeclQRasterWindow.cc @@ -146,6 +146,7 @@ static gsi::Methods methods_QRasterWindow () { methods += gsi::qt_signal ("minimumHeightChanged(int)", "minimumHeightChanged", gsi::arg("arg"), "@brief Signal declaration for QRasterWindow::minimumHeightChanged(int arg)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("minimumWidthChanged(int)", "minimumWidthChanged", gsi::arg("arg"), "@brief Signal declaration for QRasterWindow::minimumWidthChanged(int arg)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal::target_type & > ("modalityChanged(Qt::WindowModality)", "modalityChanged", gsi::arg("modality"), "@brief Signal declaration for QRasterWindow::modalityChanged(Qt::WindowModality modality)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QRasterWindow::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("opacityChanged(double)", "opacityChanged", gsi::arg("opacity"), "@brief Signal declaration for QRasterWindow::opacityChanged(double opacity)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("screenChanged(QScreen *)", "screenChanged", gsi::arg("screen"), "@brief Signal declaration for QRasterWindow::screenChanged(QScreen *screen)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal::target_type & > ("visibilityChanged(QWindow::Visibility)", "visibilityChanged", gsi::arg("visibility"), "@brief Signal declaration for QRasterWindow::visibilityChanged(QWindow::Visibility visibility)\nYou can bind a procedure to this signal."); @@ -329,6 +330,13 @@ public: emit QRasterWindow::modalityChanged(modality); } + // [emitter impl] void QRasterWindow::objectNameChanged(const QString &objectName) + void emitter_QRasterWindow_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QRasterWindow::objectNameChanged(const QString &objectName)'"); + } + // [emitter impl] void QRasterWindow::opacityChanged(double opacity) void emitter_QRasterWindow_opacityChanged_1071(double opacity) { @@ -1585,6 +1593,24 @@ static void _set_callback_cbs_nativeEvent_4678_0 (void *cls, const gsi::Callback } +// emitter void QRasterWindow::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QRasterWindow_Adaptor *)cls)->emitter_QRasterWindow_objectNameChanged_4567 (arg1); +} + + // emitter void QRasterWindow::opacityChanged(double opacity) static void _init_emitter_opacityChanged_1071 (qt_gsi::GenericMethod *decl) @@ -2104,6 +2130,7 @@ static gsi::Methods methods_QRasterWindow_Adaptor () { methods += new qt_gsi::GenericMethod ("*moveEvent", "@hide", false, &_init_cbs_moveEvent_1624_0, &_call_cbs_moveEvent_1624_0, &_set_callback_cbs_moveEvent_1624_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@brief Virtual method bool QRasterWindow::nativeEvent(const QByteArray &eventType, void *message, long int *result)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QRasterWindow::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("emit_opacityChanged", "@brief Emitter for signal void QRasterWindow::opacityChanged(double opacity)\nCall this method to emit this signal.", false, &_init_emitter_opacityChanged_1071, &_call_emitter_opacityChanged_1071); methods += new qt_gsi::GenericMethod ("*paintEvent", "@brief Virtual method void QRasterWindow::paintEvent(QPaintEvent *event)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_paintEvent_1725_0, &_call_cbs_paintEvent_1725_0); methods += new qt_gsi::GenericMethod ("*paintEvent", "@hide", false, &_init_cbs_paintEvent_1725_0, &_call_cbs_paintEvent_1725_0, &_set_callback_cbs_paintEvent_1725_0); diff --git a/src/gsiqt/qt5/QtGui/gsiDeclQRegExpValidator.cc b/src/gsiqt/qt5/QtGui/gsiDeclQRegExpValidator.cc index a85f8df49..f36a43712 100644 --- a/src/gsiqt/qt5/QtGui/gsiDeclQRegExpValidator.cc +++ b/src/gsiqt/qt5/QtGui/gsiDeclQRegExpValidator.cc @@ -175,6 +175,7 @@ static gsi::Methods methods_QRegExpValidator () { methods += new qt_gsi::GenericMethod ("validate", "@brief Method QValidator::State QRegExpValidator::validate(QString &input, int &pos)\nThis is a reimplementation of QValidator::validate", true, &_init_f_validate_c2171, &_call_f_validate_c2171); methods += gsi::qt_signal ("changed()", "changed", "@brief Signal declaration for QRegExpValidator::changed()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QRegExpValidator::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QRegExpValidator::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("regExpChanged(const QRegExp &)", "regExpChanged", gsi::arg("regExp"), "@brief Signal declaration for QRegExpValidator::regExpChanged(const QRegExp ®Exp)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QRegExpValidator::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QRegExpValidator::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); @@ -299,6 +300,13 @@ public: } } + // [emitter impl] void QRegExpValidator::objectNameChanged(const QString &objectName) + void emitter_QRegExpValidator_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QRegExpValidator::objectNameChanged(const QString &objectName)'"); + } + // [emitter impl] void QRegExpValidator::regExpChanged(const QRegExp ®Exp) void emitter_QRegExpValidator_regExpChanged_1981(const QRegExp ®Exp) { @@ -626,6 +634,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QRegExpValidator::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QRegExpValidator_Adaptor *)cls)->emitter_QRegExpValidator_objectNameChanged_4567 (arg1); +} + + // exposed int QRegExpValidator::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -764,6 +790,7 @@ static gsi::Methods methods_QRegExpValidator_Adaptor () { methods += new qt_gsi::GenericMethod ("fixup", "@brief Virtual method void QRegExpValidator::fixup(QString &)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_fixup_c1330_0, &_call_cbs_fixup_c1330_0); methods += new qt_gsi::GenericMethod ("fixup", "@hide", true, &_init_cbs_fixup_c1330_0, &_call_cbs_fixup_c1330_0, &_set_callback_cbs_fixup_c1330_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QRegExpValidator::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QRegExpValidator::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QRegExpValidator::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("emit_regExpChanged", "@brief Emitter for signal void QRegExpValidator::regExpChanged(const QRegExp ®Exp)\nCall this method to emit this signal.", false, &_init_emitter_regExpChanged_1981, &_call_emitter_regExpChanged_1981); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QRegExpValidator::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); diff --git a/src/gsiqt/qt5/QtGui/gsiDeclQRegularExpressionValidator.cc b/src/gsiqt/qt5/QtGui/gsiDeclQRegularExpressionValidator.cc index 18ca390bf..bff0f4e50 100644 --- a/src/gsiqt/qt5/QtGui/gsiDeclQRegularExpressionValidator.cc +++ b/src/gsiqt/qt5/QtGui/gsiDeclQRegularExpressionValidator.cc @@ -175,6 +175,7 @@ static gsi::Methods methods_QRegularExpressionValidator () { methods += new qt_gsi::GenericMethod ("validate", "@brief Method QValidator::State QRegularExpressionValidator::validate(QString &input, int &pos)\nThis is a reimplementation of QValidator::validate", true, &_init_f_validate_c2171, &_call_f_validate_c2171); methods += gsi::qt_signal ("changed()", "changed", "@brief Signal declaration for QRegularExpressionValidator::changed()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QRegularExpressionValidator::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QRegularExpressionValidator::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("regularExpressionChanged(const QRegularExpression &)", "regularExpressionChanged", gsi::arg("re"), "@brief Signal declaration for QRegularExpressionValidator::regularExpressionChanged(const QRegularExpression &re)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QRegularExpressionValidator::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QRegularExpressionValidator::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); @@ -299,6 +300,13 @@ public: } } + // [emitter impl] void QRegularExpressionValidator::objectNameChanged(const QString &objectName) + void emitter_QRegularExpressionValidator_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QRegularExpressionValidator::objectNameChanged(const QString &objectName)'"); + } + // [emitter impl] void QRegularExpressionValidator::regularExpressionChanged(const QRegularExpression &re) void emitter_QRegularExpressionValidator_regularExpressionChanged_3188(const QRegularExpression &re) { @@ -626,6 +634,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QRegularExpressionValidator::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QRegularExpressionValidator_Adaptor *)cls)->emitter_QRegularExpressionValidator_objectNameChanged_4567 (arg1); +} + + // exposed int QRegularExpressionValidator::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -764,6 +790,7 @@ static gsi::Methods methods_QRegularExpressionValidator_Adaptor () { methods += new qt_gsi::GenericMethod ("fixup", "@brief Virtual method void QRegularExpressionValidator::fixup(QString &)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_fixup_c1330_0, &_call_cbs_fixup_c1330_0); methods += new qt_gsi::GenericMethod ("fixup", "@hide", true, &_init_cbs_fixup_c1330_0, &_call_cbs_fixup_c1330_0, &_set_callback_cbs_fixup_c1330_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QRegularExpressionValidator::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QRegularExpressionValidator::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QRegularExpressionValidator::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("emit_regularExpressionChanged", "@brief Emitter for signal void QRegularExpressionValidator::regularExpressionChanged(const QRegularExpression &re)\nCall this method to emit this signal.", false, &_init_emitter_regularExpressionChanged_3188, &_call_emitter_regularExpressionChanged_3188); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QRegularExpressionValidator::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); diff --git a/src/gsiqt/qt5/QtGui/gsiDeclQScreen.cc b/src/gsiqt/qt5/QtGui/gsiDeclQScreen.cc index e99514f31..0faa886db 100644 --- a/src/gsiqt/qt5/QtGui/gsiDeclQScreen.cc +++ b/src/gsiqt/qt5/QtGui/gsiDeclQScreen.cc @@ -672,6 +672,7 @@ static gsi::Methods methods_QScreen () { methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QScreen::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("geometryChanged(const QRect &)", "geometryChanged", gsi::arg("geometry"), "@brief Signal declaration for QScreen::geometryChanged(const QRect &geometry)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("logicalDotsPerInchChanged(double)", "logicalDotsPerInchChanged", gsi::arg("dpi"), "@brief Signal declaration for QScreen::logicalDotsPerInchChanged(double dpi)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QScreen::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal::target_type & > ("orientationChanged(Qt::ScreenOrientation)", "orientationChanged", gsi::arg("orientation"), "@brief Signal declaration for QScreen::orientationChanged(Qt::ScreenOrientation orientation)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("physicalDotsPerInchChanged(double)", "physicalDotsPerInchChanged", gsi::arg("dpi"), "@brief Signal declaration for QScreen::physicalDotsPerInchChanged(double dpi)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("physicalSizeChanged(const QSizeF &)", "physicalSizeChanged", gsi::arg("size"), "@brief Signal declaration for QScreen::physicalSizeChanged(const QSizeF &size)\nYou can bind a procedure to this signal."); @@ -774,6 +775,13 @@ public: emit QScreen::logicalDotsPerInchChanged(dpi); } + // [emitter impl] void QScreen::objectNameChanged(const QString &objectName) + void emitter_QScreen_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QScreen::objectNameChanged(const QString &objectName)'"); + } + // [emitter impl] void QScreen::orientationChanged(Qt::ScreenOrientation orientation) void emitter_QScreen_orientationChanged_2521(Qt::ScreenOrientation orientation) { @@ -1091,6 +1099,24 @@ static void _call_emitter_logicalDotsPerInchChanged_1071 (const qt_gsi::GenericM } +// emitter void QScreen::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QScreen_Adaptor *)cls)->emitter_QScreen_objectNameChanged_4567 (arg1); +} + + // emitter void QScreen::orientationChanged(Qt::ScreenOrientation orientation) static void _init_emitter_orientationChanged_2521 (qt_gsi::GenericMethod *decl) @@ -1291,6 +1317,7 @@ static gsi::Methods methods_QScreen_Adaptor () { methods += new qt_gsi::GenericMethod ("emit_geometryChanged", "@brief Emitter for signal void QScreen::geometryChanged(const QRect &geometry)\nCall this method to emit this signal.", false, &_init_emitter_geometryChanged_1792, &_call_emitter_geometryChanged_1792); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QScreen::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); methods += new qt_gsi::GenericMethod ("emit_logicalDotsPerInchChanged", "@brief Emitter for signal void QScreen::logicalDotsPerInchChanged(double dpi)\nCall this method to emit this signal.", false, &_init_emitter_logicalDotsPerInchChanged_1071, &_call_emitter_logicalDotsPerInchChanged_1071); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QScreen::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("emit_orientationChanged", "@brief Emitter for signal void QScreen::orientationChanged(Qt::ScreenOrientation orientation)\nCall this method to emit this signal.", false, &_init_emitter_orientationChanged_2521, &_call_emitter_orientationChanged_2521); methods += new qt_gsi::GenericMethod ("emit_physicalDotsPerInchChanged", "@brief Emitter for signal void QScreen::physicalDotsPerInchChanged(double dpi)\nCall this method to emit this signal.", false, &_init_emitter_physicalDotsPerInchChanged_1071, &_call_emitter_physicalDotsPerInchChanged_1071); methods += new qt_gsi::GenericMethod ("emit_physicalSizeChanged", "@brief Emitter for signal void QScreen::physicalSizeChanged(const QSizeF &size)\nCall this method to emit this signal.", false, &_init_emitter_physicalSizeChanged_1875, &_call_emitter_physicalSizeChanged_1875); diff --git a/src/gsiqt/qt5/QtGui/gsiDeclQSessionManager.cc b/src/gsiqt/qt5/QtGui/gsiDeclQSessionManager.cc index 230f1346c..e779b09d6 100644 --- a/src/gsiqt/qt5/QtGui/gsiDeclQSessionManager.cc +++ b/src/gsiqt/qt5/QtGui/gsiDeclQSessionManager.cc @@ -401,6 +401,7 @@ static gsi::Methods methods_QSessionManager () { methods += new qt_gsi::GenericMethod ("setRestartCommand|restartCommand=", "@brief Method void QSessionManager::setRestartCommand(const QStringList &)\n", false, &_init_f_setRestartCommand_2437, &_call_f_setRestartCommand_2437); methods += new qt_gsi::GenericMethod ("setRestartHint|restartHint=", "@brief Method void QSessionManager::setRestartHint(QSessionManager::RestartHint)\n", false, &_init_f_setRestartHint_3216, &_call_f_setRestartHint_3216); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QSessionManager::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QSessionManager::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QSessionManager::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QSessionManager::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; diff --git a/src/gsiqt/qt5/QtGui/gsiDeclQStandardItemModel.cc b/src/gsiqt/qt5/QtGui/gsiDeclQStandardItemModel.cc index b786235e5..a76dc9abe 100644 --- a/src/gsiqt/qt5/QtGui/gsiDeclQStandardItemModel.cc +++ b/src/gsiqt/qt5/QtGui/gsiDeclQStandardItemModel.cc @@ -1368,12 +1368,27 @@ static gsi::Methods methods_QStandardItemModel () { methods += new qt_gsi::GenericMethod ("takeRow", "@brief Method QList QStandardItemModel::takeRow(int row)\n", false, &_init_f_takeRow_767, &_call_f_takeRow_767); methods += new qt_gsi::GenericMethod ("takeVerticalHeaderItem", "@brief Method QStandardItem *QStandardItemModel::takeVerticalHeaderItem(int row)\n", false, &_init_f_takeVerticalHeaderItem_767, &_call_f_takeVerticalHeaderItem_767); methods += new qt_gsi::GenericMethod ("verticalHeaderItem", "@brief Method QStandardItem *QStandardItemModel::verticalHeaderItem(int row)\n", true, &_init_f_verticalHeaderItem_c767, &_call_f_verticalHeaderItem_c767); + methods += gsi::qt_signal ("columnsAboutToBeInserted(const QModelIndex &, int, int)", "columnsAboutToBeInserted", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QStandardItemModel::columnsAboutToBeInserted(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("columnsAboutToBeMoved(const QModelIndex &, int, int, const QModelIndex &, int)", "columnsAboutToBeMoved", gsi::arg("sourceParent"), gsi::arg("sourceStart"), gsi::arg("sourceEnd"), gsi::arg("destinationParent"), gsi::arg("destinationColumn"), "@brief Signal declaration for QStandardItemModel::columnsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("columnsAboutToBeRemoved(const QModelIndex &, int, int)", "columnsAboutToBeRemoved", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QStandardItemModel::columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("columnsInserted(const QModelIndex &, int, int)", "columnsInserted", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QStandardItemModel::columnsInserted(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("columnsMoved(const QModelIndex &, int, int, const QModelIndex &, int)", "columnsMoved", gsi::arg("parent"), gsi::arg("start"), gsi::arg("end"), gsi::arg("destination"), gsi::arg("column"), "@brief Signal declaration for QStandardItemModel::columnsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("columnsRemoved(const QModelIndex &, int, int)", "columnsRemoved", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QStandardItemModel::columnsRemoved(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal & > ("dataChanged(const QModelIndex &, const QModelIndex &, const QVector &)", "dataChanged", gsi::arg("topLeft"), gsi::arg("bottomRight"), gsi::arg("roles"), "@brief Signal declaration for QStandardItemModel::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector &roles)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QStandardItemModel::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal::target_type &, int, int > ("headerDataChanged(Qt::Orientation, int, int)", "headerDataChanged", gsi::arg("orientation"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QStandardItemModel::headerDataChanged(Qt::Orientation orientation, int first, int last)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("itemChanged(QStandardItem *)", "itemChanged", gsi::arg("item"), "@brief Signal declaration for QStandardItemModel::itemChanged(QStandardItem *item)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal &, const qt_gsi::Converter::target_type & > ("layoutAboutToBeChanged(const QList &, QAbstractItemModel::LayoutChangeHint)", "layoutAboutToBeChanged", gsi::arg("parents"), gsi::arg("hint"), "@brief Signal declaration for QStandardItemModel::layoutAboutToBeChanged(const QList &parents, QAbstractItemModel::LayoutChangeHint hint)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal &, const qt_gsi::Converter::target_type & > ("layoutChanged(const QList &, QAbstractItemModel::LayoutChangeHint)", "layoutChanged", gsi::arg("parents"), gsi::arg("hint"), "@brief Signal declaration for QStandardItemModel::layoutChanged(const QList &parents, QAbstractItemModel::LayoutChangeHint hint)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("modelAboutToBeReset()", "modelAboutToBeReset", "@brief Signal declaration for QStandardItemModel::modelAboutToBeReset()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("modelReset()", "modelReset", "@brief Signal declaration for QStandardItemModel::modelReset()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QStandardItemModel::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsAboutToBeInserted(const QModelIndex &, int, int)", "rowsAboutToBeInserted", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QStandardItemModel::rowsAboutToBeInserted(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsAboutToBeMoved(const QModelIndex &, int, int, const QModelIndex &, int)", "rowsAboutToBeMoved", gsi::arg("sourceParent"), gsi::arg("sourceStart"), gsi::arg("sourceEnd"), gsi::arg("destinationParent"), gsi::arg("destinationRow"), "@brief Signal declaration for QStandardItemModel::rowsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsAboutToBeRemoved(const QModelIndex &, int, int)", "rowsAboutToBeRemoved", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QStandardItemModel::rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsInserted(const QModelIndex &, int, int)", "rowsInserted", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QStandardItemModel::rowsInserted(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsMoved(const QModelIndex &, int, int, const QModelIndex &, int)", "rowsMoved", gsi::arg("parent"), gsi::arg("start"), gsi::arg("end"), gsi::arg("destination"), gsi::arg("row"), "@brief Signal declaration for QStandardItemModel::rowsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsRemoved(const QModelIndex &, int, int)", "rowsRemoved", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QStandardItemModel::rowsRemoved(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QStandardItemModel::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QStandardItemModel::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -1610,6 +1625,64 @@ public: } } + // [emitter impl] void QStandardItemModel::columnsAboutToBeInserted(const QModelIndex &parent, int first, int last) + void emitter_QStandardItemModel_columnsAboutToBeInserted_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QStandardItemModel::columnsAboutToBeInserted(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QStandardItemModel::columnsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn) + void emitter_QStandardItemModel_columnsAboutToBeMoved_10318(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn) + { + __SUPPRESS_UNUSED_WARNING (sourceParent); + __SUPPRESS_UNUSED_WARNING (sourceStart); + __SUPPRESS_UNUSED_WARNING (sourceEnd); + __SUPPRESS_UNUSED_WARNING (destinationParent); + __SUPPRESS_UNUSED_WARNING (destinationColumn); + throw tl::Exception ("Can't emit private signal 'void QStandardItemModel::columnsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn)'"); + } + + // [emitter impl] void QStandardItemModel::columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last) + void emitter_QStandardItemModel_columnsAboutToBeRemoved_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QStandardItemModel::columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QStandardItemModel::columnsInserted(const QModelIndex &parent, int first, int last) + void emitter_QStandardItemModel_columnsInserted_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QStandardItemModel::columnsInserted(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QStandardItemModel::columnsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column) + void emitter_QStandardItemModel_columnsMoved_10318(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (start); + __SUPPRESS_UNUSED_WARNING (end); + __SUPPRESS_UNUSED_WARNING (destination); + __SUPPRESS_UNUSED_WARNING (column); + throw tl::Exception ("Can't emit private signal 'void QStandardItemModel::columnsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column)'"); + } + + // [emitter impl] void QStandardItemModel::columnsRemoved(const QModelIndex &parent, int first, int last) + void emitter_QStandardItemModel_columnsRemoved_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QStandardItemModel::columnsRemoved(const QModelIndex &parent, int first, int last)'"); + } + // [adaptor impl] QVariant QStandardItemModel::data(const QModelIndex &index, int role) QVariant cbs_data_c3054_1(const QModelIndex &index, int role) const { @@ -1871,6 +1944,18 @@ public: } } + // [emitter impl] void QStandardItemModel::modelAboutToBeReset() + void emitter_QStandardItemModel_modelAboutToBeReset_3767() + { + throw tl::Exception ("Can't emit private signal 'void QStandardItemModel::modelAboutToBeReset()'"); + } + + // [emitter impl] void QStandardItemModel::modelReset() + void emitter_QStandardItemModel_modelReset_3767() + { + throw tl::Exception ("Can't emit private signal 'void QStandardItemModel::modelReset()'"); + } + // [adaptor impl] bool QStandardItemModel::moveColumns(const QModelIndex &sourceParent, int sourceColumn, int count, const QModelIndex &destinationParent, int destinationChild) bool cbs_moveColumns_6659_0(const QModelIndex &sourceParent, int sourceColumn, int count, const QModelIndex &destinationParent, int destinationChild) { @@ -1901,6 +1986,13 @@ public: } } + // [emitter impl] void QStandardItemModel::objectNameChanged(const QString &objectName) + void emitter_QStandardItemModel_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QStandardItemModel::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QModelIndex QStandardItemModel::parent(const QModelIndex &child) QModelIndex cbs_parent_c2395_0(const QModelIndex &child) const { @@ -1991,6 +2083,64 @@ public: } } + // [emitter impl] void QStandardItemModel::rowsAboutToBeInserted(const QModelIndex &parent, int first, int last) + void emitter_QStandardItemModel_rowsAboutToBeInserted_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QStandardItemModel::rowsAboutToBeInserted(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QStandardItemModel::rowsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow) + void emitter_QStandardItemModel_rowsAboutToBeMoved_10318(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow) + { + __SUPPRESS_UNUSED_WARNING (sourceParent); + __SUPPRESS_UNUSED_WARNING (sourceStart); + __SUPPRESS_UNUSED_WARNING (sourceEnd); + __SUPPRESS_UNUSED_WARNING (destinationParent); + __SUPPRESS_UNUSED_WARNING (destinationRow); + throw tl::Exception ("Can't emit private signal 'void QStandardItemModel::rowsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow)'"); + } + + // [emitter impl] void QStandardItemModel::rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last) + void emitter_QStandardItemModel_rowsAboutToBeRemoved_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QStandardItemModel::rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QStandardItemModel::rowsInserted(const QModelIndex &parent, int first, int last) + void emitter_QStandardItemModel_rowsInserted_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QStandardItemModel::rowsInserted(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QStandardItemModel::rowsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row) + void emitter_QStandardItemModel_rowsMoved_10318(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (start); + __SUPPRESS_UNUSED_WARNING (end); + __SUPPRESS_UNUSED_WARNING (destination); + __SUPPRESS_UNUSED_WARNING (row); + throw tl::Exception ("Can't emit private signal 'void QStandardItemModel::rowsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row)'"); + } + + // [emitter impl] void QStandardItemModel::rowsRemoved(const QModelIndex &parent, int first, int last) + void emitter_QStandardItemModel_rowsRemoved_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QStandardItemModel::rowsRemoved(const QModelIndex &parent, int first, int last)'"); + } + // [adaptor impl] bool QStandardItemModel::setData(const QModelIndex &index, const QVariant &value, int role) bool cbs_setData_5065_1(const QModelIndex &index, const QVariant &value, int role) { @@ -2619,6 +2769,162 @@ static void _set_callback_cbs_columnCount_c2395_1 (void *cls, const gsi::Callbac } +// emitter void QStandardItemModel::columnsAboutToBeInserted(const QModelIndex &parent, int first, int last) + +static void _init_emitter_columnsAboutToBeInserted_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_columnsAboutToBeInserted_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QStandardItemModel_Adaptor *)cls)->emitter_QStandardItemModel_columnsAboutToBeInserted_7372 (arg1, arg2, arg3); +} + + +// emitter void QStandardItemModel::columnsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn) + +static void _init_emitter_columnsAboutToBeMoved_10318 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("sourceParent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("sourceStart"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("sourceEnd"); + decl->add_arg (argspec_2); + static gsi::ArgSpecBase argspec_3 ("destinationParent"); + decl->add_arg (argspec_3); + static gsi::ArgSpecBase argspec_4 ("destinationColumn"); + decl->add_arg (argspec_4); + decl->set_return (); +} + +static void _call_emitter_columnsAboutToBeMoved_10318 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + const QModelIndex &arg4 = gsi::arg_reader() (args, heap); + int arg5 = gsi::arg_reader() (args, heap); + ((QStandardItemModel_Adaptor *)cls)->emitter_QStandardItemModel_columnsAboutToBeMoved_10318 (arg1, arg2, arg3, arg4, arg5); +} + + +// emitter void QStandardItemModel::columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last) + +static void _init_emitter_columnsAboutToBeRemoved_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_columnsAboutToBeRemoved_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QStandardItemModel_Adaptor *)cls)->emitter_QStandardItemModel_columnsAboutToBeRemoved_7372 (arg1, arg2, arg3); +} + + +// emitter void QStandardItemModel::columnsInserted(const QModelIndex &parent, int first, int last) + +static void _init_emitter_columnsInserted_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_columnsInserted_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QStandardItemModel_Adaptor *)cls)->emitter_QStandardItemModel_columnsInserted_7372 (arg1, arg2, arg3); +} + + +// emitter void QStandardItemModel::columnsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column) + +static void _init_emitter_columnsMoved_10318 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("start"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("end"); + decl->add_arg (argspec_2); + static gsi::ArgSpecBase argspec_3 ("destination"); + decl->add_arg (argspec_3); + static gsi::ArgSpecBase argspec_4 ("column"); + decl->add_arg (argspec_4); + decl->set_return (); +} + +static void _call_emitter_columnsMoved_10318 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + const QModelIndex &arg4 = gsi::arg_reader() (args, heap); + int arg5 = gsi::arg_reader() (args, heap); + ((QStandardItemModel_Adaptor *)cls)->emitter_QStandardItemModel_columnsMoved_10318 (arg1, arg2, arg3, arg4, arg5); +} + + +// emitter void QStandardItemModel::columnsRemoved(const QModelIndex &parent, int first, int last) + +static void _init_emitter_columnsRemoved_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_columnsRemoved_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QStandardItemModel_Adaptor *)cls)->emitter_QStandardItemModel_columnsRemoved_7372 (arg1, arg2, arg3); +} + + // exposed QModelIndex QStandardItemModel::createIndex(int row, int column, void *data) static void _init_fp_createIndex_c2374 (qt_gsi::GenericMethod *decl) @@ -3409,6 +3715,34 @@ static void _set_callback_cbs_mimeTypes_c0_0 (void *cls, const gsi::Callback &cb } +// emitter void QStandardItemModel::modelAboutToBeReset() + +static void _init_emitter_modelAboutToBeReset_3767 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_emitter_modelAboutToBeReset_3767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + ((QStandardItemModel_Adaptor *)cls)->emitter_QStandardItemModel_modelAboutToBeReset_3767 (); +} + + +// emitter void QStandardItemModel::modelReset() + +static void _init_emitter_modelReset_3767 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_emitter_modelReset_3767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + ((QStandardItemModel_Adaptor *)cls)->emitter_QStandardItemModel_modelReset_3767 (); +} + + // bool QStandardItemModel::moveColumns(const QModelIndex &sourceParent, int sourceColumn, int count, const QModelIndex &destinationParent, int destinationChild) static void _init_cbs_moveColumns_6659_0 (qt_gsi::GenericMethod *decl) @@ -3479,6 +3813,24 @@ static void _set_callback_cbs_moveRows_6659_0 (void *cls, const gsi::Callback &c } +// emitter void QStandardItemModel::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QStandardItemModel_Adaptor *)cls)->emitter_QStandardItemModel_objectNameChanged_4567 (arg1); +} + + // QModelIndex QStandardItemModel::parent(const QModelIndex &child) static void _init_cbs_parent_c2395_0 (qt_gsi::GenericMethod *decl) @@ -3669,6 +4021,162 @@ static void _set_callback_cbs_rowCount_c2395_1 (void *cls, const gsi::Callback & } +// emitter void QStandardItemModel::rowsAboutToBeInserted(const QModelIndex &parent, int first, int last) + +static void _init_emitter_rowsAboutToBeInserted_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_rowsAboutToBeInserted_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QStandardItemModel_Adaptor *)cls)->emitter_QStandardItemModel_rowsAboutToBeInserted_7372 (arg1, arg2, arg3); +} + + +// emitter void QStandardItemModel::rowsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow) + +static void _init_emitter_rowsAboutToBeMoved_10318 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("sourceParent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("sourceStart"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("sourceEnd"); + decl->add_arg (argspec_2); + static gsi::ArgSpecBase argspec_3 ("destinationParent"); + decl->add_arg (argspec_3); + static gsi::ArgSpecBase argspec_4 ("destinationRow"); + decl->add_arg (argspec_4); + decl->set_return (); +} + +static void _call_emitter_rowsAboutToBeMoved_10318 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + const QModelIndex &arg4 = gsi::arg_reader() (args, heap); + int arg5 = gsi::arg_reader() (args, heap); + ((QStandardItemModel_Adaptor *)cls)->emitter_QStandardItemModel_rowsAboutToBeMoved_10318 (arg1, arg2, arg3, arg4, arg5); +} + + +// emitter void QStandardItemModel::rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last) + +static void _init_emitter_rowsAboutToBeRemoved_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_rowsAboutToBeRemoved_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QStandardItemModel_Adaptor *)cls)->emitter_QStandardItemModel_rowsAboutToBeRemoved_7372 (arg1, arg2, arg3); +} + + +// emitter void QStandardItemModel::rowsInserted(const QModelIndex &parent, int first, int last) + +static void _init_emitter_rowsInserted_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_rowsInserted_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QStandardItemModel_Adaptor *)cls)->emitter_QStandardItemModel_rowsInserted_7372 (arg1, arg2, arg3); +} + + +// emitter void QStandardItemModel::rowsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row) + +static void _init_emitter_rowsMoved_10318 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("start"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("end"); + decl->add_arg (argspec_2); + static gsi::ArgSpecBase argspec_3 ("destination"); + decl->add_arg (argspec_3); + static gsi::ArgSpecBase argspec_4 ("row"); + decl->add_arg (argspec_4); + decl->set_return (); +} + +static void _call_emitter_rowsMoved_10318 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + const QModelIndex &arg4 = gsi::arg_reader() (args, heap); + int arg5 = gsi::arg_reader() (args, heap); + ((QStandardItemModel_Adaptor *)cls)->emitter_QStandardItemModel_rowsMoved_10318 (arg1, arg2, arg3, arg4, arg5); +} + + +// emitter void QStandardItemModel::rowsRemoved(const QModelIndex &parent, int first, int last) + +static void _init_emitter_rowsRemoved_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_rowsRemoved_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QStandardItemModel_Adaptor *)cls)->emitter_QStandardItemModel_rowsRemoved_7372 (arg1, arg2, arg3); +} + + // exposed QObject *QStandardItemModel::sender() static void _init_fp_sender_c0 (qt_gsi::GenericMethod *decl) @@ -3972,6 +4480,12 @@ static gsi::Methods methods_QStandardItemModel_Adaptor () { methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("columnCount", "@brief Virtual method int QStandardItemModel::columnCount(const QModelIndex &parent)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_columnCount_c2395_1, &_call_cbs_columnCount_c2395_1); methods += new qt_gsi::GenericMethod ("columnCount", "@hide", true, &_init_cbs_columnCount_c2395_1, &_call_cbs_columnCount_c2395_1, &_set_callback_cbs_columnCount_c2395_1); + methods += new qt_gsi::GenericMethod ("emit_columnsAboutToBeInserted", "@brief Emitter for signal void QStandardItemModel::columnsAboutToBeInserted(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_columnsAboutToBeInserted_7372, &_call_emitter_columnsAboutToBeInserted_7372); + methods += new qt_gsi::GenericMethod ("emit_columnsAboutToBeMoved", "@brief Emitter for signal void QStandardItemModel::columnsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn)\nCall this method to emit this signal.", false, &_init_emitter_columnsAboutToBeMoved_10318, &_call_emitter_columnsAboutToBeMoved_10318); + methods += new qt_gsi::GenericMethod ("emit_columnsAboutToBeRemoved", "@brief Emitter for signal void QStandardItemModel::columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_columnsAboutToBeRemoved_7372, &_call_emitter_columnsAboutToBeRemoved_7372); + methods += new qt_gsi::GenericMethod ("emit_columnsInserted", "@brief Emitter for signal void QStandardItemModel::columnsInserted(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_columnsInserted_7372, &_call_emitter_columnsInserted_7372); + methods += new qt_gsi::GenericMethod ("emit_columnsMoved", "@brief Emitter for signal void QStandardItemModel::columnsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column)\nCall this method to emit this signal.", false, &_init_emitter_columnsMoved_10318, &_call_emitter_columnsMoved_10318); + methods += new qt_gsi::GenericMethod ("emit_columnsRemoved", "@brief Emitter for signal void QStandardItemModel::columnsRemoved(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_columnsRemoved_7372, &_call_emitter_columnsRemoved_7372); methods += new qt_gsi::GenericMethod ("*createIndex", "@brief Method QModelIndex QStandardItemModel::createIndex(int row, int column, void *data)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_createIndex_c2374, &_call_fp_createIndex_c2374); methods += new qt_gsi::GenericMethod ("*createIndex", "@brief Method QModelIndex QStandardItemModel::createIndex(int row, int column, quintptr id)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_createIndex_c2657, &_call_fp_createIndex_c2657); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QStandardItemModel::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); @@ -4024,10 +4538,13 @@ static gsi::Methods methods_QStandardItemModel_Adaptor () { methods += new qt_gsi::GenericMethod ("mimeData", "@hide", true, &_init_cbs_mimeData_c3010_0, &_call_cbs_mimeData_c3010_0, &_set_callback_cbs_mimeData_c3010_0); methods += new qt_gsi::GenericMethod ("mimeTypes", "@brief Virtual method QStringList QStandardItemModel::mimeTypes()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_mimeTypes_c0_0, &_call_cbs_mimeTypes_c0_0); methods += new qt_gsi::GenericMethod ("mimeTypes", "@hide", true, &_init_cbs_mimeTypes_c0_0, &_call_cbs_mimeTypes_c0_0, &_set_callback_cbs_mimeTypes_c0_0); + methods += new qt_gsi::GenericMethod ("emit_modelAboutToBeReset", "@brief Emitter for signal void QStandardItemModel::modelAboutToBeReset()\nCall this method to emit this signal.", false, &_init_emitter_modelAboutToBeReset_3767, &_call_emitter_modelAboutToBeReset_3767); + methods += new qt_gsi::GenericMethod ("emit_modelReset", "@brief Emitter for signal void QStandardItemModel::modelReset()\nCall this method to emit this signal.", false, &_init_emitter_modelReset_3767, &_call_emitter_modelReset_3767); methods += new qt_gsi::GenericMethod ("moveColumns", "@brief Virtual method bool QStandardItemModel::moveColumns(const QModelIndex &sourceParent, int sourceColumn, int count, const QModelIndex &destinationParent, int destinationChild)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_moveColumns_6659_0, &_call_cbs_moveColumns_6659_0); methods += new qt_gsi::GenericMethod ("moveColumns", "@hide", false, &_init_cbs_moveColumns_6659_0, &_call_cbs_moveColumns_6659_0, &_set_callback_cbs_moveColumns_6659_0); methods += new qt_gsi::GenericMethod ("moveRows", "@brief Virtual method bool QStandardItemModel::moveRows(const QModelIndex &sourceParent, int sourceRow, int count, const QModelIndex &destinationParent, int destinationChild)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_moveRows_6659_0, &_call_cbs_moveRows_6659_0); methods += new qt_gsi::GenericMethod ("moveRows", "@hide", false, &_init_cbs_moveRows_6659_0, &_call_cbs_moveRows_6659_0, &_set_callback_cbs_moveRows_6659_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QStandardItemModel::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("parent", "@brief Virtual method QModelIndex QStandardItemModel::parent(const QModelIndex &child)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_parent_c2395_0, &_call_cbs_parent_c2395_0); methods += new qt_gsi::GenericMethod ("parent", "@hide", true, &_init_cbs_parent_c2395_0, &_call_cbs_parent_c2395_0, &_set_callback_cbs_parent_c2395_0); methods += new qt_gsi::GenericMethod ("*persistentIndexList", "@brief Method QList QStandardItemModel::persistentIndexList()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_persistentIndexList_c0, &_call_fp_persistentIndexList_c0); @@ -4043,6 +4560,12 @@ static gsi::Methods methods_QStandardItemModel_Adaptor () { methods += new qt_gsi::GenericMethod ("roleNames", "@hide", true, &_init_cbs_roleNames_c0_0, &_call_cbs_roleNames_c0_0, &_set_callback_cbs_roleNames_c0_0); methods += new qt_gsi::GenericMethod ("rowCount", "@brief Virtual method int QStandardItemModel::rowCount(const QModelIndex &parent)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_rowCount_c2395_1, &_call_cbs_rowCount_c2395_1); methods += new qt_gsi::GenericMethod ("rowCount", "@hide", true, &_init_cbs_rowCount_c2395_1, &_call_cbs_rowCount_c2395_1, &_set_callback_cbs_rowCount_c2395_1); + methods += new qt_gsi::GenericMethod ("emit_rowsAboutToBeInserted", "@brief Emitter for signal void QStandardItemModel::rowsAboutToBeInserted(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_rowsAboutToBeInserted_7372, &_call_emitter_rowsAboutToBeInserted_7372); + methods += new qt_gsi::GenericMethod ("emit_rowsAboutToBeMoved", "@brief Emitter for signal void QStandardItemModel::rowsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow)\nCall this method to emit this signal.", false, &_init_emitter_rowsAboutToBeMoved_10318, &_call_emitter_rowsAboutToBeMoved_10318); + methods += new qt_gsi::GenericMethod ("emit_rowsAboutToBeRemoved", "@brief Emitter for signal void QStandardItemModel::rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_rowsAboutToBeRemoved_7372, &_call_emitter_rowsAboutToBeRemoved_7372); + methods += new qt_gsi::GenericMethod ("emit_rowsInserted", "@brief Emitter for signal void QStandardItemModel::rowsInserted(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_rowsInserted_7372, &_call_emitter_rowsInserted_7372); + methods += new qt_gsi::GenericMethod ("emit_rowsMoved", "@brief Emitter for signal void QStandardItemModel::rowsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row)\nCall this method to emit this signal.", false, &_init_emitter_rowsMoved_10318, &_call_emitter_rowsMoved_10318); + methods += new qt_gsi::GenericMethod ("emit_rowsRemoved", "@brief Emitter for signal void QStandardItemModel::rowsRemoved(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_rowsRemoved_7372, &_call_emitter_rowsRemoved_7372); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QStandardItemModel::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QStandardItemModel::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); methods += new qt_gsi::GenericMethod ("setData", "@brief Virtual method bool QStandardItemModel::setData(const QModelIndex &index, const QVariant &value, int role)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_setData_5065_1, &_call_cbs_setData_5065_1); diff --git a/src/gsiqt/qt5/QtGui/gsiDeclQStyleHints.cc b/src/gsiqt/qt5/QtGui/gsiDeclQStyleHints.cc index d463cdfed..e549bb142 100644 --- a/src/gsiqt/qt5/QtGui/gsiDeclQStyleHints.cc +++ b/src/gsiqt/qt5/QtGui/gsiDeclQStyleHints.cc @@ -476,6 +476,7 @@ static gsi::Methods methods_QStyleHints () { methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QStyleHints::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("keyboardInputIntervalChanged(int)", "keyboardInputIntervalChanged", gsi::arg("keyboardInputInterval"), "@brief Signal declaration for QStyleHints::keyboardInputIntervalChanged(int keyboardInputInterval)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("mouseDoubleClickIntervalChanged(int)", "mouseDoubleClickIntervalChanged", gsi::arg("mouseDoubleClickInterval"), "@brief Signal declaration for QStyleHints::mouseDoubleClickIntervalChanged(int mouseDoubleClickInterval)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QStyleHints::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("startDragDistanceChanged(int)", "startDragDistanceChanged", gsi::arg("startDragDistance"), "@brief Signal declaration for QStyleHints::startDragDistanceChanged(int startDragDistance)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("startDragTimeChanged(int)", "startDragTimeChanged", gsi::arg("startDragTime"), "@brief Signal declaration for QStyleHints::startDragTimeChanged(int startDragTime)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QStyleHints::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); @@ -574,6 +575,13 @@ public: emit QStyleHints::mouseDoubleClickIntervalChanged(mouseDoubleClickInterval); } + // [emitter impl] void QStyleHints::objectNameChanged(const QString &objectName) + void emitter_QStyleHints_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QStyleHints::objectNameChanged(const QString &objectName)'"); + } + // [emitter impl] void QStyleHints::startDragDistanceChanged(int startDragDistance) void emitter_QStyleHints_startDragDistanceChanged_767(int startDragDistance) { @@ -867,6 +875,24 @@ static void _call_emitter_mouseDoubleClickIntervalChanged_767 (const qt_gsi::Gen } +// emitter void QStyleHints::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QStyleHints_Adaptor *)cls)->emitter_QStyleHints_objectNameChanged_4567 (arg1); +} + + // exposed int QStyleHints::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -995,6 +1021,7 @@ static gsi::Methods methods_QStyleHints_Adaptor () { methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QStyleHints::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); methods += new qt_gsi::GenericMethod ("emit_keyboardInputIntervalChanged", "@brief Emitter for signal void QStyleHints::keyboardInputIntervalChanged(int keyboardInputInterval)\nCall this method to emit this signal.", false, &_init_emitter_keyboardInputIntervalChanged_767, &_call_emitter_keyboardInputIntervalChanged_767); methods += new qt_gsi::GenericMethod ("emit_mouseDoubleClickIntervalChanged", "@brief Emitter for signal void QStyleHints::mouseDoubleClickIntervalChanged(int mouseDoubleClickInterval)\nCall this method to emit this signal.", false, &_init_emitter_mouseDoubleClickIntervalChanged_767, &_call_emitter_mouseDoubleClickIntervalChanged_767); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QStyleHints::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QStyleHints::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QStyleHints::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QStyleHints::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); diff --git a/src/gsiqt/qt5/QtGui/gsiDeclQSyntaxHighlighter.cc b/src/gsiqt/qt5/QtGui/gsiDeclQSyntaxHighlighter.cc index fe28daebb..6e86db27f 100644 --- a/src/gsiqt/qt5/QtGui/gsiDeclQSyntaxHighlighter.cc +++ b/src/gsiqt/qt5/QtGui/gsiDeclQSyntaxHighlighter.cc @@ -193,6 +193,7 @@ static gsi::Methods methods_QSyntaxHighlighter () { methods += new qt_gsi::GenericMethod ("rehighlightBlock", "@brief Method void QSyntaxHighlighter::rehighlightBlock(const QTextBlock &block)\n", false, &_init_f_rehighlightBlock_2306, &_call_f_rehighlightBlock_2306); methods += new qt_gsi::GenericMethod ("setDocument|document=", "@brief Method void QSyntaxHighlighter::setDocument(QTextDocument *doc)\n", false, &_init_f_setDocument_1955, &_call_f_setDocument_1955); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QSyntaxHighlighter::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QSyntaxHighlighter::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QSyntaxHighlighter::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QSyntaxHighlighter::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -333,6 +334,13 @@ public: } } + // [emitter impl] void QSyntaxHighlighter::objectNameChanged(const QString &objectName) + void emitter_QSyntaxHighlighter_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QSyntaxHighlighter::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] void QSyntaxHighlighter::childEvent(QChildEvent *) void cbs_childEvent_1701_0(QChildEvent *arg1) { @@ -697,6 +705,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QSyntaxHighlighter::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QSyntaxHighlighter_Adaptor *)cls)->emitter_QSyntaxHighlighter_objectNameChanged_4567 (arg1); +} + + // exposed int QSyntaxHighlighter::previousBlockState() static void _init_fp_previousBlockState_c0 (qt_gsi::GenericMethod *decl) @@ -921,6 +947,7 @@ static gsi::Methods methods_QSyntaxHighlighter_Adaptor () { methods += new qt_gsi::GenericMethod ("*highlightBlock", "@brief Virtual method void QSyntaxHighlighter::highlightBlock(const QString &text)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_highlightBlock_2025_0, &_call_cbs_highlightBlock_2025_0); methods += new qt_gsi::GenericMethod ("*highlightBlock", "@hide", false, &_init_cbs_highlightBlock_2025_0, &_call_cbs_highlightBlock_2025_0, &_set_callback_cbs_highlightBlock_2025_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QSyntaxHighlighter::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QSyntaxHighlighter::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*previousBlockState", "@brief Method int QSyntaxHighlighter::previousBlockState()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_previousBlockState_c0, &_call_fp_previousBlockState_c0); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QSyntaxHighlighter::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QSyntaxHighlighter::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); diff --git a/src/gsiqt/qt5/QtGui/gsiDeclQTextBlockGroup.cc b/src/gsiqt/qt5/QtGui/gsiDeclQTextBlockGroup.cc index c44b51611..a5330d7ce 100644 --- a/src/gsiqt/qt5/QtGui/gsiDeclQTextBlockGroup.cc +++ b/src/gsiqt/qt5/QtGui/gsiDeclQTextBlockGroup.cc @@ -115,6 +115,7 @@ static gsi::Methods methods_QTextBlockGroup () { gsi::Methods methods; methods += new qt_gsi::GenericStaticMethod ("staticMetaObject", "@brief Obtains the static MetaObject for this class.", &_init_smo, &_call_smo); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QTextBlockGroup::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QTextBlockGroup::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QTextBlockGroup::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QTextBlockGroup::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -203,6 +204,13 @@ public: } } + // [emitter impl] void QTextBlockGroup::objectNameChanged(const QString &objectName) + void emitter_QTextBlockGroup_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QTextBlockGroup::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] void QTextBlockGroup::blockFormatChanged(const QTextBlock &block) void cbs_blockFormatChanged_2306_0(const QTextBlock &block) { @@ -564,6 +572,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QTextBlockGroup::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QTextBlockGroup_Adaptor *)cls)->emitter_QTextBlockGroup_objectNameChanged_4567 (arg1); +} + + // exposed int QTextBlockGroup::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -679,6 +705,7 @@ static gsi::Methods methods_QTextBlockGroup_Adaptor () { methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QTextBlockGroup::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QTextBlockGroup::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QTextBlockGroup::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QTextBlockGroup::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QTextBlockGroup::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QTextBlockGroup::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); diff --git a/src/gsiqt/qt5/QtGui/gsiDeclQTextDocument.cc b/src/gsiqt/qt5/QtGui/gsiDeclQTextDocument.cc index ff480b094..6523e3702 100644 --- a/src/gsiqt/qt5/QtGui/gsiDeclQTextDocument.cc +++ b/src/gsiqt/qt5/QtGui/gsiDeclQTextDocument.cc @@ -1628,6 +1628,7 @@ static gsi::Methods methods_QTextDocument () { methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QTextDocument::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("documentLayoutChanged()", "documentLayoutChanged", "@brief Signal declaration for QTextDocument::documentLayoutChanged()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("modificationChanged(bool)", "modificationChanged", gsi::arg("m"), "@brief Signal declaration for QTextDocument::modificationChanged(bool m)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QTextDocument::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("redoAvailable(bool)", "redoAvailable", gsi::arg("arg1"), "@brief Signal declaration for QTextDocument::redoAvailable(bool)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("undoAvailable(bool)", "undoAvailable", gsi::arg("arg1"), "@brief Signal declaration for QTextDocument::undoAvailable(bool)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("undoCommandAdded()", "undoCommandAdded", "@brief Signal declaration for QTextDocument::undoCommandAdded()\nYou can bind a procedure to this signal."); @@ -1790,6 +1791,13 @@ public: emit QTextDocument::modificationChanged(m); } + // [emitter impl] void QTextDocument::objectNameChanged(const QString &objectName) + void emitter_QTextDocument_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QTextDocument::objectNameChanged(const QString &objectName)'"); + } + // [emitter impl] void QTextDocument::redoAvailable(bool) void emitter_QTextDocument_redoAvailable_864(bool arg1) { @@ -2300,6 +2308,24 @@ static void _call_emitter_modificationChanged_864 (const qt_gsi::GenericMethod * } +// emitter void QTextDocument::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QTextDocument_Adaptor *)cls)->emitter_QTextDocument_objectNameChanged_4567 (arg1); +} + + // exposed int QTextDocument::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -2454,6 +2480,7 @@ static gsi::Methods methods_QTextDocument_Adaptor () { methods += new qt_gsi::GenericMethod ("*loadResource", "@brief Virtual method QVariant QTextDocument::loadResource(int type, const QUrl &name)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_loadResource_2360_0, &_call_cbs_loadResource_2360_0); methods += new qt_gsi::GenericMethod ("*loadResource", "@hide", false, &_init_cbs_loadResource_2360_0, &_call_cbs_loadResource_2360_0, &_set_callback_cbs_loadResource_2360_0); methods += new qt_gsi::GenericMethod ("emit_modificationChanged", "@brief Emitter for signal void QTextDocument::modificationChanged(bool m)\nCall this method to emit this signal.", false, &_init_emitter_modificationChanged_864, &_call_emitter_modificationChanged_864); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QTextDocument::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QTextDocument::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("emit_redoAvailable", "@brief Emitter for signal void QTextDocument::redoAvailable(bool)\nCall this method to emit this signal.", false, &_init_emitter_redoAvailable_864, &_call_emitter_redoAvailable_864); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QTextDocument::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); diff --git a/src/gsiqt/qt5/QtGui/gsiDeclQTextFrame.cc b/src/gsiqt/qt5/QtGui/gsiDeclQTextFrame.cc index 8576f9201..34f305b84 100644 --- a/src/gsiqt/qt5/QtGui/gsiDeclQTextFrame.cc +++ b/src/gsiqt/qt5/QtGui/gsiDeclQTextFrame.cc @@ -249,6 +249,7 @@ static gsi::Methods methods_QTextFrame () { methods += new qt_gsi::GenericMethod ("parentFrame", "@brief Method QTextFrame *QTextFrame::parentFrame()\n", true, &_init_f_parentFrame_c0, &_call_f_parentFrame_c0); methods += new qt_gsi::GenericMethod ("setFrameFormat|frameFormat=", "@brief Method void QTextFrame::setFrameFormat(const QTextFrameFormat &format)\n", false, &_init_f_setFrameFormat_2923, &_call_f_setFrameFormat_2923); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QTextFrame::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QTextFrame::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QTextFrame::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QTextFrame::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -338,6 +339,13 @@ public: } } + // [emitter impl] void QTextFrame::objectNameChanged(const QString &objectName) + void emitter_QTextFrame_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QTextFrame::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] void QTextFrame::childEvent(QChildEvent *) void cbs_childEvent_1701_0(QChildEvent *arg1) { @@ -583,6 +591,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QTextFrame::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QTextFrame_Adaptor *)cls)->emitter_QTextFrame_objectNameChanged_4567 (arg1); +} + + // exposed int QTextFrame::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -692,6 +718,7 @@ static gsi::Methods methods_QTextFrame_Adaptor () { methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QTextFrame::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QTextFrame::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QTextFrame::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QTextFrame::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QTextFrame::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QTextFrame::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); diff --git a/src/gsiqt/qt5/QtGui/gsiDeclQTextList.cc b/src/gsiqt/qt5/QtGui/gsiDeclQTextList.cc index 126b6c203..28bce54ab 100644 --- a/src/gsiqt/qt5/QtGui/gsiDeclQTextList.cc +++ b/src/gsiqt/qt5/QtGui/gsiDeclQTextList.cc @@ -307,6 +307,7 @@ static gsi::Methods methods_QTextList () { methods += new qt_gsi::GenericMethod ("removeItem", "@brief Method void QTextList::removeItem(int i)\n", false, &_init_f_removeItem_767, &_call_f_removeItem_767); methods += new qt_gsi::GenericMethod ("setFormat|format=", "@brief Method void QTextList::setFormat(const QTextListFormat &format)\n", false, &_init_f_setFormat_2844, &_call_f_setFormat_2844); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QTextList::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QTextList::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QTextList::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QTextList::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -396,6 +397,13 @@ public: } } + // [emitter impl] void QTextList::objectNameChanged(const QString &objectName) + void emitter_QTextList_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QTextList::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] void QTextList::blockFormatChanged(const QTextBlock &block) void cbs_blockFormatChanged_2306_0(const QTextBlock &block) { @@ -775,6 +783,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QTextList::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QTextList_Adaptor *)cls)->emitter_QTextList_objectNameChanged_4567 (arg1); +} + + // exposed int QTextList::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -872,6 +898,7 @@ static gsi::Methods methods_QTextList_Adaptor () { methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QTextList::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QTextList::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QTextList::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QTextList::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QTextList::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QTextList::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); diff --git a/src/gsiqt/qt5/QtGui/gsiDeclQTextObject.cc b/src/gsiqt/qt5/QtGui/gsiDeclQTextObject.cc index 20e8c8b1a..30ccee10b 100644 --- a/src/gsiqt/qt5/QtGui/gsiDeclQTextObject.cc +++ b/src/gsiqt/qt5/QtGui/gsiDeclQTextObject.cc @@ -178,6 +178,7 @@ static gsi::Methods methods_QTextObject () { methods += new qt_gsi::GenericMethod ("formatIndex", "@brief Method int QTextObject::formatIndex()\n", true, &_init_f_formatIndex_c0, &_call_f_formatIndex_c0); methods += new qt_gsi::GenericMethod ("objectIndex", "@brief Method int QTextObject::objectIndex()\n", true, &_init_f_objectIndex_c0, &_call_f_objectIndex_c0); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QTextObject::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QTextObject::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QTextObject::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QTextObject::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -261,6 +262,13 @@ public: } } + // [emitter impl] void QTextObject::objectNameChanged(const QString &objectName) + void emitter_QTextObject_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QTextObject::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] void QTextObject::childEvent(QChildEvent *) void cbs_childEvent_1701_0(QChildEvent *arg1) { @@ -488,6 +496,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QTextObject::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QTextObject_Adaptor *)cls)->emitter_QTextObject_objectNameChanged_4567 (arg1); +} + + // exposed int QTextObject::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -596,6 +622,7 @@ static gsi::Methods methods_QTextObject_Adaptor () { methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QTextObject::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QTextObject::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QTextObject::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QTextObject::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QTextObject::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QTextObject::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); diff --git a/src/gsiqt/qt5/QtGui/gsiDeclQTextTable.cc b/src/gsiqt/qt5/QtGui/gsiDeclQTextTable.cc index b25af3449..b86993809 100644 --- a/src/gsiqt/qt5/QtGui/gsiDeclQTextTable.cc +++ b/src/gsiqt/qt5/QtGui/gsiDeclQTextTable.cc @@ -533,6 +533,7 @@ static gsi::Methods methods_QTextTable () { methods += new qt_gsi::GenericMethod ("setFormat|format=", "@brief Method void QTextTable::setFormat(const QTextTableFormat &format)\n", false, &_init_f_setFormat_2920, &_call_f_setFormat_2920); methods += new qt_gsi::GenericMethod ("splitCell", "@brief Method void QTextTable::splitCell(int row, int col, int numRows, int numCols)\n", false, &_init_f_splitCell_2744, &_call_f_splitCell_2744); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QTextTable::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QTextTable::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QTextTable::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QTextTable::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -617,6 +618,13 @@ public: } } + // [emitter impl] void QTextTable::objectNameChanged(const QString &objectName) + void emitter_QTextTable_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QTextTable::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] void QTextTable::childEvent(QChildEvent *) void cbs_childEvent_1701_0(QChildEvent *arg1) { @@ -862,6 +870,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QTextTable::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QTextTable_Adaptor *)cls)->emitter_QTextTable_objectNameChanged_4567 (arg1); +} + + // exposed int QTextTable::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -952,6 +978,7 @@ static gsi::Methods methods_QTextTable_Adaptor () { methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QTextTable::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QTextTable::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QTextTable::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QTextTable::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QTextTable::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QTextTable::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); diff --git a/src/gsiqt/qt5/QtGui/gsiDeclQValidator.cc b/src/gsiqt/qt5/QtGui/gsiDeclQValidator.cc index 446aba8f3..f607d7e4f 100644 --- a/src/gsiqt/qt5/QtGui/gsiDeclQValidator.cc +++ b/src/gsiqt/qt5/QtGui/gsiDeclQValidator.cc @@ -195,6 +195,7 @@ static gsi::Methods methods_QValidator () { methods += new qt_gsi::GenericMethod ("validate", "@brief Method QValidator::State QValidator::validate(QString &, int &)\n", true, &_init_f_validate_c2171, &_call_f_validate_c2171); methods += gsi::qt_signal ("changed()", "changed", "@brief Signal declaration for QValidator::changed()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QValidator::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QValidator::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QValidator::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QValidator::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -306,6 +307,13 @@ public: } } + // [emitter impl] void QValidator::objectNameChanged(const QString &objectName) + void emitter_QValidator_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QValidator::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QValidator::State QValidator::validate(QString &, int &) qt_gsi::Converter::target_type cbs_validate_c2171_0(QString &arg1, int &arg2) const { @@ -608,6 +616,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QValidator::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QValidator_Adaptor *)cls)->emitter_QValidator_objectNameChanged_4567 (arg1); +} + + // exposed int QValidator::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -727,6 +753,7 @@ static gsi::Methods methods_QValidator_Adaptor () { methods += new qt_gsi::GenericMethod ("fixup", "@brief Virtual method void QValidator::fixup(QString &)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_fixup_c1330_0, &_call_cbs_fixup_c1330_0); methods += new qt_gsi::GenericMethod ("fixup", "@hide", true, &_init_cbs_fixup_c1330_0, &_call_cbs_fixup_c1330_0, &_set_callback_cbs_fixup_c1330_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QValidator::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QValidator::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QValidator::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QValidator::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QValidator::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); diff --git a/src/gsiqt/qt5/QtGui/gsiDeclQWindow.cc b/src/gsiqt/qt5/QtGui/gsiDeclQWindow.cc index 075591e11..312ae2c80 100644 --- a/src/gsiqt/qt5/QtGui/gsiDeclQWindow.cc +++ b/src/gsiqt/qt5/QtGui/gsiDeclQWindow.cc @@ -2032,6 +2032,7 @@ static gsi::Methods methods_QWindow () { methods += gsi::qt_signal ("minimumHeightChanged(int)", "minimumHeightChanged", gsi::arg("arg"), "@brief Signal declaration for QWindow::minimumHeightChanged(int arg)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("minimumWidthChanged(int)", "minimumWidthChanged", gsi::arg("arg"), "@brief Signal declaration for QWindow::minimumWidthChanged(int arg)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal::target_type & > ("modalityChanged(Qt::WindowModality)", "modalityChanged", gsi::arg("modality"), "@brief Signal declaration for QWindow::modalityChanged(Qt::WindowModality modality)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QWindow::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("opacityChanged(double)", "opacityChanged", gsi::arg("opacity"), "@brief Signal declaration for QWindow::opacityChanged(double opacity)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("screenChanged(QScreen *)", "screenChanged", gsi::arg("screen"), "@brief Signal declaration for QWindow::screenChanged(QScreen *screen)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal::target_type & > ("visibilityChanged(QWindow::Visibility)", "visibilityChanged", gsi::arg("visibility"), "@brief Signal declaration for QWindow::visibilityChanged(QWindow::Visibility visibility)\nYou can bind a procedure to this signal."); @@ -2226,6 +2227,13 @@ public: emit QWindow::modalityChanged(modality); } + // [emitter impl] void QWindow::objectNameChanged(const QString &objectName) + void emitter_QWindow_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QWindow::objectNameChanged(const QString &objectName)'"); + } + // [emitter impl] void QWindow::opacityChanged(double opacity) void emitter_QWindow_opacityChanged_1071(double opacity) { @@ -3373,6 +3381,24 @@ static void _set_callback_cbs_nativeEvent_4678_0 (void *cls, const gsi::Callback } +// emitter void QWindow::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QWindow_Adaptor *)cls)->emitter_QWindow_objectNameChanged_4567 (arg1); +} + + // emitter void QWindow::opacityChanged(double opacity) static void _init_emitter_opacityChanged_1071 (qt_gsi::GenericMethod *decl) @@ -3823,6 +3849,7 @@ static gsi::Methods methods_QWindow_Adaptor () { methods += new qt_gsi::GenericMethod ("*moveEvent", "@hide", false, &_init_cbs_moveEvent_1624_0, &_call_cbs_moveEvent_1624_0, &_set_callback_cbs_moveEvent_1624_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@brief Virtual method bool QWindow::nativeEvent(const QByteArray &eventType, void *message, long int *result)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QWindow::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("emit_opacityChanged", "@brief Emitter for signal void QWindow::opacityChanged(double opacity)\nCall this method to emit this signal.", false, &_init_emitter_opacityChanged_1071, &_call_emitter_opacityChanged_1071); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QWindow::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*resizeEvent", "@brief Virtual method void QWindow::resizeEvent(QResizeEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_resizeEvent_1843_0, &_call_cbs_resizeEvent_1843_0); diff --git a/src/gsiqt/qt5/QtMultimedia/gsiDeclQAbstractAudioDeviceInfo.cc b/src/gsiqt/qt5/QtMultimedia/gsiDeclQAbstractAudioDeviceInfo.cc index b332916db..e398e3a6d 100644 --- a/src/gsiqt/qt5/QtMultimedia/gsiDeclQAbstractAudioDeviceInfo.cc +++ b/src/gsiqt/qt5/QtMultimedia/gsiDeclQAbstractAudioDeviceInfo.cc @@ -260,7 +260,6 @@ static gsi::Methods methods_QAbstractAudioDeviceInfo () { methods += new qt_gsi::GenericMethod ("supportedSampleRates", "@brief Method QList QAbstractAudioDeviceInfo::supportedSampleRates()\n", false, &_init_f_supportedSampleRates_0, &_call_f_supportedSampleRates_0); methods += new qt_gsi::GenericMethod ("supportedSampleSizes", "@brief Method QList QAbstractAudioDeviceInfo::supportedSampleSizes()\n", false, &_init_f_supportedSampleSizes_0, &_call_f_supportedSampleSizes_0); methods += new qt_gsi::GenericMethod ("supportedSampleTypes", "@brief Method QList QAbstractAudioDeviceInfo::supportedSampleTypes()\n", false, &_init_f_supportedSampleTypes_0, &_call_f_supportedSampleTypes_0); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QAbstractAudioDeviceInfo::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QAbstractAudioDeviceInfo::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QAbstractAudioDeviceInfo::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -309,12 +308,6 @@ public: return QAbstractAudioDeviceInfo::senderSignalIndex(); } - // [emitter impl] void QAbstractAudioDeviceInfo::destroyed(QObject *) - void emitter_QAbstractAudioDeviceInfo_destroyed_1302(QObject *arg1) - { - emit QAbstractAudioDeviceInfo::destroyed(arg1); - } - // [adaptor impl] QString QAbstractAudioDeviceInfo::deviceName() QString cbs_deviceName_c0_0() const { @@ -622,24 +615,6 @@ static void _set_callback_cbs_customEvent_1217_0 (void *cls, const gsi::Callback } -// emitter void QAbstractAudioDeviceInfo::destroyed(QObject *) - -static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - ((QAbstractAudioDeviceInfo_Adaptor *)cls)->emitter_QAbstractAudioDeviceInfo_destroyed_1302 (arg1); -} - - // QString QAbstractAudioDeviceInfo::deviceName() static void _init_cbs_deviceName_c0_0 (qt_gsi::GenericMethod *decl) @@ -988,7 +963,6 @@ static gsi::Methods methods_QAbstractAudioDeviceInfo_Adaptor () { methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QAbstractAudioDeviceInfo::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); - methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QAbstractAudioDeviceInfo::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("deviceName", "@brief Virtual method QString QAbstractAudioDeviceInfo::deviceName()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_deviceName_c0_0, &_call_cbs_deviceName_c0_0); methods += new qt_gsi::GenericMethod ("deviceName", "@hide", true, &_init_cbs_deviceName_c0_0, &_call_cbs_deviceName_c0_0, &_set_callback_cbs_deviceName_c0_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QAbstractAudioDeviceInfo::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); diff --git a/src/gsiqt/qt5/QtMultimedia/gsiDeclQAbstractAudioInput.cc b/src/gsiqt/qt5/QtMultimedia/gsiDeclQAbstractAudioInput.cc index 2bfa4d87c..fb67b5684 100644 --- a/src/gsiqt/qt5/QtMultimedia/gsiDeclQAbstractAudioInput.cc +++ b/src/gsiqt/qt5/QtMultimedia/gsiDeclQAbstractAudioInput.cc @@ -117,6 +117,26 @@ static void _call_f_error_c0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, } +// void QAbstractAudioInput::errorChanged(QAudio::Error) + + +static void _init_f_errorChanged_1653 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("arg1"); + decl->add_arg::target_type & > (argspec_0); + decl->set_return (); +} + +static void _call_f_errorChanged_1653 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QAbstractAudioInput *)cls)->errorChanged (qt_gsi::QtToCppAdaptor(arg1).cref()); +} + + // QAudioFormat QAbstractAudioInput::format() @@ -132,6 +152,22 @@ static void _call_f_format_c0 (const qt_gsi::GenericMethod * /*decl*/, void *cls } +// void QAbstractAudioInput::notify() + + +static void _init_f_notify_0 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_f_notify_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + __SUPPRESS_UNUSED_WARNING(ret); + ((QAbstractAudioInput *)cls)->notify (); +} + + // int QAbstractAudioInput::notifyInterval() @@ -339,6 +375,26 @@ static void _call_f_state_c0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, } +// void QAbstractAudioInput::stateChanged(QAudio::State) + + +static void _init_f_stateChanged_1644 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("arg1"); + decl->add_arg::target_type & > (argspec_0); + decl->set_return (); +} + +static void _call_f_stateChanged_1644 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QAbstractAudioInput *)cls)->stateChanged (qt_gsi::QtToCppAdaptor(arg1).cref()); +} + + // void QAbstractAudioInput::stop() @@ -446,7 +502,9 @@ static gsi::Methods methods_QAbstractAudioInput () { methods += new qt_gsi::GenericMethod ("bytesReady", "@brief Method int QAbstractAudioInput::bytesReady()\n", true, &_init_f_bytesReady_c0, &_call_f_bytesReady_c0); methods += new qt_gsi::GenericMethod ("elapsedUSecs", "@brief Method qint64 QAbstractAudioInput::elapsedUSecs()\n", true, &_init_f_elapsedUSecs_c0, &_call_f_elapsedUSecs_c0); methods += new qt_gsi::GenericMethod ("error", "@brief Method QAudio::Error QAbstractAudioInput::error()\n", true, &_init_f_error_c0, &_call_f_error_c0); + methods += new qt_gsi::GenericMethod ("errorChanged", "@brief Method void QAbstractAudioInput::errorChanged(QAudio::Error)\n", false, &_init_f_errorChanged_1653, &_call_f_errorChanged_1653); methods += new qt_gsi::GenericMethod (":format", "@brief Method QAudioFormat QAbstractAudioInput::format()\n", true, &_init_f_format_c0, &_call_f_format_c0); + methods += new qt_gsi::GenericMethod ("notify", "@brief Method void QAbstractAudioInput::notify()\n", false, &_init_f_notify_0, &_call_f_notify_0); methods += new qt_gsi::GenericMethod (":notifyInterval", "@brief Method int QAbstractAudioInput::notifyInterval()\n", true, &_init_f_notifyInterval_c0, &_call_f_notifyInterval_c0); methods += new qt_gsi::GenericMethod ("periodSize", "@brief Method int QAbstractAudioInput::periodSize()\n", true, &_init_f_periodSize_c0, &_call_f_periodSize_c0); methods += new qt_gsi::GenericMethod ("processedUSecs", "@brief Method qint64 QAbstractAudioInput::processedUSecs()\n", true, &_init_f_processedUSecs_c0, &_call_f_processedUSecs_c0); @@ -459,13 +517,10 @@ static gsi::Methods methods_QAbstractAudioInput () { methods += new qt_gsi::GenericMethod ("start", "@brief Method void QAbstractAudioInput::start(QIODevice *device)\n", false, &_init_f_start_1447, &_call_f_start_1447); methods += new qt_gsi::GenericMethod ("start", "@brief Method QIODevice *QAbstractAudioInput::start()\n", false, &_init_f_start_0, &_call_f_start_0); methods += new qt_gsi::GenericMethod ("state", "@brief Method QAudio::State QAbstractAudioInput::state()\n", true, &_init_f_state_c0, &_call_f_state_c0); + methods += new qt_gsi::GenericMethod ("stateChanged", "@brief Method void QAbstractAudioInput::stateChanged(QAudio::State)\n", false, &_init_f_stateChanged_1644, &_call_f_stateChanged_1644); methods += new qt_gsi::GenericMethod ("stop", "@brief Method void QAbstractAudioInput::stop()\n", false, &_init_f_stop_0, &_call_f_stop_0); methods += new qt_gsi::GenericMethod ("suspend", "@brief Method void QAbstractAudioInput::suspend()\n", false, &_init_f_suspend_0, &_call_f_suspend_0); methods += new qt_gsi::GenericMethod (":volume", "@brief Method double QAbstractAudioInput::volume()\n", true, &_init_f_volume_c0, &_call_f_volume_c0); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QAbstractAudioInput::destroyed(QObject *)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal::target_type & > ("errorChanged(QAudio::Error)", "errorChanged", gsi::arg("arg1"), "@brief Signal declaration for QAbstractAudioInput::errorChanged(QAudio::Error)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("notify()", "notify", "@brief Signal declaration for QAbstractAudioInput::notify()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal::target_type & > ("stateChanged(QAudio::State)", "stateChanged", gsi::arg("arg1"), "@brief Signal declaration for QAbstractAudioInput::stateChanged(QAudio::State)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QAbstractAudioInput::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QAbstractAudioInput::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -544,12 +599,6 @@ public: } } - // [emitter impl] void QAbstractAudioInput::destroyed(QObject *) - void emitter_QAbstractAudioInput_destroyed_1302(QObject *arg1) - { - emit QAbstractAudioInput::destroyed(arg1); - } - // [adaptor impl] qint64 QAbstractAudioInput::elapsedUSecs() qint64 cbs_elapsedUSecs_c0_0() const { @@ -580,12 +629,6 @@ public: } } - // [emitter impl] void QAbstractAudioInput::errorChanged(QAudio::Error) - void emitter_QAbstractAudioInput_errorChanged_1653(QAudio::Error arg1) - { - emit QAbstractAudioInput::errorChanged(arg1); - } - // [adaptor impl] bool QAbstractAudioInput::event(QEvent *) bool cbs_event_1217_0(QEvent *arg1) { @@ -631,12 +674,6 @@ public: } } - // [emitter impl] void QAbstractAudioInput::notify() - void emitter_QAbstractAudioInput_notify_0() - { - emit QAbstractAudioInput::notify(); - } - // [adaptor impl] int QAbstractAudioInput::notifyInterval() int cbs_notifyInterval_c0_0() const { @@ -822,12 +859,6 @@ public: } } - // [emitter impl] void QAbstractAudioInput::stateChanged(QAudio::State) - void emitter_QAbstractAudioInput_stateChanged_1644(QAudio::State arg1) - { - emit QAbstractAudioInput::stateChanged(arg1); - } - // [adaptor impl] void QAbstractAudioInput::stop() void cbs_stop_0_0() { @@ -1063,24 +1094,6 @@ static void _set_callback_cbs_customEvent_1217_0 (void *cls, const gsi::Callback } -// emitter void QAbstractAudioInput::destroyed(QObject *) - -static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - ((QAbstractAudioInput_Adaptor *)cls)->emitter_QAbstractAudioInput_destroyed_1302 (arg1); -} - - // void QAbstractAudioInput::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -1143,24 +1156,6 @@ static void _set_callback_cbs_error_c0_0 (void *cls, const gsi::Callback &cb) } -// emitter void QAbstractAudioInput::errorChanged(QAudio::Error) - -static void _init_emitter_errorChanged_1653 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1"); - decl->add_arg::target_type & > (argspec_0); - decl->set_return (); -} - -static void _call_emitter_errorChanged_1653 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); - ((QAbstractAudioInput_Adaptor *)cls)->emitter_QAbstractAudioInput_errorChanged_1653 (arg1); -} - - // bool QAbstractAudioInput::event(QEvent *) static void _init_cbs_event_1217_0 (qt_gsi::GenericMethod *decl) @@ -1247,20 +1242,6 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } -// emitter void QAbstractAudioInput::notify() - -static void _init_emitter_notify_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_notify_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QAbstractAudioInput_Adaptor *)cls)->emitter_QAbstractAudioInput_notify_0 (); -} - - // int QAbstractAudioInput::notifyInterval() static void _init_cbs_notifyInterval_c0_0 (qt_gsi::GenericMethod *decl) @@ -1562,24 +1543,6 @@ static void _set_callback_cbs_state_c0_0 (void *cls, const gsi::Callback &cb) } -// emitter void QAbstractAudioInput::stateChanged(QAudio::State) - -static void _init_emitter_stateChanged_1644 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1"); - decl->add_arg::target_type & > (argspec_0); - decl->set_return (); -} - -static void _call_emitter_stateChanged_1644 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); - ((QAbstractAudioInput_Adaptor *)cls)->emitter_QAbstractAudioInput_stateChanged_1644 (arg1); -} - - // void QAbstractAudioInput::stop() static void _init_cbs_stop_0_0 (qt_gsi::GenericMethod *decl) @@ -1679,14 +1642,12 @@ static gsi::Methods methods_QAbstractAudioInput_Adaptor () { methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QAbstractAudioInput::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); - methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QAbstractAudioInput::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QAbstractAudioInput::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("elapsedUSecs", "@brief Virtual method qint64 QAbstractAudioInput::elapsedUSecs()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_elapsedUSecs_c0_0, &_call_cbs_elapsedUSecs_c0_0); methods += new qt_gsi::GenericMethod ("elapsedUSecs", "@hide", true, &_init_cbs_elapsedUSecs_c0_0, &_call_cbs_elapsedUSecs_c0_0, &_set_callback_cbs_elapsedUSecs_c0_0); methods += new qt_gsi::GenericMethod ("error", "@brief Virtual method QAudio::Error QAbstractAudioInput::error()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_error_c0_0, &_call_cbs_error_c0_0); methods += new qt_gsi::GenericMethod ("error", "@hide", true, &_init_cbs_error_c0_0, &_call_cbs_error_c0_0, &_set_callback_cbs_error_c0_0); - methods += new qt_gsi::GenericMethod ("emit_errorChanged", "@brief Emitter for signal void QAbstractAudioInput::errorChanged(QAudio::Error)\nCall this method to emit this signal.", false, &_init_emitter_errorChanged_1653, &_call_emitter_errorChanged_1653); methods += new qt_gsi::GenericMethod ("event", "@brief Virtual method bool QAbstractAudioInput::event(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0); methods += new qt_gsi::GenericMethod ("event", "@hide", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0, &_set_callback_cbs_event_1217_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QAbstractAudioInput::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); @@ -1694,7 +1655,6 @@ static gsi::Methods methods_QAbstractAudioInput_Adaptor () { methods += new qt_gsi::GenericMethod ("format", "@brief Virtual method QAudioFormat QAbstractAudioInput::format()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_format_c0_0, &_call_cbs_format_c0_0); methods += new qt_gsi::GenericMethod ("format", "@hide", true, &_init_cbs_format_c0_0, &_call_cbs_format_c0_0, &_set_callback_cbs_format_c0_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QAbstractAudioInput::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); - methods += new qt_gsi::GenericMethod ("emit_notify", "@brief Emitter for signal void QAbstractAudioInput::notify()\nCall this method to emit this signal.", false, &_init_emitter_notify_0, &_call_emitter_notify_0); methods += new qt_gsi::GenericMethod ("notifyInterval", "@brief Virtual method int QAbstractAudioInput::notifyInterval()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_notifyInterval_c0_0, &_call_cbs_notifyInterval_c0_0); methods += new qt_gsi::GenericMethod ("notifyInterval", "@hide", true, &_init_cbs_notifyInterval_c0_0, &_call_cbs_notifyInterval_c0_0, &_set_callback_cbs_notifyInterval_c0_0); methods += new qt_gsi::GenericMethod ("periodSize", "@brief Virtual method int QAbstractAudioInput::periodSize()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_periodSize_c0_0, &_call_cbs_periodSize_c0_0); @@ -1722,7 +1682,6 @@ static gsi::Methods methods_QAbstractAudioInput_Adaptor () { methods += new qt_gsi::GenericMethod ("start", "@hide", false, &_init_cbs_start_0_0, &_call_cbs_start_0_0, &_set_callback_cbs_start_0_0); methods += new qt_gsi::GenericMethod ("state", "@brief Virtual method QAudio::State QAbstractAudioInput::state()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_state_c0_0, &_call_cbs_state_c0_0); methods += new qt_gsi::GenericMethod ("state", "@hide", true, &_init_cbs_state_c0_0, &_call_cbs_state_c0_0, &_set_callback_cbs_state_c0_0); - methods += new qt_gsi::GenericMethod ("emit_stateChanged", "@brief Emitter for signal void QAbstractAudioInput::stateChanged(QAudio::State)\nCall this method to emit this signal.", false, &_init_emitter_stateChanged_1644, &_call_emitter_stateChanged_1644); methods += new qt_gsi::GenericMethod ("stop", "@brief Virtual method void QAbstractAudioInput::stop()\nThis method can be reimplemented in a derived class.", false, &_init_cbs_stop_0_0, &_call_cbs_stop_0_0); methods += new qt_gsi::GenericMethod ("stop", "@hide", false, &_init_cbs_stop_0_0, &_call_cbs_stop_0_0, &_set_callback_cbs_stop_0_0); methods += new qt_gsi::GenericMethod ("suspend", "@brief Virtual method void QAbstractAudioInput::suspend()\nThis method can be reimplemented in a derived class.", false, &_init_cbs_suspend_0_0, &_call_cbs_suspend_0_0); diff --git a/src/gsiqt/qt5/QtMultimedia/gsiDeclQAbstractAudioOutput.cc b/src/gsiqt/qt5/QtMultimedia/gsiDeclQAbstractAudioOutput.cc index c5e91fe5d..d7fd43a0c 100644 --- a/src/gsiqt/qt5/QtMultimedia/gsiDeclQAbstractAudioOutput.cc +++ b/src/gsiqt/qt5/QtMultimedia/gsiDeclQAbstractAudioOutput.cc @@ -132,6 +132,26 @@ static void _call_f_error_c0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, } +// void QAbstractAudioOutput::errorChanged(QAudio::Error) + + +static void _init_f_errorChanged_1653 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("arg1"); + decl->add_arg::target_type & > (argspec_0); + decl->set_return (); +} + +static void _call_f_errorChanged_1653 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QAbstractAudioOutput *)cls)->errorChanged (qt_gsi::QtToCppAdaptor(arg1).cref()); +} + + // QAudioFormat QAbstractAudioOutput::format() @@ -147,6 +167,22 @@ static void _call_f_format_c0 (const qt_gsi::GenericMethod * /*decl*/, void *cls } +// void QAbstractAudioOutput::notify() + + +static void _init_f_notify_0 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_f_notify_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + __SUPPRESS_UNUSED_WARNING(ret); + ((QAbstractAudioOutput *)cls)->notify (); +} + + // int QAbstractAudioOutput::notifyInterval() @@ -374,6 +410,26 @@ static void _call_f_state_c0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, } +// void QAbstractAudioOutput::stateChanged(QAudio::State) + + +static void _init_f_stateChanged_1644 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("arg1"); + decl->add_arg::target_type & > (argspec_0); + decl->set_return (); +} + +static void _call_f_stateChanged_1644 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QAbstractAudioOutput *)cls)->stateChanged (qt_gsi::QtToCppAdaptor(arg1).cref()); +} + + // void QAbstractAudioOutput::stop() @@ -482,7 +538,9 @@ static gsi::Methods methods_QAbstractAudioOutput () { methods += new qt_gsi::GenericMethod (":category", "@brief Method QString QAbstractAudioOutput::category()\n", true, &_init_f_category_c0, &_call_f_category_c0); methods += new qt_gsi::GenericMethod ("elapsedUSecs", "@brief Method qint64 QAbstractAudioOutput::elapsedUSecs()\n", true, &_init_f_elapsedUSecs_c0, &_call_f_elapsedUSecs_c0); methods += new qt_gsi::GenericMethod ("error", "@brief Method QAudio::Error QAbstractAudioOutput::error()\n", true, &_init_f_error_c0, &_call_f_error_c0); + methods += new qt_gsi::GenericMethod ("errorChanged", "@brief Method void QAbstractAudioOutput::errorChanged(QAudio::Error)\n", false, &_init_f_errorChanged_1653, &_call_f_errorChanged_1653); methods += new qt_gsi::GenericMethod (":format", "@brief Method QAudioFormat QAbstractAudioOutput::format()\n", true, &_init_f_format_c0, &_call_f_format_c0); + methods += new qt_gsi::GenericMethod ("notify", "@brief Method void QAbstractAudioOutput::notify()\n", false, &_init_f_notify_0, &_call_f_notify_0); methods += new qt_gsi::GenericMethod (":notifyInterval", "@brief Method int QAbstractAudioOutput::notifyInterval()\n", true, &_init_f_notifyInterval_c0, &_call_f_notifyInterval_c0); methods += new qt_gsi::GenericMethod ("periodSize", "@brief Method int QAbstractAudioOutput::periodSize()\n", true, &_init_f_periodSize_c0, &_call_f_periodSize_c0); methods += new qt_gsi::GenericMethod ("processedUSecs", "@brief Method qint64 QAbstractAudioOutput::processedUSecs()\n", true, &_init_f_processedUSecs_c0, &_call_f_processedUSecs_c0); @@ -496,13 +554,10 @@ static gsi::Methods methods_QAbstractAudioOutput () { methods += new qt_gsi::GenericMethod ("start", "@brief Method void QAbstractAudioOutput::start(QIODevice *device)\n", false, &_init_f_start_1447, &_call_f_start_1447); methods += new qt_gsi::GenericMethod ("start", "@brief Method QIODevice *QAbstractAudioOutput::start()\n", false, &_init_f_start_0, &_call_f_start_0); methods += new qt_gsi::GenericMethod ("state", "@brief Method QAudio::State QAbstractAudioOutput::state()\n", true, &_init_f_state_c0, &_call_f_state_c0); + methods += new qt_gsi::GenericMethod ("stateChanged", "@brief Method void QAbstractAudioOutput::stateChanged(QAudio::State)\n", false, &_init_f_stateChanged_1644, &_call_f_stateChanged_1644); methods += new qt_gsi::GenericMethod ("stop", "@brief Method void QAbstractAudioOutput::stop()\n", false, &_init_f_stop_0, &_call_f_stop_0); methods += new qt_gsi::GenericMethod ("suspend", "@brief Method void QAbstractAudioOutput::suspend()\n", false, &_init_f_suspend_0, &_call_f_suspend_0); methods += new qt_gsi::GenericMethod (":volume", "@brief Method double QAbstractAudioOutput::volume()\n", true, &_init_f_volume_c0, &_call_f_volume_c0); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QAbstractAudioOutput::destroyed(QObject *)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal::target_type & > ("errorChanged(QAudio::Error)", "errorChanged", gsi::arg("arg1"), "@brief Signal declaration for QAbstractAudioOutput::errorChanged(QAudio::Error)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("notify()", "notify", "@brief Signal declaration for QAbstractAudioOutput::notify()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal::target_type & > ("stateChanged(QAudio::State)", "stateChanged", gsi::arg("arg1"), "@brief Signal declaration for QAbstractAudioOutput::stateChanged(QAudio::State)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QAbstractAudioOutput::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QAbstractAudioOutput::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -596,12 +651,6 @@ public: } } - // [emitter impl] void QAbstractAudioOutput::destroyed(QObject *) - void emitter_QAbstractAudioOutput_destroyed_1302(QObject *arg1) - { - emit QAbstractAudioOutput::destroyed(arg1); - } - // [adaptor impl] qint64 QAbstractAudioOutput::elapsedUSecs() qint64 cbs_elapsedUSecs_c0_0() const { @@ -632,12 +681,6 @@ public: } } - // [emitter impl] void QAbstractAudioOutput::errorChanged(QAudio::Error) - void emitter_QAbstractAudioOutput_errorChanged_1653(QAudio::Error arg1) - { - emit QAbstractAudioOutput::errorChanged(arg1); - } - // [adaptor impl] bool QAbstractAudioOutput::event(QEvent *) bool cbs_event_1217_0(QEvent *arg1) { @@ -683,12 +726,6 @@ public: } } - // [emitter impl] void QAbstractAudioOutput::notify() - void emitter_QAbstractAudioOutput_notify_0() - { - emit QAbstractAudioOutput::notify(); - } - // [adaptor impl] int QAbstractAudioOutput::notifyInterval() int cbs_notifyInterval_c0_0() const { @@ -888,12 +925,6 @@ public: } } - // [emitter impl] void QAbstractAudioOutput::stateChanged(QAudio::State) - void emitter_QAbstractAudioOutput_stateChanged_1644(QAudio::State arg1) - { - emit QAbstractAudioOutput::stateChanged(arg1); - } - // [adaptor impl] void QAbstractAudioOutput::stop() void cbs_stop_0_0() { @@ -1150,24 +1181,6 @@ static void _set_callback_cbs_customEvent_1217_0 (void *cls, const gsi::Callback } -// emitter void QAbstractAudioOutput::destroyed(QObject *) - -static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - ((QAbstractAudioOutput_Adaptor *)cls)->emitter_QAbstractAudioOutput_destroyed_1302 (arg1); -} - - // void QAbstractAudioOutput::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -1230,24 +1243,6 @@ static void _set_callback_cbs_error_c0_0 (void *cls, const gsi::Callback &cb) } -// emitter void QAbstractAudioOutput::errorChanged(QAudio::Error) - -static void _init_emitter_errorChanged_1653 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1"); - decl->add_arg::target_type & > (argspec_0); - decl->set_return (); -} - -static void _call_emitter_errorChanged_1653 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); - ((QAbstractAudioOutput_Adaptor *)cls)->emitter_QAbstractAudioOutput_errorChanged_1653 (arg1); -} - - // bool QAbstractAudioOutput::event(QEvent *) static void _init_cbs_event_1217_0 (qt_gsi::GenericMethod *decl) @@ -1334,20 +1329,6 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } -// emitter void QAbstractAudioOutput::notify() - -static void _init_emitter_notify_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_notify_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QAbstractAudioOutput_Adaptor *)cls)->emitter_QAbstractAudioOutput_notify_0 (); -} - - // int QAbstractAudioOutput::notifyInterval() static void _init_cbs_notifyInterval_c0_0 (qt_gsi::GenericMethod *decl) @@ -1673,24 +1654,6 @@ static void _set_callback_cbs_state_c0_0 (void *cls, const gsi::Callback &cb) } -// emitter void QAbstractAudioOutput::stateChanged(QAudio::State) - -static void _init_emitter_stateChanged_1644 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1"); - decl->add_arg::target_type & > (argspec_0); - decl->set_return (); -} - -static void _call_emitter_stateChanged_1644 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); - ((QAbstractAudioOutput_Adaptor *)cls)->emitter_QAbstractAudioOutput_stateChanged_1644 (arg1); -} - - // void QAbstractAudioOutput::stop() static void _init_cbs_stop_0_0 (qt_gsi::GenericMethod *decl) @@ -1792,14 +1755,12 @@ static gsi::Methods methods_QAbstractAudioOutput_Adaptor () { methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QAbstractAudioOutput::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); - methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QAbstractAudioOutput::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QAbstractAudioOutput::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("elapsedUSecs", "@brief Virtual method qint64 QAbstractAudioOutput::elapsedUSecs()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_elapsedUSecs_c0_0, &_call_cbs_elapsedUSecs_c0_0); methods += new qt_gsi::GenericMethod ("elapsedUSecs", "@hide", true, &_init_cbs_elapsedUSecs_c0_0, &_call_cbs_elapsedUSecs_c0_0, &_set_callback_cbs_elapsedUSecs_c0_0); methods += new qt_gsi::GenericMethod ("error", "@brief Virtual method QAudio::Error QAbstractAudioOutput::error()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_error_c0_0, &_call_cbs_error_c0_0); methods += new qt_gsi::GenericMethod ("error", "@hide", true, &_init_cbs_error_c0_0, &_call_cbs_error_c0_0, &_set_callback_cbs_error_c0_0); - methods += new qt_gsi::GenericMethod ("emit_errorChanged", "@brief Emitter for signal void QAbstractAudioOutput::errorChanged(QAudio::Error)\nCall this method to emit this signal.", false, &_init_emitter_errorChanged_1653, &_call_emitter_errorChanged_1653); methods += new qt_gsi::GenericMethod ("event", "@brief Virtual method bool QAbstractAudioOutput::event(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0); methods += new qt_gsi::GenericMethod ("event", "@hide", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0, &_set_callback_cbs_event_1217_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QAbstractAudioOutput::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); @@ -1807,7 +1768,6 @@ static gsi::Methods methods_QAbstractAudioOutput_Adaptor () { methods += new qt_gsi::GenericMethod ("format", "@brief Virtual method QAudioFormat QAbstractAudioOutput::format()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_format_c0_0, &_call_cbs_format_c0_0); methods += new qt_gsi::GenericMethod ("format", "@hide", true, &_init_cbs_format_c0_0, &_call_cbs_format_c0_0, &_set_callback_cbs_format_c0_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QAbstractAudioOutput::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); - methods += new qt_gsi::GenericMethod ("emit_notify", "@brief Emitter for signal void QAbstractAudioOutput::notify()\nCall this method to emit this signal.", false, &_init_emitter_notify_0, &_call_emitter_notify_0); methods += new qt_gsi::GenericMethod ("notifyInterval", "@brief Virtual method int QAbstractAudioOutput::notifyInterval()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_notifyInterval_c0_0, &_call_cbs_notifyInterval_c0_0); methods += new qt_gsi::GenericMethod ("notifyInterval", "@hide", true, &_init_cbs_notifyInterval_c0_0, &_call_cbs_notifyInterval_c0_0, &_set_callback_cbs_notifyInterval_c0_0); methods += new qt_gsi::GenericMethod ("periodSize", "@brief Virtual method int QAbstractAudioOutput::periodSize()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_periodSize_c0_0, &_call_cbs_periodSize_c0_0); @@ -1837,7 +1797,6 @@ static gsi::Methods methods_QAbstractAudioOutput_Adaptor () { methods += new qt_gsi::GenericMethod ("start", "@hide", false, &_init_cbs_start_0_0, &_call_cbs_start_0_0, &_set_callback_cbs_start_0_0); methods += new qt_gsi::GenericMethod ("state", "@brief Virtual method QAudio::State QAbstractAudioOutput::state()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_state_c0_0, &_call_cbs_state_c0_0); methods += new qt_gsi::GenericMethod ("state", "@hide", true, &_init_cbs_state_c0_0, &_call_cbs_state_c0_0, &_set_callback_cbs_state_c0_0); - methods += new qt_gsi::GenericMethod ("emit_stateChanged", "@brief Emitter for signal void QAbstractAudioOutput::stateChanged(QAudio::State)\nCall this method to emit this signal.", false, &_init_emitter_stateChanged_1644, &_call_emitter_stateChanged_1644); methods += new qt_gsi::GenericMethod ("stop", "@brief Virtual method void QAbstractAudioOutput::stop()\nThis method can be reimplemented in a derived class.", false, &_init_cbs_stop_0_0, &_call_cbs_stop_0_0); methods += new qt_gsi::GenericMethod ("stop", "@hide", false, &_init_cbs_stop_0_0, &_call_cbs_stop_0_0, &_set_callback_cbs_stop_0_0); methods += new qt_gsi::GenericMethod ("suspend", "@brief Virtual method void QAbstractAudioOutput::suspend()\nThis method can be reimplemented in a derived class.", false, &_init_cbs_suspend_0_0, &_call_cbs_suspend_0_0); diff --git a/src/gsiqt/qt5/QtMultimedia/gsiDeclQAbstractVideoFilter.cc b/src/gsiqt/qt5/QtMultimedia/gsiDeclQAbstractVideoFilter.cc index 454192927..07aee24f9 100644 --- a/src/gsiqt/qt5/QtMultimedia/gsiDeclQAbstractVideoFilter.cc +++ b/src/gsiqt/qt5/QtMultimedia/gsiDeclQAbstractVideoFilter.cc @@ -56,6 +56,22 @@ static void _call_smo (const qt_gsi::GenericStaticMethod *, gsi::SerialArgs &, g } +// void QAbstractVideoFilter::activeChanged() + + +static void _init_f_activeChanged_0 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_f_activeChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + __SUPPRESS_UNUSED_WARNING(ret); + ((QAbstractVideoFilter *)cls)->activeChanged (); +} + + // QVideoFilterRunnable *QAbstractVideoFilter::createFilterRunnable() @@ -162,11 +178,10 @@ namespace gsi static gsi::Methods methods_QAbstractVideoFilter () { gsi::Methods methods; methods += new qt_gsi::GenericStaticMethod ("staticMetaObject", "@brief Obtains the static MetaObject for this class.", &_init_smo, &_call_smo); + methods += new qt_gsi::GenericMethod ("activeChanged", "@brief Method void QAbstractVideoFilter::activeChanged()\n", false, &_init_f_activeChanged_0, &_call_f_activeChanged_0); methods += new qt_gsi::GenericMethod ("createFilterRunnable", "@brief Method QVideoFilterRunnable *QAbstractVideoFilter::createFilterRunnable()\n", false, &_init_f_createFilterRunnable_0, &_call_f_createFilterRunnable_0); methods += new qt_gsi::GenericMethod ("isActive?|:active", "@brief Method bool QAbstractVideoFilter::isActive()\n", true, &_init_f_isActive_c0, &_call_f_isActive_c0); methods += new qt_gsi::GenericMethod ("setActive|active=", "@brief Method void QAbstractVideoFilter::setActive(bool v)\n", false, &_init_f_setActive_864, &_call_f_setActive_864); - methods += gsi::qt_signal ("activeChanged()", "activeChanged", "@brief Signal declaration for QAbstractVideoFilter::activeChanged()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QAbstractVideoFilter::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QAbstractVideoFilter::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QAbstractVideoFilter::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -221,12 +236,6 @@ public: return QAbstractVideoFilter::senderSignalIndex(); } - // [emitter impl] void QAbstractVideoFilter::activeChanged() - void emitter_QAbstractVideoFilter_activeChanged_0() - { - emit QAbstractVideoFilter::activeChanged(); - } - // [adaptor impl] QVideoFilterRunnable *QAbstractVideoFilter::createFilterRunnable() QVideoFilterRunnable * cbs_createFilterRunnable_0_0() { @@ -242,12 +251,6 @@ public: } } - // [emitter impl] void QAbstractVideoFilter::destroyed(QObject *) - void emitter_QAbstractVideoFilter_destroyed_1302(QObject *arg1) - { - emit QAbstractVideoFilter::destroyed(arg1); - } - // [adaptor impl] bool QAbstractVideoFilter::event(QEvent *) bool cbs_event_1217_0(QEvent *arg1) { @@ -367,20 +370,6 @@ static void _call_ctor_QAbstractVideoFilter_Adaptor_1302 (const qt_gsi::GenericS } -// emitter void QAbstractVideoFilter::activeChanged() - -static void _init_emitter_activeChanged_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_activeChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QAbstractVideoFilter_Adaptor *)cls)->emitter_QAbstractVideoFilter_activeChanged_0 (); -} - - // void QAbstractVideoFilter::childEvent(QChildEvent *) static void _init_cbs_childEvent_1701_0 (qt_gsi::GenericMethod *decl) @@ -448,24 +437,6 @@ static void _set_callback_cbs_customEvent_1217_0 (void *cls, const gsi::Callback } -// emitter void QAbstractVideoFilter::destroyed(QObject *) - -static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - ((QAbstractVideoFilter_Adaptor *)cls)->emitter_QAbstractVideoFilter_destroyed_1302 (arg1); -} - - // void QAbstractVideoFilter::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -635,14 +606,12 @@ gsi::Class &qtdecl_QAbstractVideoFilter (); static gsi::Methods methods_QAbstractVideoFilter_Adaptor () { gsi::Methods methods; methods += new qt_gsi::GenericStaticMethod ("new", "@brief Constructor QAbstractVideoFilter::QAbstractVideoFilter(QObject *parent)\nThis method creates an object of class QAbstractVideoFilter.", &_init_ctor_QAbstractVideoFilter_Adaptor_1302, &_call_ctor_QAbstractVideoFilter_Adaptor_1302); - methods += new qt_gsi::GenericMethod ("emit_activeChanged", "@brief Emitter for signal void QAbstractVideoFilter::activeChanged()\nCall this method to emit this signal.", false, &_init_emitter_activeChanged_0, &_call_emitter_activeChanged_0); methods += new qt_gsi::GenericMethod ("*childEvent", "@brief Virtual method void QAbstractVideoFilter::childEvent(QChildEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("createFilterRunnable", "@brief Virtual method QVideoFilterRunnable *QAbstractVideoFilter::createFilterRunnable()\nThis method can be reimplemented in a derived class.", false, &_init_cbs_createFilterRunnable_0_0, &_call_cbs_createFilterRunnable_0_0); methods += new qt_gsi::GenericMethod ("createFilterRunnable", "@hide", false, &_init_cbs_createFilterRunnable_0_0, &_call_cbs_createFilterRunnable_0_0, &_set_callback_cbs_createFilterRunnable_0_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QAbstractVideoFilter::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); - methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QAbstractVideoFilter::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QAbstractVideoFilter::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("event", "@brief Virtual method bool QAbstractVideoFilter::event(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0); diff --git a/src/gsiqt/qt5/QtMultimedia/gsiDeclQAbstractVideoSurface.cc b/src/gsiqt/qt5/QtMultimedia/gsiDeclQAbstractVideoSurface.cc index 357486309..864168a17 100644 --- a/src/gsiqt/qt5/QtMultimedia/gsiDeclQAbstractVideoSurface.cc +++ b/src/gsiqt/qt5/QtMultimedia/gsiDeclQAbstractVideoSurface.cc @@ -58,6 +58,26 @@ static void _call_smo (const qt_gsi::GenericStaticMethod *, gsi::SerialArgs &, g } +// void QAbstractVideoSurface::activeChanged(bool active) + + +static void _init_f_activeChanged_864 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("active"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_activeChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + bool arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QAbstractVideoSurface *)cls)->activeChanged (arg1); +} + + // QAbstractVideoSurface::Error QAbstractVideoSurface::error() @@ -122,6 +142,26 @@ static void _call_f_nativeResolution_c0 (const qt_gsi::GenericMethod * /*decl*/, } +// void QAbstractVideoSurface::nativeResolutionChanged(const QSize &) + + +static void _init_f_nativeResolutionChanged_1805 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("arg1"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_nativeResolutionChanged_1805 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QSize &arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QAbstractVideoSurface *)cls)->nativeResolutionChanged (arg1); +} + + // QVideoSurfaceFormat QAbstractVideoSurface::nearestFormat(const QVideoSurfaceFormat &format) @@ -195,6 +235,22 @@ static void _call_f_stop_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, g } +// void QAbstractVideoSurface::supportedFormatsChanged() + + +static void _init_f_supportedFormatsChanged_0 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_f_supportedFormatsChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + __SUPPRESS_UNUSED_WARNING(ret); + ((QAbstractVideoSurface *)cls)->supportedFormatsChanged (); +} + + // QList QAbstractVideoSurface::supportedPixelFormats(QAbstractVideoBuffer::HandleType handleType) @@ -229,6 +285,26 @@ static void _call_f_surfaceFormat_c0 (const qt_gsi::GenericMethod * /*decl*/, vo } +// void QAbstractVideoSurface::surfaceFormatChanged(const QVideoSurfaceFormat &format) + + +static void _init_f_surfaceFormatChanged_3227 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("format"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_surfaceFormatChanged_3227 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QVideoSurfaceFormat &arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QAbstractVideoSurface *)cls)->surfaceFormatChanged (arg1); +} + + // static QString QAbstractVideoSurface::tr(const char *s, const char *c, int n) @@ -285,21 +361,20 @@ namespace gsi static gsi::Methods methods_QAbstractVideoSurface () { gsi::Methods methods; methods += new qt_gsi::GenericStaticMethod ("staticMetaObject", "@brief Obtains the static MetaObject for this class.", &_init_smo, &_call_smo); + methods += new qt_gsi::GenericMethod ("activeChanged", "@brief Method void QAbstractVideoSurface::activeChanged(bool active)\n", false, &_init_f_activeChanged_864, &_call_f_activeChanged_864); methods += new qt_gsi::GenericMethod ("error", "@brief Method QAbstractVideoSurface::Error QAbstractVideoSurface::error()\n", true, &_init_f_error_c0, &_call_f_error_c0); methods += new qt_gsi::GenericMethod ("isActive?", "@brief Method bool QAbstractVideoSurface::isActive()\n", true, &_init_f_isActive_c0, &_call_f_isActive_c0); methods += new qt_gsi::GenericMethod ("isFormatSupported?", "@brief Method bool QAbstractVideoSurface::isFormatSupported(const QVideoSurfaceFormat &format)\n", true, &_init_f_isFormatSupported_c3227, &_call_f_isFormatSupported_c3227); methods += new qt_gsi::GenericMethod (":nativeResolution", "@brief Method QSize QAbstractVideoSurface::nativeResolution()\n", true, &_init_f_nativeResolution_c0, &_call_f_nativeResolution_c0); + methods += new qt_gsi::GenericMethod ("nativeResolutionChanged", "@brief Method void QAbstractVideoSurface::nativeResolutionChanged(const QSize &)\n", false, &_init_f_nativeResolutionChanged_1805, &_call_f_nativeResolutionChanged_1805); methods += new qt_gsi::GenericMethod ("nearestFormat", "@brief Method QVideoSurfaceFormat QAbstractVideoSurface::nearestFormat(const QVideoSurfaceFormat &format)\n", true, &_init_f_nearestFormat_c3227, &_call_f_nearestFormat_c3227); methods += new qt_gsi::GenericMethod ("present", "@brief Method bool QAbstractVideoSurface::present(const QVideoFrame &frame)\n", false, &_init_f_present_2388, &_call_f_present_2388); methods += new qt_gsi::GenericMethod ("start", "@brief Method bool QAbstractVideoSurface::start(const QVideoSurfaceFormat &format)\n", false, &_init_f_start_3227, &_call_f_start_3227); methods += new qt_gsi::GenericMethod ("stop", "@brief Method void QAbstractVideoSurface::stop()\n", false, &_init_f_stop_0, &_call_f_stop_0); + methods += new qt_gsi::GenericMethod ("supportedFormatsChanged", "@brief Method void QAbstractVideoSurface::supportedFormatsChanged()\n", false, &_init_f_supportedFormatsChanged_0, &_call_f_supportedFormatsChanged_0); methods += new qt_gsi::GenericMethod ("supportedPixelFormats", "@brief Method QList QAbstractVideoSurface::supportedPixelFormats(QAbstractVideoBuffer::HandleType handleType)\n", true, &_init_f_supportedPixelFormats_c3564, &_call_f_supportedPixelFormats_c3564); methods += new qt_gsi::GenericMethod ("surfaceFormat", "@brief Method QVideoSurfaceFormat QAbstractVideoSurface::surfaceFormat()\n", true, &_init_f_surfaceFormat_c0, &_call_f_surfaceFormat_c0); - methods += gsi::qt_signal ("activeChanged(bool)", "activeChanged", gsi::arg("active"), "@brief Signal declaration for QAbstractVideoSurface::activeChanged(bool active)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QAbstractVideoSurface::destroyed(QObject *)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("nativeResolutionChanged(const QSize &)", "nativeResolutionChanged", gsi::arg("arg1"), "@brief Signal declaration for QAbstractVideoSurface::nativeResolutionChanged(const QSize &)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("supportedFormatsChanged()", "supportedFormatsChanged", "@brief Signal declaration for QAbstractVideoSurface::supportedFormatsChanged()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("surfaceFormatChanged(const QVideoSurfaceFormat &)", "surfaceFormatChanged", gsi::arg("format"), "@brief Signal declaration for QAbstractVideoSurface::surfaceFormatChanged(const QVideoSurfaceFormat &format)\nYou can bind a procedure to this signal."); + methods += new qt_gsi::GenericMethod ("surfaceFormatChanged", "@brief Method void QAbstractVideoSurface::surfaceFormatChanged(const QVideoSurfaceFormat &format)\n", false, &_init_f_surfaceFormatChanged_3227, &_call_f_surfaceFormatChanged_3227); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QAbstractVideoSurface::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QAbstractVideoSurface::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -364,18 +439,6 @@ public: QAbstractVideoSurface::setNativeResolution(resolution); } - // [emitter impl] void QAbstractVideoSurface::activeChanged(bool active) - void emitter_QAbstractVideoSurface_activeChanged_864(bool active) - { - emit QAbstractVideoSurface::activeChanged(active); - } - - // [emitter impl] void QAbstractVideoSurface::destroyed(QObject *) - void emitter_QAbstractVideoSurface_destroyed_1302(QObject *arg1) - { - emit QAbstractVideoSurface::destroyed(arg1); - } - // [adaptor impl] bool QAbstractVideoSurface::event(QEvent *) bool cbs_event_1217_0(QEvent *arg1) { @@ -421,12 +484,6 @@ public: } } - // [emitter impl] void QAbstractVideoSurface::nativeResolutionChanged(const QSize &) - void emitter_QAbstractVideoSurface_nativeResolutionChanged_1805(const QSize &arg1) - { - emit QAbstractVideoSurface::nativeResolutionChanged(arg1); - } - // [adaptor impl] QVideoSurfaceFormat QAbstractVideoSurface::nearestFormat(const QVideoSurfaceFormat &format) QVideoSurfaceFormat cbs_nearestFormat_c3227_0(const QVideoSurfaceFormat &format) const { @@ -488,12 +545,6 @@ public: } } - // [emitter impl] void QAbstractVideoSurface::supportedFormatsChanged() - void emitter_QAbstractVideoSurface_supportedFormatsChanged_0() - { - emit QAbstractVideoSurface::supportedFormatsChanged(); - } - // [adaptor impl] QList QAbstractVideoSurface::supportedPixelFormats(QAbstractVideoBuffer::HandleType handleType) QList cbs_supportedPixelFormats_c3564_1(const qt_gsi::Converter::target_type & handleType) const { @@ -510,12 +561,6 @@ public: } } - // [emitter impl] void QAbstractVideoSurface::surfaceFormatChanged(const QVideoSurfaceFormat &format) - void emitter_QAbstractVideoSurface_surfaceFormatChanged_3227(const QVideoSurfaceFormat &format) - { - emit QAbstractVideoSurface::surfaceFormatChanged(format); - } - // [adaptor impl] void QAbstractVideoSurface::childEvent(QChildEvent *) void cbs_childEvent_1701_0(QChildEvent *arg1) { @@ -610,24 +655,6 @@ static void _call_ctor_QAbstractVideoSurface_Adaptor_1302 (const qt_gsi::Generic } -// emitter void QAbstractVideoSurface::activeChanged(bool active) - -static void _init_emitter_activeChanged_864 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("active"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_activeChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - bool arg1 = gsi::arg_reader() (args, heap); - ((QAbstractVideoSurface_Adaptor *)cls)->emitter_QAbstractVideoSurface_activeChanged_864 (arg1); -} - - // void QAbstractVideoSurface::childEvent(QChildEvent *) static void _init_cbs_childEvent_1701_0 (qt_gsi::GenericMethod *decl) @@ -676,24 +703,6 @@ static void _set_callback_cbs_customEvent_1217_0 (void *cls, const gsi::Callback } -// emitter void QAbstractVideoSurface::destroyed(QObject *) - -static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - ((QAbstractVideoSurface_Adaptor *)cls)->emitter_QAbstractVideoSurface_destroyed_1302 (arg1); -} - - // void QAbstractVideoSurface::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -808,24 +817,6 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } -// emitter void QAbstractVideoSurface::nativeResolutionChanged(const QSize &) - -static void _init_emitter_nativeResolutionChanged_1805 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_nativeResolutionChanged_1805 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const QSize &arg1 = gsi::arg_reader() (args, heap); - ((QAbstractVideoSurface_Adaptor *)cls)->emitter_QAbstractVideoSurface_nativeResolutionChanged_1805 (arg1); -} - - // QVideoSurfaceFormat QAbstractVideoSurface::nearestFormat(const QVideoSurfaceFormat &format) static void _init_cbs_nearestFormat_c3227_0 (qt_gsi::GenericMethod *decl) @@ -999,20 +990,6 @@ static void _set_callback_cbs_stop_0_0 (void *cls, const gsi::Callback &cb) } -// emitter void QAbstractVideoSurface::supportedFormatsChanged() - -static void _init_emitter_supportedFormatsChanged_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_supportedFormatsChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QAbstractVideoSurface_Adaptor *)cls)->emitter_QAbstractVideoSurface_supportedFormatsChanged_0 (); -} - - // QList QAbstractVideoSurface::supportedPixelFormats(QAbstractVideoBuffer::HandleType handleType) static void _init_cbs_supportedPixelFormats_c3564_1 (qt_gsi::GenericMethod *decl) @@ -1036,24 +1013,6 @@ static void _set_callback_cbs_supportedPixelFormats_c3564_1 (void *cls, const gs } -// emitter void QAbstractVideoSurface::surfaceFormatChanged(const QVideoSurfaceFormat &format) - -static void _init_emitter_surfaceFormatChanged_3227 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("format"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_surfaceFormatChanged_3227 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const QVideoSurfaceFormat &arg1 = gsi::arg_reader() (args, heap); - ((QAbstractVideoSurface_Adaptor *)cls)->emitter_QAbstractVideoSurface_surfaceFormatChanged_3227 (arg1); -} - - // void QAbstractVideoSurface::timerEvent(QTimerEvent *) static void _init_cbs_timerEvent_1730_0 (qt_gsi::GenericMethod *decl) @@ -1086,12 +1045,10 @@ gsi::Class &qtdecl_QAbstractVideoSurface (); static gsi::Methods methods_QAbstractVideoSurface_Adaptor () { gsi::Methods methods; methods += new qt_gsi::GenericStaticMethod ("new", "@brief Constructor QAbstractVideoSurface::QAbstractVideoSurface(QObject *parent)\nThis method creates an object of class QAbstractVideoSurface.", &_init_ctor_QAbstractVideoSurface_Adaptor_1302, &_call_ctor_QAbstractVideoSurface_Adaptor_1302); - methods += new qt_gsi::GenericMethod ("emit_activeChanged", "@brief Emitter for signal void QAbstractVideoSurface::activeChanged(bool active)\nCall this method to emit this signal.", false, &_init_emitter_activeChanged_864, &_call_emitter_activeChanged_864); methods += new qt_gsi::GenericMethod ("*childEvent", "@brief Virtual method void QAbstractVideoSurface::childEvent(QChildEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QAbstractVideoSurface::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); - methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QAbstractVideoSurface::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QAbstractVideoSurface::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("event", "@brief Virtual method bool QAbstractVideoSurface::event(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0); @@ -1101,7 +1058,6 @@ static gsi::Methods methods_QAbstractVideoSurface_Adaptor () { methods += new qt_gsi::GenericMethod ("isFormatSupported", "@brief Virtual method bool QAbstractVideoSurface::isFormatSupported(const QVideoSurfaceFormat &format)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_isFormatSupported_c3227_0, &_call_cbs_isFormatSupported_c3227_0); methods += new qt_gsi::GenericMethod ("isFormatSupported", "@hide", true, &_init_cbs_isFormatSupported_c3227_0, &_call_cbs_isFormatSupported_c3227_0, &_set_callback_cbs_isFormatSupported_c3227_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QAbstractVideoSurface::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); - methods += new qt_gsi::GenericMethod ("emit_nativeResolutionChanged", "@brief Emitter for signal void QAbstractVideoSurface::nativeResolutionChanged(const QSize &)\nCall this method to emit this signal.", false, &_init_emitter_nativeResolutionChanged_1805, &_call_emitter_nativeResolutionChanged_1805); methods += new qt_gsi::GenericMethod ("nearestFormat", "@brief Virtual method QVideoSurfaceFormat QAbstractVideoSurface::nearestFormat(const QVideoSurfaceFormat &format)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_nearestFormat_c3227_0, &_call_cbs_nearestFormat_c3227_0); methods += new qt_gsi::GenericMethod ("nearestFormat", "@hide", true, &_init_cbs_nearestFormat_c3227_0, &_call_cbs_nearestFormat_c3227_0, &_set_callback_cbs_nearestFormat_c3227_0); methods += new qt_gsi::GenericMethod ("present", "@brief Virtual method bool QAbstractVideoSurface::present(const QVideoFrame &frame)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_present_2388_0, &_call_cbs_present_2388_0); @@ -1115,10 +1071,8 @@ static gsi::Methods methods_QAbstractVideoSurface_Adaptor () { methods += new qt_gsi::GenericMethod ("start", "@hide", false, &_init_cbs_start_3227_0, &_call_cbs_start_3227_0, &_set_callback_cbs_start_3227_0); methods += new qt_gsi::GenericMethod ("stop", "@brief Virtual method void QAbstractVideoSurface::stop()\nThis method can be reimplemented in a derived class.", false, &_init_cbs_stop_0_0, &_call_cbs_stop_0_0); methods += new qt_gsi::GenericMethod ("stop", "@hide", false, &_init_cbs_stop_0_0, &_call_cbs_stop_0_0, &_set_callback_cbs_stop_0_0); - methods += new qt_gsi::GenericMethod ("emit_supportedFormatsChanged", "@brief Emitter for signal void QAbstractVideoSurface::supportedFormatsChanged()\nCall this method to emit this signal.", false, &_init_emitter_supportedFormatsChanged_0, &_call_emitter_supportedFormatsChanged_0); methods += new qt_gsi::GenericMethod ("supportedPixelFormats", "@brief Virtual method QList QAbstractVideoSurface::supportedPixelFormats(QAbstractVideoBuffer::HandleType handleType)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_supportedPixelFormats_c3564_1, &_call_cbs_supportedPixelFormats_c3564_1); methods += new qt_gsi::GenericMethod ("supportedPixelFormats", "@hide", true, &_init_cbs_supportedPixelFormats_c3564_1, &_call_cbs_supportedPixelFormats_c3564_1, &_set_callback_cbs_supportedPixelFormats_c3564_1); - methods += new qt_gsi::GenericMethod ("emit_surfaceFormatChanged", "@brief Emitter for signal void QAbstractVideoSurface::surfaceFormatChanged(const QVideoSurfaceFormat &format)\nCall this method to emit this signal.", false, &_init_emitter_surfaceFormatChanged_3227, &_call_emitter_surfaceFormatChanged_3227); methods += new qt_gsi::GenericMethod ("*timerEvent", "@brief Virtual method void QAbstractVideoSurface::timerEvent(QTimerEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_timerEvent_1730_0, &_call_cbs_timerEvent_1730_0); methods += new qt_gsi::GenericMethod ("*timerEvent", "@hide", false, &_init_cbs_timerEvent_1730_0, &_call_cbs_timerEvent_1730_0, &_set_callback_cbs_timerEvent_1730_0); return methods; diff --git a/src/gsiqt/qt5/QtMultimedia/gsiDeclQAudioDecoder.cc b/src/gsiqt/qt5/QtMultimedia/gsiDeclQAudioDecoder.cc index aa7d964e8..7631e28d0 100644 --- a/src/gsiqt/qt5/QtMultimedia/gsiDeclQAudioDecoder.cc +++ b/src/gsiqt/qt5/QtMultimedia/gsiDeclQAudioDecoder.cc @@ -108,6 +108,42 @@ static void _call_f_bufferAvailable_c0 (const qt_gsi::GenericMethod * /*decl*/, } +// void QAudioDecoder::bufferAvailableChanged(bool) + + +static void _init_f_bufferAvailableChanged_864 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("arg1"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_bufferAvailableChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + bool arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QAudioDecoder *)cls)->bufferAvailableChanged (arg1); +} + + +// void QAudioDecoder::bufferReady() + + +static void _init_f_bufferReady_0 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_f_bufferReady_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + __SUPPRESS_UNUSED_WARNING(ret); + ((QAudioDecoder *)cls)->bufferReady (); +} + + // qint64 QAudioDecoder::duration() @@ -123,6 +159,26 @@ static void _call_f_duration_c0 (const qt_gsi::GenericMethod * /*decl*/, void *c } +// void QAudioDecoder::durationChanged(qint64 duration) + + +static void _init_f_durationChanged_986 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("duration"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_durationChanged_986 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + qint64 arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QAudioDecoder *)cls)->durationChanged (arg1); +} + + // QAudioDecoder::Error QAudioDecoder::error() @@ -138,6 +194,26 @@ static void _call_f_error_c0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, } +// void QAudioDecoder::error(QAudioDecoder::Error error) + + +static void _init_f_error_2347 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("error"); + decl->add_arg::target_type & > (argspec_0); + decl->set_return (); +} + +static void _call_f_error_2347 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QAudioDecoder *)cls)->error (qt_gsi::QtToCppAdaptor(arg1).cref()); +} + + // QString QAudioDecoder::errorString() @@ -153,6 +229,42 @@ static void _call_f_errorString_c0 (const qt_gsi::GenericMethod * /*decl*/, void } +// void QAudioDecoder::finished() + + +static void _init_f_finished_0 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_f_finished_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + __SUPPRESS_UNUSED_WARNING(ret); + ((QAudioDecoder *)cls)->finished (); +} + + +// void QAudioDecoder::formatChanged(const QAudioFormat &format) + + +static void _init_f_formatChanged_2509 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("format"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_formatChanged_2509 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QAudioFormat &arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QAudioDecoder *)cls)->formatChanged (arg1); +} + + // qint64 QAudioDecoder::position() @@ -168,6 +280,26 @@ static void _call_f_position_c0 (const qt_gsi::GenericMethod * /*decl*/, void *c } +// void QAudioDecoder::positionChanged(qint64 position) + + +static void _init_f_positionChanged_986 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("position"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_positionChanged_986 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + qint64 arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QAudioDecoder *)cls)->positionChanged (arg1); +} + + // QAudioBuffer QAudioDecoder::read() @@ -243,6 +375,22 @@ static void _call_f_setSourceFilename_2025 (const qt_gsi::GenericMethod * /*decl } +// void QAudioDecoder::sourceChanged() + + +static void _init_f_sourceChanged_0 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_f_sourceChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + __SUPPRESS_UNUSED_WARNING(ret); + ((QAudioDecoder *)cls)->sourceChanged (); +} + + // QIODevice *QAudioDecoder::sourceDevice() @@ -304,6 +452,26 @@ static void _call_f_state_c0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, } +// void QAudioDecoder::stateChanged(QAudioDecoder::State newState) + + +static void _init_f_stateChanged_2338 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("newState"); + decl->add_arg::target_type & > (argspec_0); + decl->set_return (); +} + +static void _call_f_stateChanged_2338 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QAudioDecoder *)cls)->stateChanged (qt_gsi::QtToCppAdaptor(arg1).cref()); +} + + // void QAudioDecoder::stop() @@ -421,36 +589,29 @@ static gsi::Methods methods_QAudioDecoder () { methods += new qt_gsi::GenericMethod (":audioFormat", "@brief Method QAudioFormat QAudioDecoder::audioFormat()\n", true, &_init_f_audioFormat_c0, &_call_f_audioFormat_c0); methods += new qt_gsi::GenericMethod ("bind", "@brief Method bool QAudioDecoder::bind(QObject *)\nThis is a reimplementation of QMediaObject::bind", false, &_init_f_bind_1302, &_call_f_bind_1302); methods += new qt_gsi::GenericMethod (":bufferAvailable", "@brief Method bool QAudioDecoder::bufferAvailable()\n", true, &_init_f_bufferAvailable_c0, &_call_f_bufferAvailable_c0); + methods += new qt_gsi::GenericMethod ("bufferAvailableChanged", "@brief Method void QAudioDecoder::bufferAvailableChanged(bool)\n", false, &_init_f_bufferAvailableChanged_864, &_call_f_bufferAvailableChanged_864); + methods += new qt_gsi::GenericMethod ("bufferReady", "@brief Method void QAudioDecoder::bufferReady()\n", false, &_init_f_bufferReady_0, &_call_f_bufferReady_0); methods += new qt_gsi::GenericMethod ("duration", "@brief Method qint64 QAudioDecoder::duration()\n", true, &_init_f_duration_c0, &_call_f_duration_c0); + methods += new qt_gsi::GenericMethod ("durationChanged", "@brief Method void QAudioDecoder::durationChanged(qint64 duration)\n", false, &_init_f_durationChanged_986, &_call_f_durationChanged_986); methods += new qt_gsi::GenericMethod (":error", "@brief Method QAudioDecoder::Error QAudioDecoder::error()\n", true, &_init_f_error_c0, &_call_f_error_c0); + methods += new qt_gsi::GenericMethod ("error_sig", "@brief Method void QAudioDecoder::error(QAudioDecoder::Error error)\n", false, &_init_f_error_2347, &_call_f_error_2347); methods += new qt_gsi::GenericMethod ("errorString", "@brief Method QString QAudioDecoder::errorString()\n", true, &_init_f_errorString_c0, &_call_f_errorString_c0); + methods += new qt_gsi::GenericMethod ("finished", "@brief Method void QAudioDecoder::finished()\n", false, &_init_f_finished_0, &_call_f_finished_0); + methods += new qt_gsi::GenericMethod ("formatChanged", "@brief Method void QAudioDecoder::formatChanged(const QAudioFormat &format)\n", false, &_init_f_formatChanged_2509, &_call_f_formatChanged_2509); methods += new qt_gsi::GenericMethod ("position", "@brief Method qint64 QAudioDecoder::position()\n", true, &_init_f_position_c0, &_call_f_position_c0); + methods += new qt_gsi::GenericMethod ("positionChanged", "@brief Method void QAudioDecoder::positionChanged(qint64 position)\n", false, &_init_f_positionChanged_986, &_call_f_positionChanged_986); methods += new qt_gsi::GenericMethod ("read", "@brief Method QAudioBuffer QAudioDecoder::read()\n", true, &_init_f_read_c0, &_call_f_read_c0); methods += new qt_gsi::GenericMethod ("setAudioFormat|audioFormat=", "@brief Method void QAudioDecoder::setAudioFormat(const QAudioFormat &format)\n", false, &_init_f_setAudioFormat_2509, &_call_f_setAudioFormat_2509); methods += new qt_gsi::GenericMethod ("setSourceDevice|sourceDevice=", "@brief Method void QAudioDecoder::setSourceDevice(QIODevice *device)\n", false, &_init_f_setSourceDevice_1447, &_call_f_setSourceDevice_1447); methods += new qt_gsi::GenericMethod ("setSourceFilename|sourceFilename=", "@brief Method void QAudioDecoder::setSourceFilename(const QString &fileName)\n", false, &_init_f_setSourceFilename_2025, &_call_f_setSourceFilename_2025); + methods += new qt_gsi::GenericMethod ("sourceChanged", "@brief Method void QAudioDecoder::sourceChanged()\n", false, &_init_f_sourceChanged_0, &_call_f_sourceChanged_0); methods += new qt_gsi::GenericMethod (":sourceDevice", "@brief Method QIODevice *QAudioDecoder::sourceDevice()\n", true, &_init_f_sourceDevice_c0, &_call_f_sourceDevice_c0); methods += new qt_gsi::GenericMethod (":sourceFilename", "@brief Method QString QAudioDecoder::sourceFilename()\n", true, &_init_f_sourceFilename_c0, &_call_f_sourceFilename_c0); methods += new qt_gsi::GenericMethod ("start", "@brief Method void QAudioDecoder::start()\n", false, &_init_f_start_0, &_call_f_start_0); methods += new qt_gsi::GenericMethod (":state", "@brief Method QAudioDecoder::State QAudioDecoder::state()\n", true, &_init_f_state_c0, &_call_f_state_c0); + methods += new qt_gsi::GenericMethod ("stateChanged", "@brief Method void QAudioDecoder::stateChanged(QAudioDecoder::State newState)\n", false, &_init_f_stateChanged_2338, &_call_f_stateChanged_2338); methods += new qt_gsi::GenericMethod ("stop", "@brief Method void QAudioDecoder::stop()\n", false, &_init_f_stop_0, &_call_f_stop_0); methods += new qt_gsi::GenericMethod ("unbind", "@brief Method void QAudioDecoder::unbind(QObject *)\nThis is a reimplementation of QMediaObject::unbind", false, &_init_f_unbind_1302, &_call_f_unbind_1302); - methods += gsi::qt_signal ("availabilityChanged(bool)", "availabilityChanged_bool", gsi::arg("available"), "@brief Signal declaration for QAudioDecoder::availabilityChanged(bool available)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal::target_type & > ("availabilityChanged(QMultimedia::AvailabilityStatus)", "availabilityChanged_status", gsi::arg("availability"), "@brief Signal declaration for QAudioDecoder::availabilityChanged(QMultimedia::AvailabilityStatus availability)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("bufferAvailableChanged(bool)", "bufferAvailableChanged", gsi::arg("arg1"), "@brief Signal declaration for QAudioDecoder::bufferAvailableChanged(bool)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("bufferReady()", "bufferReady", "@brief Signal declaration for QAudioDecoder::bufferReady()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QAudioDecoder::destroyed(QObject *)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("durationChanged(qint64)", "durationChanged", gsi::arg("duration"), "@brief Signal declaration for QAudioDecoder::durationChanged(qint64 duration)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal::target_type & > ("error(QAudioDecoder::Error)", "error_sig", gsi::arg("error"), "@brief Signal declaration for QAudioDecoder::error(QAudioDecoder::Error error)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("finished()", "finished", "@brief Signal declaration for QAudioDecoder::finished()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("formatChanged(const QAudioFormat &)", "formatChanged", gsi::arg("format"), "@brief Signal declaration for QAudioDecoder::formatChanged(const QAudioFormat &format)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("metaDataAvailableChanged(bool)", "metaDataAvailableChanged", gsi::arg("available"), "@brief Signal declaration for QAudioDecoder::metaDataAvailableChanged(bool available)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("metaDataChanged()", "metaDataChanged", "@brief Signal declaration for QAudioDecoder::metaDataChanged()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("metaDataChanged(const QString &, const QVariant &)", "metaDataChanged_kv", gsi::arg("key"), gsi::arg("value"), "@brief Signal declaration for QAudioDecoder::metaDataChanged(const QString &key, const QVariant &value)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("notifyIntervalChanged(int)", "notifyIntervalChanged", gsi::arg("milliSeconds"), "@brief Signal declaration for QAudioDecoder::notifyIntervalChanged(int milliSeconds)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("positionChanged(qint64)", "positionChanged", gsi::arg("position"), "@brief Signal declaration for QAudioDecoder::positionChanged(qint64 position)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("sourceChanged()", "sourceChanged", "@brief Signal declaration for QAudioDecoder::sourceChanged()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal::target_type & > ("stateChanged(QAudioDecoder::State)", "stateChanged", gsi::arg("newState"), "@brief Signal declaration for QAudioDecoder::stateChanged(QAudioDecoder::State newState)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("hasSupport", "@brief Static method QMultimedia::SupportEstimate QAudioDecoder::hasSupport(const QString &mimeType, const QStringList &codecs)\nThis method is static and can be called without an instance.", &_init_f_hasSupport_4354, &_call_f_hasSupport_4354); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QAudioDecoder::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QAudioDecoder::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); @@ -531,18 +692,6 @@ public: } } - // [emitter impl] void QAudioDecoder::availabilityChanged(bool available) - void emitter_QAudioDecoder_availabilityChanged_864(bool available) - { - emit QAudioDecoder::availabilityChanged(available); - } - - // [emitter impl] void QAudioDecoder::availabilityChanged(QMultimedia::AvailabilityStatus availability) - void emitter_QAudioDecoder_availabilityChanged_3555(QMultimedia::AvailabilityStatus availability) - { - emit QAudioDecoder::availabilityChanged(availability); - } - // [adaptor impl] bool QAudioDecoder::bind(QObject *) bool cbs_bind_1302_0(QObject *arg1) { @@ -558,36 +707,6 @@ public: } } - // [emitter impl] void QAudioDecoder::bufferAvailableChanged(bool) - void emitter_QAudioDecoder_bufferAvailableChanged_864(bool arg1) - { - emit QAudioDecoder::bufferAvailableChanged(arg1); - } - - // [emitter impl] void QAudioDecoder::bufferReady() - void emitter_QAudioDecoder_bufferReady_0() - { - emit QAudioDecoder::bufferReady(); - } - - // [emitter impl] void QAudioDecoder::destroyed(QObject *) - void emitter_QAudioDecoder_destroyed_1302(QObject *arg1) - { - emit QAudioDecoder::destroyed(arg1); - } - - // [emitter impl] void QAudioDecoder::durationChanged(qint64 duration) - void emitter_QAudioDecoder_durationChanged_986(qint64 duration) - { - emit QAudioDecoder::durationChanged(duration); - } - - // [emitter impl] void QAudioDecoder::error(QAudioDecoder::Error error) - void emitter_QAudioDecoder_error_2347(QAudioDecoder::Error _error) - { - emit QAudioDecoder::error(_error); - } - // [adaptor impl] bool QAudioDecoder::event(QEvent *) bool cbs_event_1217_0(QEvent *arg1) { @@ -618,18 +737,6 @@ public: } } - // [emitter impl] void QAudioDecoder::finished() - void emitter_QAudioDecoder_finished_0() - { - emit QAudioDecoder::finished(); - } - - // [emitter impl] void QAudioDecoder::formatChanged(const QAudioFormat &format) - void emitter_QAudioDecoder_formatChanged_2509(const QAudioFormat &format) - { - emit QAudioDecoder::formatChanged(format); - } - // [adaptor impl] bool QAudioDecoder::isAvailable() bool cbs_isAvailable_c0_0() const { @@ -645,36 +752,6 @@ public: } } - // [emitter impl] void QAudioDecoder::metaDataAvailableChanged(bool available) - void emitter_QAudioDecoder_metaDataAvailableChanged_864(bool available) - { - emit QAudioDecoder::metaDataAvailableChanged(available); - } - - // [emitter impl] void QAudioDecoder::metaDataChanged() - void emitter_QAudioDecoder_metaDataChanged_0() - { - emit QAudioDecoder::metaDataChanged(); - } - - // [emitter impl] void QAudioDecoder::metaDataChanged(const QString &key, const QVariant &value) - void emitter_QAudioDecoder_metaDataChanged_4036(const QString &key, const QVariant &value) - { - emit QAudioDecoder::metaDataChanged(key, value); - } - - // [emitter impl] void QAudioDecoder::notifyIntervalChanged(int milliSeconds) - void emitter_QAudioDecoder_notifyIntervalChanged_767(int milliSeconds) - { - emit QAudioDecoder::notifyIntervalChanged(milliSeconds); - } - - // [emitter impl] void QAudioDecoder::positionChanged(qint64 position) - void emitter_QAudioDecoder_positionChanged_986(qint64 position) - { - emit QAudioDecoder::positionChanged(position); - } - // [adaptor impl] QMediaService *QAudioDecoder::service() QMediaService * cbs_service_c0_0() const { @@ -690,18 +767,6 @@ public: } } - // [emitter impl] void QAudioDecoder::sourceChanged() - void emitter_QAudioDecoder_sourceChanged_0() - { - emit QAudioDecoder::sourceChanged(); - } - - // [emitter impl] void QAudioDecoder::stateChanged(QAudioDecoder::State newState) - void emitter_QAudioDecoder_stateChanged_2338(QAudioDecoder::State newState) - { - emit QAudioDecoder::stateChanged(newState); - } - // [adaptor impl] void QAudioDecoder::unbind(QObject *) void cbs_unbind_1302_0(QObject *arg1) { @@ -848,42 +913,6 @@ static void _set_callback_cbs_availability_c0_0 (void *cls, const gsi::Callback } -// emitter void QAudioDecoder::availabilityChanged(bool available) - -static void _init_emitter_availabilityChanged_864 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("available"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_availabilityChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - bool arg1 = gsi::arg_reader() (args, heap); - ((QAudioDecoder_Adaptor *)cls)->emitter_QAudioDecoder_availabilityChanged_864 (arg1); -} - - -// emitter void QAudioDecoder::availabilityChanged(QMultimedia::AvailabilityStatus availability) - -static void _init_emitter_availabilityChanged_3555 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("availability"); - decl->add_arg::target_type & > (argspec_0); - decl->set_return (); -} - -static void _call_emitter_availabilityChanged_3555 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); - ((QAudioDecoder_Adaptor *)cls)->emitter_QAudioDecoder_availabilityChanged_3555 (arg1); -} - - // bool QAudioDecoder::bind(QObject *) static void _init_cbs_bind_1302_0 (qt_gsi::GenericMethod *decl) @@ -907,38 +936,6 @@ static void _set_callback_cbs_bind_1302_0 (void *cls, const gsi::Callback &cb) } -// emitter void QAudioDecoder::bufferAvailableChanged(bool) - -static void _init_emitter_bufferAvailableChanged_864 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_bufferAvailableChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - bool arg1 = gsi::arg_reader() (args, heap); - ((QAudioDecoder_Adaptor *)cls)->emitter_QAudioDecoder_bufferAvailableChanged_864 (arg1); -} - - -// emitter void QAudioDecoder::bufferReady() - -static void _init_emitter_bufferReady_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_bufferReady_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QAudioDecoder_Adaptor *)cls)->emitter_QAudioDecoder_bufferReady_0 (); -} - - // void QAudioDecoder::childEvent(QChildEvent *) static void _init_cbs_childEvent_1701_0 (qt_gsi::GenericMethod *decl) @@ -987,24 +984,6 @@ static void _set_callback_cbs_customEvent_1217_0 (void *cls, const gsi::Callback } -// emitter void QAudioDecoder::destroyed(QObject *) - -static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - ((QAudioDecoder_Adaptor *)cls)->emitter_QAudioDecoder_destroyed_1302 (arg1); -} - - // void QAudioDecoder::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -1029,42 +1008,6 @@ static void _set_callback_cbs_disconnectNotify_2394_0 (void *cls, const gsi::Cal } -// emitter void QAudioDecoder::durationChanged(qint64 duration) - -static void _init_emitter_durationChanged_986 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("duration"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_durationChanged_986 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - qint64 arg1 = gsi::arg_reader() (args, heap); - ((QAudioDecoder_Adaptor *)cls)->emitter_QAudioDecoder_durationChanged_986 (arg1); -} - - -// emitter void QAudioDecoder::error(QAudioDecoder::Error error) - -static void _init_emitter_error_2347 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("error"); - decl->add_arg::target_type & > (argspec_0); - decl->set_return (); -} - -static void _call_emitter_error_2347 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); - ((QAudioDecoder_Adaptor *)cls)->emitter_QAudioDecoder_error_2347 (arg1); -} - - // bool QAudioDecoder::event(QEvent *) static void _init_cbs_event_1217_0 (qt_gsi::GenericMethod *decl) @@ -1114,38 +1057,6 @@ static void _set_callback_cbs_eventFilter_2411_0 (void *cls, const gsi::Callback } -// emitter void QAudioDecoder::finished() - -static void _init_emitter_finished_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_finished_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QAudioDecoder_Adaptor *)cls)->emitter_QAudioDecoder_finished_0 (); -} - - -// emitter void QAudioDecoder::formatChanged(const QAudioFormat &format) - -static void _init_emitter_formatChanged_2509 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("format"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_formatChanged_2509 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const QAudioFormat &arg1 = gsi::arg_reader() (args, heap); - ((QAudioDecoder_Adaptor *)cls)->emitter_QAudioDecoder_formatChanged_2509 (arg1); -} - - // bool QAudioDecoder::isAvailable() static void _init_cbs_isAvailable_c0_0 (qt_gsi::GenericMethod *decl) @@ -1183,95 +1094,6 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } -// emitter void QAudioDecoder::metaDataAvailableChanged(bool available) - -static void _init_emitter_metaDataAvailableChanged_864 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("available"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_metaDataAvailableChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - bool arg1 = gsi::arg_reader() (args, heap); - ((QAudioDecoder_Adaptor *)cls)->emitter_QAudioDecoder_metaDataAvailableChanged_864 (arg1); -} - - -// emitter void QAudioDecoder::metaDataChanged() - -static void _init_emitter_metaDataChanged_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_metaDataChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QAudioDecoder_Adaptor *)cls)->emitter_QAudioDecoder_metaDataChanged_0 (); -} - - -// emitter void QAudioDecoder::metaDataChanged(const QString &key, const QVariant &value) - -static void _init_emitter_metaDataChanged_4036 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("key"); - decl->add_arg (argspec_0); - static gsi::ArgSpecBase argspec_1 ("value"); - decl->add_arg (argspec_1); - decl->set_return (); -} - -static void _call_emitter_metaDataChanged_4036 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const QString &arg1 = gsi::arg_reader() (args, heap); - const QVariant &arg2 = gsi::arg_reader() (args, heap); - ((QAudioDecoder_Adaptor *)cls)->emitter_QAudioDecoder_metaDataChanged_4036 (arg1, arg2); -} - - -// emitter void QAudioDecoder::notifyIntervalChanged(int milliSeconds) - -static void _init_emitter_notifyIntervalChanged_767 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("milliSeconds"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_notifyIntervalChanged_767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - int arg1 = gsi::arg_reader() (args, heap); - ((QAudioDecoder_Adaptor *)cls)->emitter_QAudioDecoder_notifyIntervalChanged_767 (arg1); -} - - -// emitter void QAudioDecoder::positionChanged(qint64 position) - -static void _init_emitter_positionChanged_986 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("position"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_positionChanged_986 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - qint64 arg1 = gsi::arg_reader() (args, heap); - ((QAudioDecoder_Adaptor *)cls)->emitter_QAudioDecoder_positionChanged_986 (arg1); -} - - // exposed int QAudioDecoder::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -1356,38 +1178,6 @@ static void _set_callback_cbs_service_c0_0 (void *cls, const gsi::Callback &cb) } -// emitter void QAudioDecoder::sourceChanged() - -static void _init_emitter_sourceChanged_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_sourceChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QAudioDecoder_Adaptor *)cls)->emitter_QAudioDecoder_sourceChanged_0 (); -} - - -// emitter void QAudioDecoder::stateChanged(QAudioDecoder::State newState) - -static void _init_emitter_stateChanged_2338 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("newState"); - decl->add_arg::target_type & > (argspec_0); - decl->set_return (); -} - -static void _call_emitter_stateChanged_2338 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); - ((QAudioDecoder_Adaptor *)cls)->emitter_QAudioDecoder_stateChanged_2338 (arg1); -} - - // void QAudioDecoder::timerEvent(QTimerEvent *) static void _init_cbs_timerEvent_1730_0 (qt_gsi::GenericMethod *decl) @@ -1447,43 +1237,27 @@ static gsi::Methods methods_QAudioDecoder_Adaptor () { methods += new qt_gsi::GenericMethod ("*addPropertyWatch", "@brief Method void QAudioDecoder::addPropertyWatch(QByteArray const &name)\nThis method is protected and can only be called from inside a derived class.", false, &_init_fp_addPropertyWatch_2309, &_call_fp_addPropertyWatch_2309); methods += new qt_gsi::GenericMethod ("availability", "@brief Virtual method QMultimedia::AvailabilityStatus QAudioDecoder::availability()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_availability_c0_0, &_call_cbs_availability_c0_0); methods += new qt_gsi::GenericMethod ("availability", "@hide", true, &_init_cbs_availability_c0_0, &_call_cbs_availability_c0_0, &_set_callback_cbs_availability_c0_0); - methods += new qt_gsi::GenericMethod ("emit_availabilityChanged_bool", "@brief Emitter for signal void QAudioDecoder::availabilityChanged(bool available)\nCall this method to emit this signal.", false, &_init_emitter_availabilityChanged_864, &_call_emitter_availabilityChanged_864); - methods += new qt_gsi::GenericMethod ("emit_availabilityChanged_status", "@brief Emitter for signal void QAudioDecoder::availabilityChanged(QMultimedia::AvailabilityStatus availability)\nCall this method to emit this signal.", false, &_init_emitter_availabilityChanged_3555, &_call_emitter_availabilityChanged_3555); methods += new qt_gsi::GenericMethod ("bind", "@brief Virtual method bool QAudioDecoder::bind(QObject *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_bind_1302_0, &_call_cbs_bind_1302_0); methods += new qt_gsi::GenericMethod ("bind", "@hide", false, &_init_cbs_bind_1302_0, &_call_cbs_bind_1302_0, &_set_callback_cbs_bind_1302_0); - methods += new qt_gsi::GenericMethod ("emit_bufferAvailableChanged", "@brief Emitter for signal void QAudioDecoder::bufferAvailableChanged(bool)\nCall this method to emit this signal.", false, &_init_emitter_bufferAvailableChanged_864, &_call_emitter_bufferAvailableChanged_864); - methods += new qt_gsi::GenericMethod ("emit_bufferReady", "@brief Emitter for signal void QAudioDecoder::bufferReady()\nCall this method to emit this signal.", false, &_init_emitter_bufferReady_0, &_call_emitter_bufferReady_0); methods += new qt_gsi::GenericMethod ("*childEvent", "@brief Virtual method void QAudioDecoder::childEvent(QChildEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QAudioDecoder::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); - methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QAudioDecoder::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QAudioDecoder::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); - methods += new qt_gsi::GenericMethod ("emit_durationChanged", "@brief Emitter for signal void QAudioDecoder::durationChanged(qint64 duration)\nCall this method to emit this signal.", false, &_init_emitter_durationChanged_986, &_call_emitter_durationChanged_986); - methods += new qt_gsi::GenericMethod ("emit_error_sig", "@brief Emitter for signal void QAudioDecoder::error(QAudioDecoder::Error error)\nCall this method to emit this signal.", false, &_init_emitter_error_2347, &_call_emitter_error_2347); methods += new qt_gsi::GenericMethod ("event", "@brief Virtual method bool QAudioDecoder::event(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0); methods += new qt_gsi::GenericMethod ("event", "@hide", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0, &_set_callback_cbs_event_1217_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QAudioDecoder::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); - methods += new qt_gsi::GenericMethod ("emit_finished", "@brief Emitter for signal void QAudioDecoder::finished()\nCall this method to emit this signal.", false, &_init_emitter_finished_0, &_call_emitter_finished_0); - methods += new qt_gsi::GenericMethod ("emit_formatChanged", "@brief Emitter for signal void QAudioDecoder::formatChanged(const QAudioFormat &format)\nCall this method to emit this signal.", false, &_init_emitter_formatChanged_2509, &_call_emitter_formatChanged_2509); methods += new qt_gsi::GenericMethod ("isAvailable", "@brief Virtual method bool QAudioDecoder::isAvailable()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_isAvailable_c0_0, &_call_cbs_isAvailable_c0_0); methods += new qt_gsi::GenericMethod ("isAvailable", "@hide", true, &_init_cbs_isAvailable_c0_0, &_call_cbs_isAvailable_c0_0, &_set_callback_cbs_isAvailable_c0_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QAudioDecoder::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); - methods += new qt_gsi::GenericMethod ("emit_metaDataAvailableChanged", "@brief Emitter for signal void QAudioDecoder::metaDataAvailableChanged(bool available)\nCall this method to emit this signal.", false, &_init_emitter_metaDataAvailableChanged_864, &_call_emitter_metaDataAvailableChanged_864); - methods += new qt_gsi::GenericMethod ("emit_metaDataChanged", "@brief Emitter for signal void QAudioDecoder::metaDataChanged()\nCall this method to emit this signal.", false, &_init_emitter_metaDataChanged_0, &_call_emitter_metaDataChanged_0); - methods += new qt_gsi::GenericMethod ("emit_metaDataChanged_kv", "@brief Emitter for signal void QAudioDecoder::metaDataChanged(const QString &key, const QVariant &value)\nCall this method to emit this signal.", false, &_init_emitter_metaDataChanged_4036, &_call_emitter_metaDataChanged_4036); - methods += new qt_gsi::GenericMethod ("emit_notifyIntervalChanged", "@brief Emitter for signal void QAudioDecoder::notifyIntervalChanged(int milliSeconds)\nCall this method to emit this signal.", false, &_init_emitter_notifyIntervalChanged_767, &_call_emitter_notifyIntervalChanged_767); - methods += new qt_gsi::GenericMethod ("emit_positionChanged", "@brief Emitter for signal void QAudioDecoder::positionChanged(qint64 position)\nCall this method to emit this signal.", false, &_init_emitter_positionChanged_986, &_call_emitter_positionChanged_986); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QAudioDecoder::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*removePropertyWatch", "@brief Method void QAudioDecoder::removePropertyWatch(QByteArray const &name)\nThis method is protected and can only be called from inside a derived class.", false, &_init_fp_removePropertyWatch_2309, &_call_fp_removePropertyWatch_2309); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QAudioDecoder::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QAudioDecoder::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); methods += new qt_gsi::GenericMethod ("service", "@brief Virtual method QMediaService *QAudioDecoder::service()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_service_c0_0, &_call_cbs_service_c0_0); methods += new qt_gsi::GenericMethod ("service", "@hide", true, &_init_cbs_service_c0_0, &_call_cbs_service_c0_0, &_set_callback_cbs_service_c0_0); - methods += new qt_gsi::GenericMethod ("emit_sourceChanged", "@brief Emitter for signal void QAudioDecoder::sourceChanged()\nCall this method to emit this signal.", false, &_init_emitter_sourceChanged_0, &_call_emitter_sourceChanged_0); - methods += new qt_gsi::GenericMethod ("emit_stateChanged", "@brief Emitter for signal void QAudioDecoder::stateChanged(QAudioDecoder::State newState)\nCall this method to emit this signal.", false, &_init_emitter_stateChanged_2338, &_call_emitter_stateChanged_2338); methods += new qt_gsi::GenericMethod ("*timerEvent", "@brief Virtual method void QAudioDecoder::timerEvent(QTimerEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_timerEvent_1730_0, &_call_cbs_timerEvent_1730_0); methods += new qt_gsi::GenericMethod ("*timerEvent", "@hide", false, &_init_cbs_timerEvent_1730_0, &_call_cbs_timerEvent_1730_0, &_set_callback_cbs_timerEvent_1730_0); methods += new qt_gsi::GenericMethod ("unbind", "@brief Virtual method void QAudioDecoder::unbind(QObject *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_unbind_1302_0, &_call_cbs_unbind_1302_0); diff --git a/src/gsiqt/qt5/QtMultimedia/gsiDeclQAudioDecoderControl.cc b/src/gsiqt/qt5/QtMultimedia/gsiDeclQAudioDecoderControl.cc index 991966ecf..e836b7130 100644 --- a/src/gsiqt/qt5/QtMultimedia/gsiDeclQAudioDecoderControl.cc +++ b/src/gsiqt/qt5/QtMultimedia/gsiDeclQAudioDecoderControl.cc @@ -88,6 +88,42 @@ static void _call_f_bufferAvailable_c0 (const qt_gsi::GenericMethod * /*decl*/, } +// void QAudioDecoderControl::bufferAvailableChanged(bool available) + + +static void _init_f_bufferAvailableChanged_864 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("available"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_bufferAvailableChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + bool arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QAudioDecoderControl *)cls)->bufferAvailableChanged (arg1); +} + + +// void QAudioDecoderControl::bufferReady() + + +static void _init_f_bufferReady_0 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_f_bufferReady_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + __SUPPRESS_UNUSED_WARNING(ret); + ((QAudioDecoderControl *)cls)->bufferReady (); +} + + // qint64 QAudioDecoderControl::duration() @@ -103,6 +139,85 @@ static void _call_f_duration_c0 (const qt_gsi::GenericMethod * /*decl*/, void *c } +// void QAudioDecoderControl::durationChanged(qint64 duration) + + +static void _init_f_durationChanged_986 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("duration"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_durationChanged_986 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + qint64 arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QAudioDecoderControl *)cls)->durationChanged (arg1); +} + + +// void QAudioDecoderControl::error(int error, const QString &errorString) + + +static void _init_f_error_2684 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("error"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("errorString"); + decl->add_arg (argspec_1); + decl->set_return (); +} + +static void _call_f_error_2684 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + int arg1 = gsi::arg_reader() (args, heap); + const QString &arg2 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QAudioDecoderControl *)cls)->error (arg1, arg2); +} + + +// void QAudioDecoderControl::finished() + + +static void _init_f_finished_0 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_f_finished_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + __SUPPRESS_UNUSED_WARNING(ret); + ((QAudioDecoderControl *)cls)->finished (); +} + + +// void QAudioDecoderControl::formatChanged(const QAudioFormat &format) + + +static void _init_f_formatChanged_2509 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("format"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_formatChanged_2509 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QAudioFormat &arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QAudioDecoderControl *)cls)->formatChanged (arg1); +} + + // qint64 QAudioDecoderControl::position() @@ -118,6 +233,26 @@ static void _call_f_position_c0 (const qt_gsi::GenericMethod * /*decl*/, void *c } +// void QAudioDecoderControl::positionChanged(qint64 position) + + +static void _init_f_positionChanged_986 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("position"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_positionChanged_986 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + qint64 arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QAudioDecoderControl *)cls)->positionChanged (arg1); +} + + // QAudioBuffer QAudioDecoderControl::read() @@ -193,6 +328,22 @@ static void _call_f_setSourceFilename_2025 (const qt_gsi::GenericMethod * /*decl } +// void QAudioDecoderControl::sourceChanged() + + +static void _init_f_sourceChanged_0 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_f_sourceChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + __SUPPRESS_UNUSED_WARNING(ret); + ((QAudioDecoderControl *)cls)->sourceChanged (); +} + + // QIODevice *QAudioDecoderControl::sourceDevice() @@ -254,6 +405,26 @@ static void _call_f_state_c0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, } +// void QAudioDecoderControl::stateChanged(QAudioDecoder::State newState) + + +static void _init_f_stateChanged_2338 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("newState"); + decl->add_arg::target_type & > (argspec_0); + decl->set_return (); +} + +static void _call_f_stateChanged_2338 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QAudioDecoderControl *)cls)->stateChanged (qt_gsi::QtToCppAdaptor(arg1).cref()); +} + + // void QAudioDecoderControl::stop() @@ -328,27 +499,26 @@ static gsi::Methods methods_QAudioDecoderControl () { methods += new qt_gsi::GenericStaticMethod ("staticMetaObject", "@brief Obtains the static MetaObject for this class.", &_init_smo, &_call_smo); methods += new qt_gsi::GenericMethod (":audioFormat", "@brief Method QAudioFormat QAudioDecoderControl::audioFormat()\n", true, &_init_f_audioFormat_c0, &_call_f_audioFormat_c0); methods += new qt_gsi::GenericMethod ("bufferAvailable", "@brief Method bool QAudioDecoderControl::bufferAvailable()\n", true, &_init_f_bufferAvailable_c0, &_call_f_bufferAvailable_c0); + methods += new qt_gsi::GenericMethod ("bufferAvailableChanged", "@brief Method void QAudioDecoderControl::bufferAvailableChanged(bool available)\n", false, &_init_f_bufferAvailableChanged_864, &_call_f_bufferAvailableChanged_864); + methods += new qt_gsi::GenericMethod ("bufferReady", "@brief Method void QAudioDecoderControl::bufferReady()\n", false, &_init_f_bufferReady_0, &_call_f_bufferReady_0); methods += new qt_gsi::GenericMethod ("duration", "@brief Method qint64 QAudioDecoderControl::duration()\n", true, &_init_f_duration_c0, &_call_f_duration_c0); + methods += new qt_gsi::GenericMethod ("durationChanged", "@brief Method void QAudioDecoderControl::durationChanged(qint64 duration)\n", false, &_init_f_durationChanged_986, &_call_f_durationChanged_986); + methods += new qt_gsi::GenericMethod ("error", "@brief Method void QAudioDecoderControl::error(int error, const QString &errorString)\n", false, &_init_f_error_2684, &_call_f_error_2684); + methods += new qt_gsi::GenericMethod ("finished", "@brief Method void QAudioDecoderControl::finished()\n", false, &_init_f_finished_0, &_call_f_finished_0); + methods += new qt_gsi::GenericMethod ("formatChanged", "@brief Method void QAudioDecoderControl::formatChanged(const QAudioFormat &format)\n", false, &_init_f_formatChanged_2509, &_call_f_formatChanged_2509); methods += new qt_gsi::GenericMethod ("position", "@brief Method qint64 QAudioDecoderControl::position()\n", true, &_init_f_position_c0, &_call_f_position_c0); + methods += new qt_gsi::GenericMethod ("positionChanged", "@brief Method void QAudioDecoderControl::positionChanged(qint64 position)\n", false, &_init_f_positionChanged_986, &_call_f_positionChanged_986); methods += new qt_gsi::GenericMethod ("read", "@brief Method QAudioBuffer QAudioDecoderControl::read()\n", false, &_init_f_read_0, &_call_f_read_0); methods += new qt_gsi::GenericMethod ("setAudioFormat|audioFormat=", "@brief Method void QAudioDecoderControl::setAudioFormat(const QAudioFormat &format)\n", false, &_init_f_setAudioFormat_2509, &_call_f_setAudioFormat_2509); methods += new qt_gsi::GenericMethod ("setSourceDevice|sourceDevice=", "@brief Method void QAudioDecoderControl::setSourceDevice(QIODevice *device)\n", false, &_init_f_setSourceDevice_1447, &_call_f_setSourceDevice_1447); methods += new qt_gsi::GenericMethod ("setSourceFilename|sourceFilename=", "@brief Method void QAudioDecoderControl::setSourceFilename(const QString &fileName)\n", false, &_init_f_setSourceFilename_2025, &_call_f_setSourceFilename_2025); + methods += new qt_gsi::GenericMethod ("sourceChanged", "@brief Method void QAudioDecoderControl::sourceChanged()\n", false, &_init_f_sourceChanged_0, &_call_f_sourceChanged_0); methods += new qt_gsi::GenericMethod (":sourceDevice", "@brief Method QIODevice *QAudioDecoderControl::sourceDevice()\n", true, &_init_f_sourceDevice_c0, &_call_f_sourceDevice_c0); methods += new qt_gsi::GenericMethod (":sourceFilename", "@brief Method QString QAudioDecoderControl::sourceFilename()\n", true, &_init_f_sourceFilename_c0, &_call_f_sourceFilename_c0); methods += new qt_gsi::GenericMethod ("start", "@brief Method void QAudioDecoderControl::start()\n", false, &_init_f_start_0, &_call_f_start_0); methods += new qt_gsi::GenericMethod ("state", "@brief Method QAudioDecoder::State QAudioDecoderControl::state()\n", true, &_init_f_state_c0, &_call_f_state_c0); + methods += new qt_gsi::GenericMethod ("stateChanged", "@brief Method void QAudioDecoderControl::stateChanged(QAudioDecoder::State newState)\n", false, &_init_f_stateChanged_2338, &_call_f_stateChanged_2338); methods += new qt_gsi::GenericMethod ("stop", "@brief Method void QAudioDecoderControl::stop()\n", false, &_init_f_stop_0, &_call_f_stop_0); - methods += gsi::qt_signal ("bufferAvailableChanged(bool)", "bufferAvailableChanged", gsi::arg("available"), "@brief Signal declaration for QAudioDecoderControl::bufferAvailableChanged(bool available)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("bufferReady()", "bufferReady", "@brief Signal declaration for QAudioDecoderControl::bufferReady()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QAudioDecoderControl::destroyed(QObject *)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("durationChanged(qint64)", "durationChanged", gsi::arg("duration"), "@brief Signal declaration for QAudioDecoderControl::durationChanged(qint64 duration)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("error(int, const QString &)", "error", gsi::arg("error"), gsi::arg("errorString"), "@brief Signal declaration for QAudioDecoderControl::error(int error, const QString &errorString)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("finished()", "finished", "@brief Signal declaration for QAudioDecoderControl::finished()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("formatChanged(const QAudioFormat &)", "formatChanged", gsi::arg("format"), "@brief Signal declaration for QAudioDecoderControl::formatChanged(const QAudioFormat &format)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("positionChanged(qint64)", "positionChanged", gsi::arg("position"), "@brief Signal declaration for QAudioDecoderControl::positionChanged(qint64 position)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("sourceChanged()", "sourceChanged", "@brief Signal declaration for QAudioDecoderControl::sourceChanged()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal::target_type & > ("stateChanged(QAudioDecoder::State)", "stateChanged", gsi::arg("newState"), "@brief Signal declaration for QAudioDecoderControl::stateChanged(QAudioDecoder::State newState)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QAudioDecoderControl::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QAudioDecoderControl::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -427,24 +597,6 @@ public: } } - // [emitter impl] void QAudioDecoderControl::bufferAvailableChanged(bool available) - void emitter_QAudioDecoderControl_bufferAvailableChanged_864(bool available) - { - emit QAudioDecoderControl::bufferAvailableChanged(available); - } - - // [emitter impl] void QAudioDecoderControl::bufferReady() - void emitter_QAudioDecoderControl_bufferReady_0() - { - emit QAudioDecoderControl::bufferReady(); - } - - // [emitter impl] void QAudioDecoderControl::destroyed(QObject *) - void emitter_QAudioDecoderControl_destroyed_1302(QObject *arg1) - { - emit QAudioDecoderControl::destroyed(arg1); - } - // [adaptor impl] qint64 QAudioDecoderControl::duration() qint64 cbs_duration_c0_0() const { @@ -460,18 +612,6 @@ public: } } - // [emitter impl] void QAudioDecoderControl::durationChanged(qint64 duration) - void emitter_QAudioDecoderControl_durationChanged_986(qint64 duration) - { - emit QAudioDecoderControl::durationChanged(duration); - } - - // [emitter impl] void QAudioDecoderControl::error(int error, const QString &errorString) - void emitter_QAudioDecoderControl_error_2684(int _error, const QString &errorString) - { - emit QAudioDecoderControl::error(_error, errorString); - } - // [adaptor impl] bool QAudioDecoderControl::event(QEvent *) bool cbs_event_1217_0(QEvent *arg1) { @@ -502,18 +642,6 @@ public: } } - // [emitter impl] void QAudioDecoderControl::finished() - void emitter_QAudioDecoderControl_finished_0() - { - emit QAudioDecoderControl::finished(); - } - - // [emitter impl] void QAudioDecoderControl::formatChanged(const QAudioFormat &format) - void emitter_QAudioDecoderControl_formatChanged_2509(const QAudioFormat &format) - { - emit QAudioDecoderControl::formatChanged(format); - } - // [adaptor impl] qint64 QAudioDecoderControl::position() qint64 cbs_position_c0_0() const { @@ -529,12 +657,6 @@ public: } } - // [emitter impl] void QAudioDecoderControl::positionChanged(qint64 position) - void emitter_QAudioDecoderControl_positionChanged_986(qint64 position) - { - emit QAudioDecoderControl::positionChanged(position); - } - // [adaptor impl] QAudioBuffer QAudioDecoderControl::read() QAudioBuffer cbs_read_0_0() { @@ -598,12 +720,6 @@ public: } } - // [emitter impl] void QAudioDecoderControl::sourceChanged() - void emitter_QAudioDecoderControl_sourceChanged_0() - { - emit QAudioDecoderControl::sourceChanged(); - } - // [adaptor impl] QIODevice *QAudioDecoderControl::sourceDevice() QIODevice * cbs_sourceDevice_c0_0() const { @@ -664,12 +780,6 @@ public: } } - // [emitter impl] void QAudioDecoderControl::stateChanged(QAudioDecoder::State newState) - void emitter_QAudioDecoderControl_stateChanged_2338(QAudioDecoder::State newState) - { - emit QAudioDecoderControl::stateChanged(newState); - } - // [adaptor impl] void QAudioDecoderControl::stop() void cbs_stop_0_0() { @@ -820,38 +930,6 @@ static void _set_callback_cbs_bufferAvailable_c0_0 (void *cls, const gsi::Callba } -// emitter void QAudioDecoderControl::bufferAvailableChanged(bool available) - -static void _init_emitter_bufferAvailableChanged_864 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("available"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_bufferAvailableChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - bool arg1 = gsi::arg_reader() (args, heap); - ((QAudioDecoderControl_Adaptor *)cls)->emitter_QAudioDecoderControl_bufferAvailableChanged_864 (arg1); -} - - -// emitter void QAudioDecoderControl::bufferReady() - -static void _init_emitter_bufferReady_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_bufferReady_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QAudioDecoderControl_Adaptor *)cls)->emitter_QAudioDecoderControl_bufferReady_0 (); -} - - // void QAudioDecoderControl::childEvent(QChildEvent *) static void _init_cbs_childEvent_1701_0 (qt_gsi::GenericMethod *decl) @@ -900,24 +978,6 @@ static void _set_callback_cbs_customEvent_1217_0 (void *cls, const gsi::Callback } -// emitter void QAudioDecoderControl::destroyed(QObject *) - -static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - ((QAudioDecoderControl_Adaptor *)cls)->emitter_QAudioDecoderControl_destroyed_1302 (arg1); -} - - // void QAudioDecoderControl::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -961,45 +1021,6 @@ static void _set_callback_cbs_duration_c0_0 (void *cls, const gsi::Callback &cb) } -// emitter void QAudioDecoderControl::durationChanged(qint64 duration) - -static void _init_emitter_durationChanged_986 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("duration"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_durationChanged_986 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - qint64 arg1 = gsi::arg_reader() (args, heap); - ((QAudioDecoderControl_Adaptor *)cls)->emitter_QAudioDecoderControl_durationChanged_986 (arg1); -} - - -// emitter void QAudioDecoderControl::error(int error, const QString &errorString) - -static void _init_emitter_error_2684 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("error"); - decl->add_arg (argspec_0); - static gsi::ArgSpecBase argspec_1 ("errorString"); - decl->add_arg (argspec_1); - decl->set_return (); -} - -static void _call_emitter_error_2684 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - int arg1 = gsi::arg_reader() (args, heap); - const QString &arg2 = gsi::arg_reader() (args, heap); - ((QAudioDecoderControl_Adaptor *)cls)->emitter_QAudioDecoderControl_error_2684 (arg1, arg2); -} - - // bool QAudioDecoderControl::event(QEvent *) static void _init_cbs_event_1217_0 (qt_gsi::GenericMethod *decl) @@ -1049,38 +1070,6 @@ static void _set_callback_cbs_eventFilter_2411_0 (void *cls, const gsi::Callback } -// emitter void QAudioDecoderControl::finished() - -static void _init_emitter_finished_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_finished_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QAudioDecoderControl_Adaptor *)cls)->emitter_QAudioDecoderControl_finished_0 (); -} - - -// emitter void QAudioDecoderControl::formatChanged(const QAudioFormat &format) - -static void _init_emitter_formatChanged_2509 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("format"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_formatChanged_2509 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const QAudioFormat &arg1 = gsi::arg_reader() (args, heap); - ((QAudioDecoderControl_Adaptor *)cls)->emitter_QAudioDecoderControl_formatChanged_2509 (arg1); -} - - // exposed bool QAudioDecoderControl::isSignalConnected(const QMetaMethod &signal) static void _init_fp_isSignalConnected_c2394 (qt_gsi::GenericMethod *decl) @@ -1118,24 +1107,6 @@ static void _set_callback_cbs_position_c0_0 (void *cls, const gsi::Callback &cb) } -// emitter void QAudioDecoderControl::positionChanged(qint64 position) - -static void _init_emitter_positionChanged_986 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("position"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_positionChanged_986 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - qint64 arg1 = gsi::arg_reader() (args, heap); - ((QAudioDecoderControl_Adaptor *)cls)->emitter_QAudioDecoderControl_positionChanged_986 (arg1); -} - - // QAudioBuffer QAudioDecoderControl::read() static void _init_cbs_read_0_0 (qt_gsi::GenericMethod *decl) @@ -1273,20 +1244,6 @@ static void _set_callback_cbs_setSourceFilename_2025_0 (void *cls, const gsi::Ca } -// emitter void QAudioDecoderControl::sourceChanged() - -static void _init_emitter_sourceChanged_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_sourceChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QAudioDecoderControl_Adaptor *)cls)->emitter_QAudioDecoderControl_sourceChanged_0 (); -} - - // QIODevice *QAudioDecoderControl::sourceDevice() static void _init_cbs_sourceDevice_c0_0 (qt_gsi::GenericMethod *decl) @@ -1364,24 +1321,6 @@ static void _set_callback_cbs_state_c0_0 (void *cls, const gsi::Callback &cb) } -// emitter void QAudioDecoderControl::stateChanged(QAudioDecoder::State newState) - -static void _init_emitter_stateChanged_2338 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("newState"); - decl->add_arg::target_type & > (argspec_0); - decl->set_return (); -} - -static void _call_emitter_stateChanged_2338 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); - ((QAudioDecoderControl_Adaptor *)cls)->emitter_QAudioDecoderControl_stateChanged_2338 (arg1); -} - - // void QAudioDecoderControl::stop() static void _init_cbs_stop_0_0 (qt_gsi::GenericMethod *decl) @@ -1438,29 +1377,21 @@ static gsi::Methods methods_QAudioDecoderControl_Adaptor () { methods += new qt_gsi::GenericMethod ("audioFormat", "@hide", true, &_init_cbs_audioFormat_c0_0, &_call_cbs_audioFormat_c0_0, &_set_callback_cbs_audioFormat_c0_0); methods += new qt_gsi::GenericMethod ("bufferAvailable", "@brief Virtual method bool QAudioDecoderControl::bufferAvailable()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_bufferAvailable_c0_0, &_call_cbs_bufferAvailable_c0_0); methods += new qt_gsi::GenericMethod ("bufferAvailable", "@hide", true, &_init_cbs_bufferAvailable_c0_0, &_call_cbs_bufferAvailable_c0_0, &_set_callback_cbs_bufferAvailable_c0_0); - methods += new qt_gsi::GenericMethod ("emit_bufferAvailableChanged", "@brief Emitter for signal void QAudioDecoderControl::bufferAvailableChanged(bool available)\nCall this method to emit this signal.", false, &_init_emitter_bufferAvailableChanged_864, &_call_emitter_bufferAvailableChanged_864); - methods += new qt_gsi::GenericMethod ("emit_bufferReady", "@brief Emitter for signal void QAudioDecoderControl::bufferReady()\nCall this method to emit this signal.", false, &_init_emitter_bufferReady_0, &_call_emitter_bufferReady_0); methods += new qt_gsi::GenericMethod ("*childEvent", "@brief Virtual method void QAudioDecoderControl::childEvent(QChildEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QAudioDecoderControl::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); - methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QAudioDecoderControl::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QAudioDecoderControl::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("duration", "@brief Virtual method qint64 QAudioDecoderControl::duration()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_duration_c0_0, &_call_cbs_duration_c0_0); methods += new qt_gsi::GenericMethod ("duration", "@hide", true, &_init_cbs_duration_c0_0, &_call_cbs_duration_c0_0, &_set_callback_cbs_duration_c0_0); - methods += new qt_gsi::GenericMethod ("emit_durationChanged", "@brief Emitter for signal void QAudioDecoderControl::durationChanged(qint64 duration)\nCall this method to emit this signal.", false, &_init_emitter_durationChanged_986, &_call_emitter_durationChanged_986); - methods += new qt_gsi::GenericMethod ("emit_error", "@brief Emitter for signal void QAudioDecoderControl::error(int error, const QString &errorString)\nCall this method to emit this signal.", false, &_init_emitter_error_2684, &_call_emitter_error_2684); methods += new qt_gsi::GenericMethod ("event", "@brief Virtual method bool QAudioDecoderControl::event(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0); methods += new qt_gsi::GenericMethod ("event", "@hide", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0, &_set_callback_cbs_event_1217_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QAudioDecoderControl::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); - methods += new qt_gsi::GenericMethod ("emit_finished", "@brief Emitter for signal void QAudioDecoderControl::finished()\nCall this method to emit this signal.", false, &_init_emitter_finished_0, &_call_emitter_finished_0); - methods += new qt_gsi::GenericMethod ("emit_formatChanged", "@brief Emitter for signal void QAudioDecoderControl::formatChanged(const QAudioFormat &format)\nCall this method to emit this signal.", false, &_init_emitter_formatChanged_2509, &_call_emitter_formatChanged_2509); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QAudioDecoderControl::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); methods += new qt_gsi::GenericMethod ("position", "@brief Virtual method qint64 QAudioDecoderControl::position()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_position_c0_0, &_call_cbs_position_c0_0); methods += new qt_gsi::GenericMethod ("position", "@hide", true, &_init_cbs_position_c0_0, &_call_cbs_position_c0_0, &_set_callback_cbs_position_c0_0); - methods += new qt_gsi::GenericMethod ("emit_positionChanged", "@brief Emitter for signal void QAudioDecoderControl::positionChanged(qint64 position)\nCall this method to emit this signal.", false, &_init_emitter_positionChanged_986, &_call_emitter_positionChanged_986); methods += new qt_gsi::GenericMethod ("read", "@brief Virtual method QAudioBuffer QAudioDecoderControl::read()\nThis method can be reimplemented in a derived class.", false, &_init_cbs_read_0_0, &_call_cbs_read_0_0); methods += new qt_gsi::GenericMethod ("read", "@hide", false, &_init_cbs_read_0_0, &_call_cbs_read_0_0, &_set_callback_cbs_read_0_0); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QAudioDecoderControl::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); @@ -1472,7 +1403,6 @@ static gsi::Methods methods_QAudioDecoderControl_Adaptor () { methods += new qt_gsi::GenericMethod ("setSourceDevice", "@hide", false, &_init_cbs_setSourceDevice_1447_0, &_call_cbs_setSourceDevice_1447_0, &_set_callback_cbs_setSourceDevice_1447_0); methods += new qt_gsi::GenericMethod ("setSourceFilename", "@brief Virtual method void QAudioDecoderControl::setSourceFilename(const QString &fileName)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_setSourceFilename_2025_0, &_call_cbs_setSourceFilename_2025_0); methods += new qt_gsi::GenericMethod ("setSourceFilename", "@hide", false, &_init_cbs_setSourceFilename_2025_0, &_call_cbs_setSourceFilename_2025_0, &_set_callback_cbs_setSourceFilename_2025_0); - methods += new qt_gsi::GenericMethod ("emit_sourceChanged", "@brief Emitter for signal void QAudioDecoderControl::sourceChanged()\nCall this method to emit this signal.", false, &_init_emitter_sourceChanged_0, &_call_emitter_sourceChanged_0); methods += new qt_gsi::GenericMethod ("sourceDevice", "@brief Virtual method QIODevice *QAudioDecoderControl::sourceDevice()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_sourceDevice_c0_0, &_call_cbs_sourceDevice_c0_0); methods += new qt_gsi::GenericMethod ("sourceDevice", "@hide", true, &_init_cbs_sourceDevice_c0_0, &_call_cbs_sourceDevice_c0_0, &_set_callback_cbs_sourceDevice_c0_0); methods += new qt_gsi::GenericMethod ("sourceFilename", "@brief Virtual method QString QAudioDecoderControl::sourceFilename()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_sourceFilename_c0_0, &_call_cbs_sourceFilename_c0_0); @@ -1481,7 +1411,6 @@ static gsi::Methods methods_QAudioDecoderControl_Adaptor () { methods += new qt_gsi::GenericMethod ("start", "@hide", false, &_init_cbs_start_0_0, &_call_cbs_start_0_0, &_set_callback_cbs_start_0_0); methods += new qt_gsi::GenericMethod ("state", "@brief Virtual method QAudioDecoder::State QAudioDecoderControl::state()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_state_c0_0, &_call_cbs_state_c0_0); methods += new qt_gsi::GenericMethod ("state", "@hide", true, &_init_cbs_state_c0_0, &_call_cbs_state_c0_0, &_set_callback_cbs_state_c0_0); - methods += new qt_gsi::GenericMethod ("emit_stateChanged", "@brief Emitter for signal void QAudioDecoderControl::stateChanged(QAudioDecoder::State newState)\nCall this method to emit this signal.", false, &_init_emitter_stateChanged_2338, &_call_emitter_stateChanged_2338); methods += new qt_gsi::GenericMethod ("stop", "@brief Virtual method void QAudioDecoderControl::stop()\nThis method can be reimplemented in a derived class.", false, &_init_cbs_stop_0_0, &_call_cbs_stop_0_0); methods += new qt_gsi::GenericMethod ("stop", "@hide", false, &_init_cbs_stop_0_0, &_call_cbs_stop_0_0, &_set_callback_cbs_stop_0_0); methods += new qt_gsi::GenericMethod ("*timerEvent", "@brief Virtual method void QAudioDecoderControl::timerEvent(QTimerEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_timerEvent_1730_0, &_call_cbs_timerEvent_1730_0); diff --git a/src/gsiqt/qt5/QtMultimedia/gsiDeclQAudioEncoderSettingsControl.cc b/src/gsiqt/qt5/QtMultimedia/gsiDeclQAudioEncoderSettingsControl.cc index d6b0e8103..a1feca19b 100644 --- a/src/gsiqt/qt5/QtMultimedia/gsiDeclQAudioEncoderSettingsControl.cc +++ b/src/gsiqt/qt5/QtMultimedia/gsiDeclQAudioEncoderSettingsControl.cc @@ -208,7 +208,6 @@ static gsi::Methods methods_QAudioEncoderSettingsControl () { methods += new qt_gsi::GenericMethod ("setAudioSettings|audioSettings=", "@brief Method void QAudioEncoderSettingsControl::setAudioSettings(const QAudioEncoderSettings &)\n", false, &_init_f_setAudioSettings_3445, &_call_f_setAudioSettings_3445); methods += new qt_gsi::GenericMethod ("supportedAudioCodecs", "@brief Method QStringList QAudioEncoderSettingsControl::supportedAudioCodecs()\n", true, &_init_f_supportedAudioCodecs_c0, &_call_f_supportedAudioCodecs_c0); methods += new qt_gsi::GenericMethod ("supportedSampleRates", "@brief Method QList QAudioEncoderSettingsControl::supportedSampleRates(const QAudioEncoderSettings &settings, bool *continuous)\n", true, &_init_f_supportedSampleRates_c4387, &_call_f_supportedSampleRates_c4387); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QAudioEncoderSettingsControl::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QAudioEncoderSettingsControl::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QAudioEncoderSettingsControl::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -288,12 +287,6 @@ public: } } - // [emitter impl] void QAudioEncoderSettingsControl::destroyed(QObject *) - void emitter_QAudioEncoderSettingsControl_destroyed_1302(QObject *arg1) - { - emit QAudioEncoderSettingsControl::destroyed(arg1); - } - // [adaptor impl] bool QAudioEncoderSettingsControl::event(QEvent *) bool cbs_event_1217_0(QEvent *arg1) { @@ -551,24 +544,6 @@ static void _set_callback_cbs_customEvent_1217_0 (void *cls, const gsi::Callback } -// emitter void QAudioEncoderSettingsControl::destroyed(QObject *) - -static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - ((QAudioEncoderSettingsControl_Adaptor *)cls)->emitter_QAudioEncoderSettingsControl_destroyed_1302 (arg1); -} - - // void QAudioEncoderSettingsControl::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -815,7 +790,6 @@ static gsi::Methods methods_QAudioEncoderSettingsControl_Adaptor () { methods += new qt_gsi::GenericMethod ("codecDescription", "@hide", true, &_init_cbs_codecDescription_c2025_0, &_call_cbs_codecDescription_c2025_0, &_set_callback_cbs_codecDescription_c2025_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QAudioEncoderSettingsControl::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); - methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QAudioEncoderSettingsControl::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QAudioEncoderSettingsControl::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("event", "@brief Virtual method bool QAudioEncoderSettingsControl::event(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0); diff --git a/src/gsiqt/qt5/QtMultimedia/gsiDeclQAudioInput.cc b/src/gsiqt/qt5/QtMultimedia/gsiDeclQAudioInput.cc index 863d10e8a..359510e52 100644 --- a/src/gsiqt/qt5/QtMultimedia/gsiDeclQAudioInput.cc +++ b/src/gsiqt/qt5/QtMultimedia/gsiDeclQAudioInput.cc @@ -133,6 +133,22 @@ static void _call_f_format_c0 (const qt_gsi::GenericMethod * /*decl*/, void *cls } +// void QAudioInput::notify() + + +static void _init_f_notify_0 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_f_notify_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + __SUPPRESS_UNUSED_WARNING(ret); + ((QAudioInput *)cls)->notify (); +} + + // int QAudioInput::notifyInterval() @@ -320,6 +336,26 @@ static void _call_f_state_c0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, } +// void QAudioInput::stateChanged(QAudio::State) + + +static void _init_f_stateChanged_1644 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("arg1"); + decl->add_arg::target_type & > (argspec_0); + decl->set_return (); +} + +static void _call_f_stateChanged_1644 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QAudioInput *)cls)->stateChanged (qt_gsi::QtToCppAdaptor(arg1).cref()); +} + + // void QAudioInput::stop() @@ -428,6 +464,7 @@ static gsi::Methods methods_QAudioInput () { methods += new qt_gsi::GenericMethod ("elapsedUSecs", "@brief Method qint64 QAudioInput::elapsedUSecs()\n", true, &_init_f_elapsedUSecs_c0, &_call_f_elapsedUSecs_c0); methods += new qt_gsi::GenericMethod ("error", "@brief Method QAudio::Error QAudioInput::error()\n", true, &_init_f_error_c0, &_call_f_error_c0); methods += new qt_gsi::GenericMethod ("format", "@brief Method QAudioFormat QAudioInput::format()\n", true, &_init_f_format_c0, &_call_f_format_c0); + methods += new qt_gsi::GenericMethod ("notify", "@brief Method void QAudioInput::notify()\n", false, &_init_f_notify_0, &_call_f_notify_0); methods += new qt_gsi::GenericMethod (":notifyInterval", "@brief Method int QAudioInput::notifyInterval()\n", true, &_init_f_notifyInterval_c0, &_call_f_notifyInterval_c0); methods += new qt_gsi::GenericMethod ("periodSize", "@brief Method int QAudioInput::periodSize()\n", true, &_init_f_periodSize_c0, &_call_f_periodSize_c0); methods += new qt_gsi::GenericMethod ("processedUSecs", "@brief Method qint64 QAudioInput::processedUSecs()\n", true, &_init_f_processedUSecs_c0, &_call_f_processedUSecs_c0); @@ -439,12 +476,10 @@ static gsi::Methods methods_QAudioInput () { methods += new qt_gsi::GenericMethod ("start", "@brief Method void QAudioInput::start(QIODevice *device)\n", false, &_init_f_start_1447, &_call_f_start_1447); methods += new qt_gsi::GenericMethod ("start", "@brief Method QIODevice *QAudioInput::start()\n", false, &_init_f_start_0, &_call_f_start_0); methods += new qt_gsi::GenericMethod ("state", "@brief Method QAudio::State QAudioInput::state()\n", true, &_init_f_state_c0, &_call_f_state_c0); + methods += new qt_gsi::GenericMethod ("stateChanged", "@brief Method void QAudioInput::stateChanged(QAudio::State)\n", false, &_init_f_stateChanged_1644, &_call_f_stateChanged_1644); methods += new qt_gsi::GenericMethod ("stop", "@brief Method void QAudioInput::stop()\n", false, &_init_f_stop_0, &_call_f_stop_0); methods += new qt_gsi::GenericMethod ("suspend", "@brief Method void QAudioInput::suspend()\n", false, &_init_f_suspend_0, &_call_f_suspend_0); methods += new qt_gsi::GenericMethod (":volume", "@brief Method double QAudioInput::volume()\n", true, &_init_f_volume_c0, &_call_f_volume_c0); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QAudioInput::destroyed(QObject *)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("notify()", "notify", "@brief Signal declaration for QAudioInput::notify()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal::target_type & > ("stateChanged(QAudio::State)", "stateChanged", gsi::arg("arg1"), "@brief Signal declaration for QAudioInput::stateChanged(QAudio::State)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QAudioInput::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QAudioInput::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -523,12 +558,6 @@ public: return QAudioInput::senderSignalIndex(); } - // [emitter impl] void QAudioInput::destroyed(QObject *) - void emitter_QAudioInput_destroyed_1302(QObject *arg1) - { - emit QAudioInput::destroyed(arg1); - } - // [adaptor impl] bool QAudioInput::event(QEvent *) bool cbs_event_1217_0(QEvent *arg1) { @@ -559,18 +588,6 @@ public: } } - // [emitter impl] void QAudioInput::notify() - void emitter_QAudioInput_notify_0() - { - emit QAudioInput::notify(); - } - - // [emitter impl] void QAudioInput::stateChanged(QAudio::State) - void emitter_QAudioInput_stateChanged_1644(QAudio::State arg1) - { - emit QAudioInput::stateChanged(arg1); - } - // [adaptor impl] void QAudioInput::childEvent(QChildEvent *) void cbs_childEvent_1701_0(QChildEvent *arg1) { @@ -734,24 +751,6 @@ static void _set_callback_cbs_customEvent_1217_0 (void *cls, const gsi::Callback } -// emitter void QAudioInput::destroyed(QObject *) - -static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - ((QAudioInput_Adaptor *)cls)->emitter_QAudioInput_destroyed_1302 (arg1); -} - - // void QAudioInput::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -843,20 +842,6 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } -// emitter void QAudioInput::notify() - -static void _init_emitter_notify_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_notify_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QAudioInput_Adaptor *)cls)->emitter_QAudioInput_notify_0 (); -} - - // exposed int QAudioInput::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -903,24 +888,6 @@ static void _call_fp_senderSignalIndex_c0 (const qt_gsi::GenericMethod * /*decl* } -// emitter void QAudioInput::stateChanged(QAudio::State) - -static void _init_emitter_stateChanged_1644 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1"); - decl->add_arg::target_type & > (argspec_0); - decl->set_return (); -} - -static void _call_emitter_stateChanged_1644 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); - ((QAudioInput_Adaptor *)cls)->emitter_QAudioInput_stateChanged_1644 (arg1); -} - - // void QAudioInput::timerEvent(QTimerEvent *) static void _init_cbs_timerEvent_1730_0 (qt_gsi::GenericMethod *decl) @@ -958,7 +925,6 @@ static gsi::Methods methods_QAudioInput_Adaptor () { methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QAudioInput::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); - methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QAudioInput::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QAudioInput::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("event", "@brief Virtual method bool QAudioInput::event(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0); @@ -966,11 +932,9 @@ static gsi::Methods methods_QAudioInput_Adaptor () { methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QAudioInput::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QAudioInput::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); - methods += new qt_gsi::GenericMethod ("emit_notify", "@brief Emitter for signal void QAudioInput::notify()\nCall this method to emit this signal.", false, &_init_emitter_notify_0, &_call_emitter_notify_0); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QAudioInput::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QAudioInput::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QAudioInput::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); - methods += new qt_gsi::GenericMethod ("emit_stateChanged", "@brief Emitter for signal void QAudioInput::stateChanged(QAudio::State)\nCall this method to emit this signal.", false, &_init_emitter_stateChanged_1644, &_call_emitter_stateChanged_1644); methods += new qt_gsi::GenericMethod ("*timerEvent", "@brief Virtual method void QAudioInput::timerEvent(QTimerEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_timerEvent_1730_0, &_call_cbs_timerEvent_1730_0); methods += new qt_gsi::GenericMethod ("*timerEvent", "@hide", false, &_init_cbs_timerEvent_1730_0, &_call_cbs_timerEvent_1730_0, &_set_callback_cbs_timerEvent_1730_0); return methods; diff --git a/src/gsiqt/qt5/QtMultimedia/gsiDeclQAudioInputSelectorControl.cc b/src/gsiqt/qt5/QtMultimedia/gsiDeclQAudioInputSelectorControl.cc index 787c0941c..855ee1814 100644 --- a/src/gsiqt/qt5/QtMultimedia/gsiDeclQAudioInputSelectorControl.cc +++ b/src/gsiqt/qt5/QtMultimedia/gsiDeclQAudioInputSelectorControl.cc @@ -70,6 +70,26 @@ static void _call_f_activeInput_c0 (const qt_gsi::GenericMethod * /*decl*/, void } +// void QAudioInputSelectorControl::activeInputChanged(const QString &name) + + +static void _init_f_activeInputChanged_2025 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("name"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_activeInputChanged_2025 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QAudioInputSelectorControl *)cls)->activeInputChanged (arg1); +} + + // QList QAudioInputSelectorControl::availableInputs() @@ -85,6 +105,22 @@ static void _call_f_availableInputs_c0 (const qt_gsi::GenericMethod * /*decl*/, } +// void QAudioInputSelectorControl::availableInputsChanged() + + +static void _init_f_availableInputsChanged_0 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_f_availableInputsChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + __SUPPRESS_UNUSED_WARNING(ret); + ((QAudioInputSelectorControl *)cls)->availableInputsChanged (); +} + + // QString QAudioInputSelectorControl::defaultInput() @@ -196,13 +232,12 @@ static gsi::Methods methods_QAudioInputSelectorControl () { gsi::Methods methods; methods += new qt_gsi::GenericStaticMethod ("staticMetaObject", "@brief Obtains the static MetaObject for this class.", &_init_smo, &_call_smo); methods += new qt_gsi::GenericMethod (":activeInput", "@brief Method QString QAudioInputSelectorControl::activeInput()\n", true, &_init_f_activeInput_c0, &_call_f_activeInput_c0); + methods += new qt_gsi::GenericMethod ("activeInputChanged", "@brief Method void QAudioInputSelectorControl::activeInputChanged(const QString &name)\n", false, &_init_f_activeInputChanged_2025, &_call_f_activeInputChanged_2025); methods += new qt_gsi::GenericMethod ("availableInputs", "@brief Method QList QAudioInputSelectorControl::availableInputs()\n", true, &_init_f_availableInputs_c0, &_call_f_availableInputs_c0); + methods += new qt_gsi::GenericMethod ("availableInputsChanged", "@brief Method void QAudioInputSelectorControl::availableInputsChanged()\n", false, &_init_f_availableInputsChanged_0, &_call_f_availableInputsChanged_0); methods += new qt_gsi::GenericMethod ("defaultInput", "@brief Method QString QAudioInputSelectorControl::defaultInput()\n", true, &_init_f_defaultInput_c0, &_call_f_defaultInput_c0); methods += new qt_gsi::GenericMethod ("inputDescription", "@brief Method QString QAudioInputSelectorControl::inputDescription(const QString &name)\n", true, &_init_f_inputDescription_c2025, &_call_f_inputDescription_c2025); methods += new qt_gsi::GenericMethod ("setActiveInput|activeInput=", "@brief Method void QAudioInputSelectorControl::setActiveInput(const QString &name)\n", false, &_init_f_setActiveInput_2025, &_call_f_setActiveInput_2025); - methods += gsi::qt_signal ("activeInputChanged(const QString &)", "activeInputChanged", gsi::arg("name"), "@brief Signal declaration for QAudioInputSelectorControl::activeInputChanged(const QString &name)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("availableInputsChanged()", "availableInputsChanged", "@brief Signal declaration for QAudioInputSelectorControl::availableInputsChanged()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QAudioInputSelectorControl::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QAudioInputSelectorControl::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QAudioInputSelectorControl::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -266,12 +301,6 @@ public: } } - // [emitter impl] void QAudioInputSelectorControl::activeInputChanged(const QString &name) - void emitter_QAudioInputSelectorControl_activeInputChanged_2025(const QString &name) - { - emit QAudioInputSelectorControl::activeInputChanged(name); - } - // [adaptor impl] QList QAudioInputSelectorControl::availableInputs() QList cbs_availableInputs_c0_0() const { @@ -287,12 +316,6 @@ public: } } - // [emitter impl] void QAudioInputSelectorControl::availableInputsChanged() - void emitter_QAudioInputSelectorControl_availableInputsChanged_0() - { - emit QAudioInputSelectorControl::availableInputsChanged(); - } - // [adaptor impl] QString QAudioInputSelectorControl::defaultInput() QString cbs_defaultInput_c0_0() const { @@ -308,12 +331,6 @@ public: } } - // [emitter impl] void QAudioInputSelectorControl::destroyed(QObject *) - void emitter_QAudioInputSelectorControl_destroyed_1302(QObject *arg1) - { - emit QAudioInputSelectorControl::destroyed(arg1); - } - // [adaptor impl] bool QAudioInputSelectorControl::event(QEvent *) bool cbs_event_1217_0(QEvent *arg1) { @@ -484,24 +501,6 @@ static void _set_callback_cbs_activeInput_c0_0 (void *cls, const gsi::Callback & } -// emitter void QAudioInputSelectorControl::activeInputChanged(const QString &name) - -static void _init_emitter_activeInputChanged_2025 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("name"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_activeInputChanged_2025 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const QString &arg1 = gsi::arg_reader() (args, heap); - ((QAudioInputSelectorControl_Adaptor *)cls)->emitter_QAudioInputSelectorControl_activeInputChanged_2025 (arg1); -} - - // QList QAudioInputSelectorControl::availableInputs() static void _init_cbs_availableInputs_c0_0 (qt_gsi::GenericMethod *decl) @@ -521,20 +520,6 @@ static void _set_callback_cbs_availableInputs_c0_0 (void *cls, const gsi::Callba } -// emitter void QAudioInputSelectorControl::availableInputsChanged() - -static void _init_emitter_availableInputsChanged_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_availableInputsChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QAudioInputSelectorControl_Adaptor *)cls)->emitter_QAudioInputSelectorControl_availableInputsChanged_0 (); -} - - // void QAudioInputSelectorControl::childEvent(QChildEvent *) static void _init_cbs_childEvent_1701_0 (qt_gsi::GenericMethod *decl) @@ -602,24 +587,6 @@ static void _set_callback_cbs_defaultInput_c0_0 (void *cls, const gsi::Callback } -// emitter void QAudioInputSelectorControl::destroyed(QObject *) - -static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - ((QAudioInputSelectorControl_Adaptor *)cls)->emitter_QAudioInputSelectorControl_destroyed_1302 (arg1); -} - - // void QAudioInputSelectorControl::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -838,17 +805,14 @@ static gsi::Methods methods_QAudioInputSelectorControl_Adaptor () { methods += new qt_gsi::GenericStaticMethod ("new", "@brief Constructor QAudioInputSelectorControl::QAudioInputSelectorControl()\nThis method creates an object of class QAudioInputSelectorControl.", &_init_ctor_QAudioInputSelectorControl_Adaptor_0, &_call_ctor_QAudioInputSelectorControl_Adaptor_0); methods += new qt_gsi::GenericMethod ("activeInput", "@brief Virtual method QString QAudioInputSelectorControl::activeInput()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_activeInput_c0_0, &_call_cbs_activeInput_c0_0); methods += new qt_gsi::GenericMethod ("activeInput", "@hide", true, &_init_cbs_activeInput_c0_0, &_call_cbs_activeInput_c0_0, &_set_callback_cbs_activeInput_c0_0); - methods += new qt_gsi::GenericMethod ("emit_activeInputChanged", "@brief Emitter for signal void QAudioInputSelectorControl::activeInputChanged(const QString &name)\nCall this method to emit this signal.", false, &_init_emitter_activeInputChanged_2025, &_call_emitter_activeInputChanged_2025); methods += new qt_gsi::GenericMethod ("availableInputs", "@brief Virtual method QList QAudioInputSelectorControl::availableInputs()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_availableInputs_c0_0, &_call_cbs_availableInputs_c0_0); methods += new qt_gsi::GenericMethod ("availableInputs", "@hide", true, &_init_cbs_availableInputs_c0_0, &_call_cbs_availableInputs_c0_0, &_set_callback_cbs_availableInputs_c0_0); - methods += new qt_gsi::GenericMethod ("emit_availableInputsChanged", "@brief Emitter for signal void QAudioInputSelectorControl::availableInputsChanged()\nCall this method to emit this signal.", false, &_init_emitter_availableInputsChanged_0, &_call_emitter_availableInputsChanged_0); methods += new qt_gsi::GenericMethod ("*childEvent", "@brief Virtual method void QAudioInputSelectorControl::childEvent(QChildEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QAudioInputSelectorControl::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("defaultInput", "@brief Virtual method QString QAudioInputSelectorControl::defaultInput()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_defaultInput_c0_0, &_call_cbs_defaultInput_c0_0); methods += new qt_gsi::GenericMethod ("defaultInput", "@hide", true, &_init_cbs_defaultInput_c0_0, &_call_cbs_defaultInput_c0_0, &_set_callback_cbs_defaultInput_c0_0); - methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QAudioInputSelectorControl::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QAudioInputSelectorControl::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("event", "@brief Virtual method bool QAudioInputSelectorControl::event(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0); diff --git a/src/gsiqt/qt5/QtMultimedia/gsiDeclQAudioOutput.cc b/src/gsiqt/qt5/QtMultimedia/gsiDeclQAudioOutput.cc index 1b5806966..79adafa43 100644 --- a/src/gsiqt/qt5/QtMultimedia/gsiDeclQAudioOutput.cc +++ b/src/gsiqt/qt5/QtMultimedia/gsiDeclQAudioOutput.cc @@ -148,6 +148,22 @@ static void _call_f_format_c0 (const qt_gsi::GenericMethod * /*decl*/, void *cls } +// void QAudioOutput::notify() + + +static void _init_f_notify_0 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_f_notify_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + __SUPPRESS_UNUSED_WARNING(ret); + ((QAudioOutput *)cls)->notify (); +} + + // int QAudioOutput::notifyInterval() @@ -355,6 +371,26 @@ static void _call_f_state_c0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, } +// void QAudioOutput::stateChanged(QAudio::State) + + +static void _init_f_stateChanged_1644 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("arg1"); + decl->add_arg::target_type & > (argspec_0); + decl->set_return (); +} + +static void _call_f_stateChanged_1644 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QAudioOutput *)cls)->stateChanged (qt_gsi::QtToCppAdaptor(arg1).cref()); +} + + // void QAudioOutput::stop() @@ -464,6 +500,7 @@ static gsi::Methods methods_QAudioOutput () { methods += new qt_gsi::GenericMethod ("elapsedUSecs", "@brief Method qint64 QAudioOutput::elapsedUSecs()\n", true, &_init_f_elapsedUSecs_c0, &_call_f_elapsedUSecs_c0); methods += new qt_gsi::GenericMethod ("error", "@brief Method QAudio::Error QAudioOutput::error()\n", true, &_init_f_error_c0, &_call_f_error_c0); methods += new qt_gsi::GenericMethod ("format", "@brief Method QAudioFormat QAudioOutput::format()\n", true, &_init_f_format_c0, &_call_f_format_c0); + methods += new qt_gsi::GenericMethod ("notify", "@brief Method void QAudioOutput::notify()\n", false, &_init_f_notify_0, &_call_f_notify_0); methods += new qt_gsi::GenericMethod (":notifyInterval", "@brief Method int QAudioOutput::notifyInterval()\n", true, &_init_f_notifyInterval_c0, &_call_f_notifyInterval_c0); methods += new qt_gsi::GenericMethod ("periodSize", "@brief Method int QAudioOutput::periodSize()\n", true, &_init_f_periodSize_c0, &_call_f_periodSize_c0); methods += new qt_gsi::GenericMethod ("processedUSecs", "@brief Method qint64 QAudioOutput::processedUSecs()\n", true, &_init_f_processedUSecs_c0, &_call_f_processedUSecs_c0); @@ -476,12 +513,10 @@ static gsi::Methods methods_QAudioOutput () { methods += new qt_gsi::GenericMethod ("start", "@brief Method void QAudioOutput::start(QIODevice *device)\n", false, &_init_f_start_1447, &_call_f_start_1447); methods += new qt_gsi::GenericMethod ("start", "@brief Method QIODevice *QAudioOutput::start()\n", false, &_init_f_start_0, &_call_f_start_0); methods += new qt_gsi::GenericMethod ("state", "@brief Method QAudio::State QAudioOutput::state()\n", true, &_init_f_state_c0, &_call_f_state_c0); + methods += new qt_gsi::GenericMethod ("stateChanged", "@brief Method void QAudioOutput::stateChanged(QAudio::State)\n", false, &_init_f_stateChanged_1644, &_call_f_stateChanged_1644); methods += new qt_gsi::GenericMethod ("stop", "@brief Method void QAudioOutput::stop()\n", false, &_init_f_stop_0, &_call_f_stop_0); methods += new qt_gsi::GenericMethod ("suspend", "@brief Method void QAudioOutput::suspend()\n", false, &_init_f_suspend_0, &_call_f_suspend_0); methods += new qt_gsi::GenericMethod (":volume", "@brief Method double QAudioOutput::volume()\n", true, &_init_f_volume_c0, &_call_f_volume_c0); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QAudioOutput::destroyed(QObject *)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("notify()", "notify", "@brief Signal declaration for QAudioOutput::notify()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal::target_type & > ("stateChanged(QAudio::State)", "stateChanged", gsi::arg("arg1"), "@brief Signal declaration for QAudioOutput::stateChanged(QAudio::State)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QAudioOutput::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QAudioOutput::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -560,12 +595,6 @@ public: return QAudioOutput::senderSignalIndex(); } - // [emitter impl] void QAudioOutput::destroyed(QObject *) - void emitter_QAudioOutput_destroyed_1302(QObject *arg1) - { - emit QAudioOutput::destroyed(arg1); - } - // [adaptor impl] bool QAudioOutput::event(QEvent *) bool cbs_event_1217_0(QEvent *arg1) { @@ -596,18 +625,6 @@ public: } } - // [emitter impl] void QAudioOutput::notify() - void emitter_QAudioOutput_notify_0() - { - emit QAudioOutput::notify(); - } - - // [emitter impl] void QAudioOutput::stateChanged(QAudio::State) - void emitter_QAudioOutput_stateChanged_1644(QAudio::State arg1) - { - emit QAudioOutput::stateChanged(arg1); - } - // [adaptor impl] void QAudioOutput::childEvent(QChildEvent *) void cbs_childEvent_1701_0(QChildEvent *arg1) { @@ -771,24 +788,6 @@ static void _set_callback_cbs_customEvent_1217_0 (void *cls, const gsi::Callback } -// emitter void QAudioOutput::destroyed(QObject *) - -static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - ((QAudioOutput_Adaptor *)cls)->emitter_QAudioOutput_destroyed_1302 (arg1); -} - - // void QAudioOutput::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -880,20 +879,6 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } -// emitter void QAudioOutput::notify() - -static void _init_emitter_notify_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_notify_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QAudioOutput_Adaptor *)cls)->emitter_QAudioOutput_notify_0 (); -} - - // exposed int QAudioOutput::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -940,24 +925,6 @@ static void _call_fp_senderSignalIndex_c0 (const qt_gsi::GenericMethod * /*decl* } -// emitter void QAudioOutput::stateChanged(QAudio::State) - -static void _init_emitter_stateChanged_1644 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1"); - decl->add_arg::target_type & > (argspec_0); - decl->set_return (); -} - -static void _call_emitter_stateChanged_1644 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); - ((QAudioOutput_Adaptor *)cls)->emitter_QAudioOutput_stateChanged_1644 (arg1); -} - - // void QAudioOutput::timerEvent(QTimerEvent *) static void _init_cbs_timerEvent_1730_0 (qt_gsi::GenericMethod *decl) @@ -995,7 +962,6 @@ static gsi::Methods methods_QAudioOutput_Adaptor () { methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QAudioOutput::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); - methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QAudioOutput::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QAudioOutput::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("event", "@brief Virtual method bool QAudioOutput::event(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0); @@ -1003,11 +969,9 @@ static gsi::Methods methods_QAudioOutput_Adaptor () { methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QAudioOutput::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QAudioOutput::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); - methods += new qt_gsi::GenericMethod ("emit_notify", "@brief Emitter for signal void QAudioOutput::notify()\nCall this method to emit this signal.", false, &_init_emitter_notify_0, &_call_emitter_notify_0); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QAudioOutput::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QAudioOutput::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QAudioOutput::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); - methods += new qt_gsi::GenericMethod ("emit_stateChanged", "@brief Emitter for signal void QAudioOutput::stateChanged(QAudio::State)\nCall this method to emit this signal.", false, &_init_emitter_stateChanged_1644, &_call_emitter_stateChanged_1644); methods += new qt_gsi::GenericMethod ("*timerEvent", "@brief Virtual method void QAudioOutput::timerEvent(QTimerEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_timerEvent_1730_0, &_call_cbs_timerEvent_1730_0); methods += new qt_gsi::GenericMethod ("*timerEvent", "@hide", false, &_init_cbs_timerEvent_1730_0, &_call_cbs_timerEvent_1730_0, &_set_callback_cbs_timerEvent_1730_0); return methods; diff --git a/src/gsiqt/qt5/QtMultimedia/gsiDeclQAudioOutputSelectorControl.cc b/src/gsiqt/qt5/QtMultimedia/gsiDeclQAudioOutputSelectorControl.cc index 2d56bf4ca..680d78917 100644 --- a/src/gsiqt/qt5/QtMultimedia/gsiDeclQAudioOutputSelectorControl.cc +++ b/src/gsiqt/qt5/QtMultimedia/gsiDeclQAudioOutputSelectorControl.cc @@ -70,6 +70,26 @@ static void _call_f_activeOutput_c0 (const qt_gsi::GenericMethod * /*decl*/, voi } +// void QAudioOutputSelectorControl::activeOutputChanged(const QString &name) + + +static void _init_f_activeOutputChanged_2025 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("name"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_activeOutputChanged_2025 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QAudioOutputSelectorControl *)cls)->activeOutputChanged (arg1); +} + + // QList QAudioOutputSelectorControl::availableOutputs() @@ -85,6 +105,22 @@ static void _call_f_availableOutputs_c0 (const qt_gsi::GenericMethod * /*decl*/, } +// void QAudioOutputSelectorControl::availableOutputsChanged() + + +static void _init_f_availableOutputsChanged_0 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_f_availableOutputsChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + __SUPPRESS_UNUSED_WARNING(ret); + ((QAudioOutputSelectorControl *)cls)->availableOutputsChanged (); +} + + // QString QAudioOutputSelectorControl::defaultOutput() @@ -196,13 +232,12 @@ static gsi::Methods methods_QAudioOutputSelectorControl () { gsi::Methods methods; methods += new qt_gsi::GenericStaticMethod ("staticMetaObject", "@brief Obtains the static MetaObject for this class.", &_init_smo, &_call_smo); methods += new qt_gsi::GenericMethod (":activeOutput", "@brief Method QString QAudioOutputSelectorControl::activeOutput()\n", true, &_init_f_activeOutput_c0, &_call_f_activeOutput_c0); + methods += new qt_gsi::GenericMethod ("activeOutputChanged", "@brief Method void QAudioOutputSelectorControl::activeOutputChanged(const QString &name)\n", false, &_init_f_activeOutputChanged_2025, &_call_f_activeOutputChanged_2025); methods += new qt_gsi::GenericMethod ("availableOutputs", "@brief Method QList QAudioOutputSelectorControl::availableOutputs()\n", true, &_init_f_availableOutputs_c0, &_call_f_availableOutputs_c0); + methods += new qt_gsi::GenericMethod ("availableOutputsChanged", "@brief Method void QAudioOutputSelectorControl::availableOutputsChanged()\n", false, &_init_f_availableOutputsChanged_0, &_call_f_availableOutputsChanged_0); methods += new qt_gsi::GenericMethod ("defaultOutput", "@brief Method QString QAudioOutputSelectorControl::defaultOutput()\n", true, &_init_f_defaultOutput_c0, &_call_f_defaultOutput_c0); methods += new qt_gsi::GenericMethod ("outputDescription", "@brief Method QString QAudioOutputSelectorControl::outputDescription(const QString &name)\n", true, &_init_f_outputDescription_c2025, &_call_f_outputDescription_c2025); methods += new qt_gsi::GenericMethod ("setActiveOutput|activeOutput=", "@brief Method void QAudioOutputSelectorControl::setActiveOutput(const QString &name)\n", false, &_init_f_setActiveOutput_2025, &_call_f_setActiveOutput_2025); - methods += gsi::qt_signal ("activeOutputChanged(const QString &)", "activeOutputChanged", gsi::arg("name"), "@brief Signal declaration for QAudioOutputSelectorControl::activeOutputChanged(const QString &name)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("availableOutputsChanged()", "availableOutputsChanged", "@brief Signal declaration for QAudioOutputSelectorControl::availableOutputsChanged()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QAudioOutputSelectorControl::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QAudioOutputSelectorControl::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QAudioOutputSelectorControl::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -266,12 +301,6 @@ public: } } - // [emitter impl] void QAudioOutputSelectorControl::activeOutputChanged(const QString &name) - void emitter_QAudioOutputSelectorControl_activeOutputChanged_2025(const QString &name) - { - emit QAudioOutputSelectorControl::activeOutputChanged(name); - } - // [adaptor impl] QList QAudioOutputSelectorControl::availableOutputs() QList cbs_availableOutputs_c0_0() const { @@ -287,12 +316,6 @@ public: } } - // [emitter impl] void QAudioOutputSelectorControl::availableOutputsChanged() - void emitter_QAudioOutputSelectorControl_availableOutputsChanged_0() - { - emit QAudioOutputSelectorControl::availableOutputsChanged(); - } - // [adaptor impl] QString QAudioOutputSelectorControl::defaultOutput() QString cbs_defaultOutput_c0_0() const { @@ -308,12 +331,6 @@ public: } } - // [emitter impl] void QAudioOutputSelectorControl::destroyed(QObject *) - void emitter_QAudioOutputSelectorControl_destroyed_1302(QObject *arg1) - { - emit QAudioOutputSelectorControl::destroyed(arg1); - } - // [adaptor impl] bool QAudioOutputSelectorControl::event(QEvent *) bool cbs_event_1217_0(QEvent *arg1) { @@ -484,24 +501,6 @@ static void _set_callback_cbs_activeOutput_c0_0 (void *cls, const gsi::Callback } -// emitter void QAudioOutputSelectorControl::activeOutputChanged(const QString &name) - -static void _init_emitter_activeOutputChanged_2025 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("name"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_activeOutputChanged_2025 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const QString &arg1 = gsi::arg_reader() (args, heap); - ((QAudioOutputSelectorControl_Adaptor *)cls)->emitter_QAudioOutputSelectorControl_activeOutputChanged_2025 (arg1); -} - - // QList QAudioOutputSelectorControl::availableOutputs() static void _init_cbs_availableOutputs_c0_0 (qt_gsi::GenericMethod *decl) @@ -521,20 +520,6 @@ static void _set_callback_cbs_availableOutputs_c0_0 (void *cls, const gsi::Callb } -// emitter void QAudioOutputSelectorControl::availableOutputsChanged() - -static void _init_emitter_availableOutputsChanged_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_availableOutputsChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QAudioOutputSelectorControl_Adaptor *)cls)->emitter_QAudioOutputSelectorControl_availableOutputsChanged_0 (); -} - - // void QAudioOutputSelectorControl::childEvent(QChildEvent *) static void _init_cbs_childEvent_1701_0 (qt_gsi::GenericMethod *decl) @@ -602,24 +587,6 @@ static void _set_callback_cbs_defaultOutput_c0_0 (void *cls, const gsi::Callback } -// emitter void QAudioOutputSelectorControl::destroyed(QObject *) - -static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - ((QAudioOutputSelectorControl_Adaptor *)cls)->emitter_QAudioOutputSelectorControl_destroyed_1302 (arg1); -} - - // void QAudioOutputSelectorControl::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -838,17 +805,14 @@ static gsi::Methods methods_QAudioOutputSelectorControl_Adaptor () { methods += new qt_gsi::GenericStaticMethod ("new", "@brief Constructor QAudioOutputSelectorControl::QAudioOutputSelectorControl()\nThis method creates an object of class QAudioOutputSelectorControl.", &_init_ctor_QAudioOutputSelectorControl_Adaptor_0, &_call_ctor_QAudioOutputSelectorControl_Adaptor_0); methods += new qt_gsi::GenericMethod ("activeOutput", "@brief Virtual method QString QAudioOutputSelectorControl::activeOutput()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_activeOutput_c0_0, &_call_cbs_activeOutput_c0_0); methods += new qt_gsi::GenericMethod ("activeOutput", "@hide", true, &_init_cbs_activeOutput_c0_0, &_call_cbs_activeOutput_c0_0, &_set_callback_cbs_activeOutput_c0_0); - methods += new qt_gsi::GenericMethod ("emit_activeOutputChanged", "@brief Emitter for signal void QAudioOutputSelectorControl::activeOutputChanged(const QString &name)\nCall this method to emit this signal.", false, &_init_emitter_activeOutputChanged_2025, &_call_emitter_activeOutputChanged_2025); methods += new qt_gsi::GenericMethod ("availableOutputs", "@brief Virtual method QList QAudioOutputSelectorControl::availableOutputs()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_availableOutputs_c0_0, &_call_cbs_availableOutputs_c0_0); methods += new qt_gsi::GenericMethod ("availableOutputs", "@hide", true, &_init_cbs_availableOutputs_c0_0, &_call_cbs_availableOutputs_c0_0, &_set_callback_cbs_availableOutputs_c0_0); - methods += new qt_gsi::GenericMethod ("emit_availableOutputsChanged", "@brief Emitter for signal void QAudioOutputSelectorControl::availableOutputsChanged()\nCall this method to emit this signal.", false, &_init_emitter_availableOutputsChanged_0, &_call_emitter_availableOutputsChanged_0); methods += new qt_gsi::GenericMethod ("*childEvent", "@brief Virtual method void QAudioOutputSelectorControl::childEvent(QChildEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QAudioOutputSelectorControl::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("defaultOutput", "@brief Virtual method QString QAudioOutputSelectorControl::defaultOutput()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_defaultOutput_c0_0, &_call_cbs_defaultOutput_c0_0); methods += new qt_gsi::GenericMethod ("defaultOutput", "@hide", true, &_init_cbs_defaultOutput_c0_0, &_call_cbs_defaultOutput_c0_0, &_set_callback_cbs_defaultOutput_c0_0); - methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QAudioOutputSelectorControl::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QAudioOutputSelectorControl::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("event", "@brief Virtual method bool QAudioOutputSelectorControl::event(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0); diff --git a/src/gsiqt/qt5/QtMultimedia/gsiDeclQAudioProbe.cc b/src/gsiqt/qt5/QtMultimedia/gsiDeclQAudioProbe.cc index 374571a35..16915f6a1 100644 --- a/src/gsiqt/qt5/QtMultimedia/gsiDeclQAudioProbe.cc +++ b/src/gsiqt/qt5/QtMultimedia/gsiDeclQAudioProbe.cc @@ -58,6 +58,42 @@ static void _call_smo (const qt_gsi::GenericStaticMethod *, gsi::SerialArgs &, g } +// void QAudioProbe::audioBufferProbed(const QAudioBuffer &audioBuffer) + + +static void _init_f_audioBufferProbed_2494 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("audioBuffer"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_audioBufferProbed_2494 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QAudioBuffer &arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QAudioProbe *)cls)->audioBufferProbed (arg1); +} + + +// void QAudioProbe::flush() + + +static void _init_f_flush_0 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_f_flush_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + __SUPPRESS_UNUSED_WARNING(ret); + ((QAudioProbe *)cls)->flush (); +} + + // bool QAudioProbe::isActive() @@ -167,12 +203,11 @@ namespace gsi static gsi::Methods methods_QAudioProbe () { gsi::Methods methods; methods += new qt_gsi::GenericStaticMethod ("staticMetaObject", "@brief Obtains the static MetaObject for this class.", &_init_smo, &_call_smo); + methods += new qt_gsi::GenericMethod ("audioBufferProbed", "@brief Method void QAudioProbe::audioBufferProbed(const QAudioBuffer &audioBuffer)\n", false, &_init_f_audioBufferProbed_2494, &_call_f_audioBufferProbed_2494); + methods += new qt_gsi::GenericMethod ("flush", "@brief Method void QAudioProbe::flush()\n", false, &_init_f_flush_0, &_call_f_flush_0); methods += new qt_gsi::GenericMethod ("isActive?", "@brief Method bool QAudioProbe::isActive()\n", true, &_init_f_isActive_c0, &_call_f_isActive_c0); methods += new qt_gsi::GenericMethod ("setSource", "@brief Method bool QAudioProbe::setSource(QMediaObject *source)\n", false, &_init_f_setSource_1782, &_call_f_setSource_1782); methods += new qt_gsi::GenericMethod ("setSource", "@brief Method bool QAudioProbe::setSource(QMediaRecorder *source)\n", false, &_init_f_setSource_2005, &_call_f_setSource_2005); - methods += gsi::qt_signal ("audioBufferProbed(const QAudioBuffer &)", "audioBufferProbed", gsi::arg("audioBuffer"), "@brief Signal declaration for QAudioProbe::audioBufferProbed(const QAudioBuffer &audioBuffer)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QAudioProbe::destroyed(QObject *)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("flush()", "flush", "@brief Signal declaration for QAudioProbe::flush()\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QAudioProbe::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QAudioProbe::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -227,18 +262,6 @@ public: return QAudioProbe::senderSignalIndex(); } - // [emitter impl] void QAudioProbe::audioBufferProbed(const QAudioBuffer &audioBuffer) - void emitter_QAudioProbe_audioBufferProbed_2494(const QAudioBuffer &audioBuffer) - { - emit QAudioProbe::audioBufferProbed(audioBuffer); - } - - // [emitter impl] void QAudioProbe::destroyed(QObject *) - void emitter_QAudioProbe_destroyed_1302(QObject *arg1) - { - emit QAudioProbe::destroyed(arg1); - } - // [adaptor impl] bool QAudioProbe::event(QEvent *) bool cbs_event_1217_0(QEvent *arg1) { @@ -269,12 +292,6 @@ public: } } - // [emitter impl] void QAudioProbe::flush() - void emitter_QAudioProbe_flush_0() - { - emit QAudioProbe::flush(); - } - // [adaptor impl] void QAudioProbe::childEvent(QChildEvent *) void cbs_childEvent_1701_0(QChildEvent *arg1) { @@ -363,24 +380,6 @@ static void _call_ctor_QAudioProbe_Adaptor_1302 (const qt_gsi::GenericStaticMeth } -// emitter void QAudioProbe::audioBufferProbed(const QAudioBuffer &audioBuffer) - -static void _init_emitter_audioBufferProbed_2494 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("audioBuffer"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_audioBufferProbed_2494 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const QAudioBuffer &arg1 = gsi::arg_reader() (args, heap); - ((QAudioProbe_Adaptor *)cls)->emitter_QAudioProbe_audioBufferProbed_2494 (arg1); -} - - // void QAudioProbe::childEvent(QChildEvent *) static void _init_cbs_childEvent_1701_0 (qt_gsi::GenericMethod *decl) @@ -429,24 +428,6 @@ static void _set_callback_cbs_customEvent_1217_0 (void *cls, const gsi::Callback } -// emitter void QAudioProbe::destroyed(QObject *) - -static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - ((QAudioProbe_Adaptor *)cls)->emitter_QAudioProbe_destroyed_1302 (arg1); -} - - // void QAudioProbe::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -520,20 +501,6 @@ static void _set_callback_cbs_eventFilter_2411_0 (void *cls, const gsi::Callback } -// emitter void QAudioProbe::flush() - -static void _init_emitter_flush_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_flush_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QAudioProbe_Adaptor *)cls)->emitter_QAudioProbe_flush_0 (); -} - - // exposed bool QAudioProbe::isSignalConnected(const QMetaMethod &signal) static void _init_fp_isSignalConnected_c2394 (qt_gsi::GenericMethod *decl) @@ -630,19 +597,16 @@ gsi::Class &qtdecl_QAudioProbe (); static gsi::Methods methods_QAudioProbe_Adaptor () { gsi::Methods methods; methods += new qt_gsi::GenericStaticMethod ("new", "@brief Constructor QAudioProbe::QAudioProbe(QObject *parent)\nThis method creates an object of class QAudioProbe.", &_init_ctor_QAudioProbe_Adaptor_1302, &_call_ctor_QAudioProbe_Adaptor_1302); - methods += new qt_gsi::GenericMethod ("emit_audioBufferProbed", "@brief Emitter for signal void QAudioProbe::audioBufferProbed(const QAudioBuffer &audioBuffer)\nCall this method to emit this signal.", false, &_init_emitter_audioBufferProbed_2494, &_call_emitter_audioBufferProbed_2494); methods += new qt_gsi::GenericMethod ("*childEvent", "@brief Virtual method void QAudioProbe::childEvent(QChildEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QAudioProbe::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); - methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QAudioProbe::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QAudioProbe::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("event", "@brief Virtual method bool QAudioProbe::event(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0); methods += new qt_gsi::GenericMethod ("event", "@hide", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0, &_set_callback_cbs_event_1217_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QAudioProbe::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); - methods += new qt_gsi::GenericMethod ("emit_flush", "@brief Emitter for signal void QAudioProbe::flush()\nCall this method to emit this signal.", false, &_init_emitter_flush_0, &_call_emitter_flush_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QAudioProbe::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QAudioProbe::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QAudioProbe::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); diff --git a/src/gsiqt/qt5/QtMultimedia/gsiDeclQAudioRecorder.cc b/src/gsiqt/qt5/QtMultimedia/gsiDeclQAudioRecorder.cc index 17af34a3c..fde6fdaed 100644 --- a/src/gsiqt/qt5/QtMultimedia/gsiDeclQAudioRecorder.cc +++ b/src/gsiqt/qt5/QtMultimedia/gsiDeclQAudioRecorder.cc @@ -75,6 +75,26 @@ static void _call_f_audioInput_c0 (const qt_gsi::GenericMethod * /*decl*/, void } +// void QAudioRecorder::audioInputChanged(const QString &name) + + +static void _init_f_audioInputChanged_2025 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("name"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_audioInputChanged_2025 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QAudioRecorder *)cls)->audioInputChanged (arg1); +} + + // QString QAudioRecorder::audioInputDescription(const QString &name) @@ -109,6 +129,22 @@ static void _call_f_audioInputs_c0 (const qt_gsi::GenericMethod * /*decl*/, void } +// void QAudioRecorder::availableAudioInputsChanged() + + +static void _init_f_availableAudioInputsChanged_0 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_f_availableAudioInputsChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + __SUPPRESS_UNUSED_WARNING(ret); + ((QAudioRecorder *)cls)->availableAudioInputsChanged (); +} + + // QString QAudioRecorder::defaultAudioInput() @@ -201,26 +237,12 @@ static gsi::Methods methods_QAudioRecorder () { gsi::Methods methods; methods += new qt_gsi::GenericStaticMethod ("staticMetaObject", "@brief Obtains the static MetaObject for this class.", &_init_smo, &_call_smo); methods += new qt_gsi::GenericMethod (":audioInput", "@brief Method QString QAudioRecorder::audioInput()\n", true, &_init_f_audioInput_c0, &_call_f_audioInput_c0); + methods += new qt_gsi::GenericMethod ("audioInputChanged", "@brief Method void QAudioRecorder::audioInputChanged(const QString &name)\n", false, &_init_f_audioInputChanged_2025, &_call_f_audioInputChanged_2025); methods += new qt_gsi::GenericMethod ("audioInputDescription", "@brief Method QString QAudioRecorder::audioInputDescription(const QString &name)\n", true, &_init_f_audioInputDescription_c2025, &_call_f_audioInputDescription_c2025); methods += new qt_gsi::GenericMethod ("audioInputs", "@brief Method QStringList QAudioRecorder::audioInputs()\n", true, &_init_f_audioInputs_c0, &_call_f_audioInputs_c0); + methods += new qt_gsi::GenericMethod ("availableAudioInputsChanged", "@brief Method void QAudioRecorder::availableAudioInputsChanged()\n", false, &_init_f_availableAudioInputsChanged_0, &_call_f_availableAudioInputsChanged_0); methods += new qt_gsi::GenericMethod ("defaultAudioInput", "@brief Method QString QAudioRecorder::defaultAudioInput()\n", true, &_init_f_defaultAudioInput_c0, &_call_f_defaultAudioInput_c0); methods += new qt_gsi::GenericMethod ("setAudioInput|audioInput=", "@brief Method void QAudioRecorder::setAudioInput(const QString &name)\n", false, &_init_f_setAudioInput_2025, &_call_f_setAudioInput_2025); - methods += gsi::qt_signal ("actualLocationChanged(const QUrl &)", "actualLocationChanged", gsi::arg("location"), "@brief Signal declaration for QAudioRecorder::actualLocationChanged(const QUrl &location)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("audioInputChanged(const QString &)", "audioInputChanged", gsi::arg("name"), "@brief Signal declaration for QAudioRecorder::audioInputChanged(const QString &name)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("availabilityChanged(bool)", "availabilityChanged_bool", gsi::arg("available"), "@brief Signal declaration for QAudioRecorder::availabilityChanged(bool available)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal::target_type & > ("availabilityChanged(QMultimedia::AvailabilityStatus)", "availabilityChanged_status", gsi::arg("availability"), "@brief Signal declaration for QAudioRecorder::availabilityChanged(QMultimedia::AvailabilityStatus availability)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("availableAudioInputsChanged()", "availableAudioInputsChanged", "@brief Signal declaration for QAudioRecorder::availableAudioInputsChanged()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QAudioRecorder::destroyed(QObject *)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("durationChanged(qint64)", "durationChanged", gsi::arg("duration"), "@brief Signal declaration for QAudioRecorder::durationChanged(qint64 duration)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal::target_type & > ("error(QMediaRecorder::Error)", "error", gsi::arg("error"), "@brief Signal declaration for QAudioRecorder::error(QMediaRecorder::Error error)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("metaDataAvailableChanged(bool)", "metaDataAvailableChanged", gsi::arg("available"), "@brief Signal declaration for QAudioRecorder::metaDataAvailableChanged(bool available)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("metaDataChanged()", "metaDataChanged", "@brief Signal declaration for QAudioRecorder::metaDataChanged()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("metaDataChanged(const QString &, const QVariant &)", "metaDataChanged_kv", gsi::arg("key"), gsi::arg("value"), "@brief Signal declaration for QAudioRecorder::metaDataChanged(const QString &key, const QVariant &value)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("metaDataWritableChanged(bool)", "metaDataWritableChanged", gsi::arg("writable"), "@brief Signal declaration for QAudioRecorder::metaDataWritableChanged(bool writable)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("mutedChanged(bool)", "mutedChanged", gsi::arg("muted"), "@brief Signal declaration for QAudioRecorder::mutedChanged(bool muted)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal::target_type & > ("stateChanged(QMediaRecorder::State)", "stateChanged", gsi::arg("state"), "@brief Signal declaration for QAudioRecorder::stateChanged(QMediaRecorder::State state)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal::target_type & > ("statusChanged(QMediaRecorder::Status)", "statusChanged", gsi::arg("status"), "@brief Signal declaration for QAudioRecorder::statusChanged(QMediaRecorder::Status status)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("volumeChanged(double)", "volumeChanged", gsi::arg("volume"), "@brief Signal declaration for QAudioRecorder::volumeChanged(double volume)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QAudioRecorder::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QAudioRecorder::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -275,54 +297,6 @@ public: return QAudioRecorder::senderSignalIndex(); } - // [emitter impl] void QAudioRecorder::actualLocationChanged(const QUrl &location) - void emitter_QAudioRecorder_actualLocationChanged_1701(const QUrl &location) - { - emit QAudioRecorder::actualLocationChanged(location); - } - - // [emitter impl] void QAudioRecorder::audioInputChanged(const QString &name) - void emitter_QAudioRecorder_audioInputChanged_2025(const QString &name) - { - emit QAudioRecorder::audioInputChanged(name); - } - - // [emitter impl] void QAudioRecorder::availabilityChanged(bool available) - void emitter_QAudioRecorder_availabilityChanged_864(bool available) - { - emit QAudioRecorder::availabilityChanged(available); - } - - // [emitter impl] void QAudioRecorder::availabilityChanged(QMultimedia::AvailabilityStatus availability) - void emitter_QAudioRecorder_availabilityChanged_3555(QMultimedia::AvailabilityStatus availability) - { - emit QAudioRecorder::availabilityChanged(availability); - } - - // [emitter impl] void QAudioRecorder::availableAudioInputsChanged() - void emitter_QAudioRecorder_availableAudioInputsChanged_0() - { - emit QAudioRecorder::availableAudioInputsChanged(); - } - - // [emitter impl] void QAudioRecorder::destroyed(QObject *) - void emitter_QAudioRecorder_destroyed_1302(QObject *arg1) - { - emit QAudioRecorder::destroyed(arg1); - } - - // [emitter impl] void QAudioRecorder::durationChanged(qint64 duration) - void emitter_QAudioRecorder_durationChanged_986(qint64 duration) - { - emit QAudioRecorder::durationChanged(duration); - } - - // [emitter impl] void QAudioRecorder::error(QMediaRecorder::Error error) - void emitter_QAudioRecorder_error_2457(QMediaRecorder::Error _error) - { - emit QAudioRecorder::error(_error); - } - // [adaptor impl] bool QAudioRecorder::event(QEvent *) bool cbs_event_1217_0(QEvent *arg1) { @@ -368,54 +342,6 @@ public: } } - // [emitter impl] void QAudioRecorder::metaDataAvailableChanged(bool available) - void emitter_QAudioRecorder_metaDataAvailableChanged_864(bool available) - { - emit QAudioRecorder::metaDataAvailableChanged(available); - } - - // [emitter impl] void QAudioRecorder::metaDataChanged() - void emitter_QAudioRecorder_metaDataChanged_0() - { - emit QAudioRecorder::metaDataChanged(); - } - - // [emitter impl] void QAudioRecorder::metaDataChanged(const QString &key, const QVariant &value) - void emitter_QAudioRecorder_metaDataChanged_4036(const QString &key, const QVariant &value) - { - emit QAudioRecorder::metaDataChanged(key, value); - } - - // [emitter impl] void QAudioRecorder::metaDataWritableChanged(bool writable) - void emitter_QAudioRecorder_metaDataWritableChanged_864(bool writable) - { - emit QAudioRecorder::metaDataWritableChanged(writable); - } - - // [emitter impl] void QAudioRecorder::mutedChanged(bool muted) - void emitter_QAudioRecorder_mutedChanged_864(bool muted) - { - emit QAudioRecorder::mutedChanged(muted); - } - - // [emitter impl] void QAudioRecorder::stateChanged(QMediaRecorder::State state) - void emitter_QAudioRecorder_stateChanged_2448(QMediaRecorder::State state) - { - emit QAudioRecorder::stateChanged(state); - } - - // [emitter impl] void QAudioRecorder::statusChanged(QMediaRecorder::Status status) - void emitter_QAudioRecorder_statusChanged_2579(QMediaRecorder::Status status) - { - emit QAudioRecorder::statusChanged(status); - } - - // [emitter impl] void QAudioRecorder::volumeChanged(double volume) - void emitter_QAudioRecorder_volumeChanged_1071(double volume) - { - emit QAudioRecorder::volumeChanged(volume); - } - // [adaptor impl] void QAudioRecorder::childEvent(QChildEvent *) void cbs_childEvent_1701_0(QChildEvent *arg1) { @@ -521,92 +447,6 @@ static void _call_ctor_QAudioRecorder_Adaptor_1302 (const qt_gsi::GenericStaticM } -// emitter void QAudioRecorder::actualLocationChanged(const QUrl &location) - -static void _init_emitter_actualLocationChanged_1701 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("location"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_actualLocationChanged_1701 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const QUrl &arg1 = gsi::arg_reader() (args, heap); - ((QAudioRecorder_Adaptor *)cls)->emitter_QAudioRecorder_actualLocationChanged_1701 (arg1); -} - - -// emitter void QAudioRecorder::audioInputChanged(const QString &name) - -static void _init_emitter_audioInputChanged_2025 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("name"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_audioInputChanged_2025 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const QString &arg1 = gsi::arg_reader() (args, heap); - ((QAudioRecorder_Adaptor *)cls)->emitter_QAudioRecorder_audioInputChanged_2025 (arg1); -} - - -// emitter void QAudioRecorder::availabilityChanged(bool available) - -static void _init_emitter_availabilityChanged_864 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("available"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_availabilityChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - bool arg1 = gsi::arg_reader() (args, heap); - ((QAudioRecorder_Adaptor *)cls)->emitter_QAudioRecorder_availabilityChanged_864 (arg1); -} - - -// emitter void QAudioRecorder::availabilityChanged(QMultimedia::AvailabilityStatus availability) - -static void _init_emitter_availabilityChanged_3555 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("availability"); - decl->add_arg::target_type & > (argspec_0); - decl->set_return (); -} - -static void _call_emitter_availabilityChanged_3555 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); - ((QAudioRecorder_Adaptor *)cls)->emitter_QAudioRecorder_availabilityChanged_3555 (arg1); -} - - -// emitter void QAudioRecorder::availableAudioInputsChanged() - -static void _init_emitter_availableAudioInputsChanged_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_availableAudioInputsChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QAudioRecorder_Adaptor *)cls)->emitter_QAudioRecorder_availableAudioInputsChanged_0 (); -} - - // void QAudioRecorder::childEvent(QChildEvent *) static void _init_cbs_childEvent_1701_0 (qt_gsi::GenericMethod *decl) @@ -655,24 +495,6 @@ static void _set_callback_cbs_customEvent_1217_0 (void *cls, const gsi::Callback } -// emitter void QAudioRecorder::destroyed(QObject *) - -static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - ((QAudioRecorder_Adaptor *)cls)->emitter_QAudioRecorder_destroyed_1302 (arg1); -} - - // void QAudioRecorder::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -697,42 +519,6 @@ static void _set_callback_cbs_disconnectNotify_2394_0 (void *cls, const gsi::Cal } -// emitter void QAudioRecorder::durationChanged(qint64 duration) - -static void _init_emitter_durationChanged_986 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("duration"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_durationChanged_986 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - qint64 arg1 = gsi::arg_reader() (args, heap); - ((QAudioRecorder_Adaptor *)cls)->emitter_QAudioRecorder_durationChanged_986 (arg1); -} - - -// emitter void QAudioRecorder::error(QMediaRecorder::Error error) - -static void _init_emitter_error_2457 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("error"); - decl->add_arg::target_type & > (argspec_0); - decl->set_return (); -} - -static void _call_emitter_error_2457 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); - ((QAudioRecorder_Adaptor *)cls)->emitter_QAudioRecorder_error_2457 (arg1); -} - - // bool QAudioRecorder::event(QEvent *) static void _init_cbs_event_1217_0 (qt_gsi::GenericMethod *decl) @@ -819,95 +605,6 @@ static void _set_callback_cbs_mediaObject_c0_0 (void *cls, const gsi::Callback & } -// emitter void QAudioRecorder::metaDataAvailableChanged(bool available) - -static void _init_emitter_metaDataAvailableChanged_864 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("available"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_metaDataAvailableChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - bool arg1 = gsi::arg_reader() (args, heap); - ((QAudioRecorder_Adaptor *)cls)->emitter_QAudioRecorder_metaDataAvailableChanged_864 (arg1); -} - - -// emitter void QAudioRecorder::metaDataChanged() - -static void _init_emitter_metaDataChanged_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_metaDataChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QAudioRecorder_Adaptor *)cls)->emitter_QAudioRecorder_metaDataChanged_0 (); -} - - -// emitter void QAudioRecorder::metaDataChanged(const QString &key, const QVariant &value) - -static void _init_emitter_metaDataChanged_4036 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("key"); - decl->add_arg (argspec_0); - static gsi::ArgSpecBase argspec_1 ("value"); - decl->add_arg (argspec_1); - decl->set_return (); -} - -static void _call_emitter_metaDataChanged_4036 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const QString &arg1 = gsi::arg_reader() (args, heap); - const QVariant &arg2 = gsi::arg_reader() (args, heap); - ((QAudioRecorder_Adaptor *)cls)->emitter_QAudioRecorder_metaDataChanged_4036 (arg1, arg2); -} - - -// emitter void QAudioRecorder::metaDataWritableChanged(bool writable) - -static void _init_emitter_metaDataWritableChanged_864 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("writable"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_metaDataWritableChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - bool arg1 = gsi::arg_reader() (args, heap); - ((QAudioRecorder_Adaptor *)cls)->emitter_QAudioRecorder_metaDataWritableChanged_864 (arg1); -} - - -// emitter void QAudioRecorder::mutedChanged(bool muted) - -static void _init_emitter_mutedChanged_864 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("muted"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_mutedChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - bool arg1 = gsi::arg_reader() (args, heap); - ((QAudioRecorder_Adaptor *)cls)->emitter_QAudioRecorder_mutedChanged_864 (arg1); -} - - // exposed int QAudioRecorder::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -977,42 +674,6 @@ static void _set_callback_cbs_setMediaObject_1782_0 (void *cls, const gsi::Callb } -// emitter void QAudioRecorder::stateChanged(QMediaRecorder::State state) - -static void _init_emitter_stateChanged_2448 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("state"); - decl->add_arg::target_type & > (argspec_0); - decl->set_return (); -} - -static void _call_emitter_stateChanged_2448 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); - ((QAudioRecorder_Adaptor *)cls)->emitter_QAudioRecorder_stateChanged_2448 (arg1); -} - - -// emitter void QAudioRecorder::statusChanged(QMediaRecorder::Status status) - -static void _init_emitter_statusChanged_2579 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("status"); - decl->add_arg::target_type & > (argspec_0); - decl->set_return (); -} - -static void _call_emitter_statusChanged_2579 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); - ((QAudioRecorder_Adaptor *)cls)->emitter_QAudioRecorder_statusChanged_2579 (arg1); -} - - // void QAudioRecorder::timerEvent(QTimerEvent *) static void _init_cbs_timerEvent_1730_0 (qt_gsi::GenericMethod *decl) @@ -1037,24 +698,6 @@ static void _set_callback_cbs_timerEvent_1730_0 (void *cls, const gsi::Callback } -// emitter void QAudioRecorder::volumeChanged(double volume) - -static void _init_emitter_volumeChanged_1071 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("volume"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_volumeChanged_1071 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - double arg1 = gsi::arg_reader() (args, heap); - ((QAudioRecorder_Adaptor *)cls)->emitter_QAudioRecorder_volumeChanged_1071 (arg1); -} - - namespace gsi { @@ -1063,20 +706,12 @@ gsi::Class &qtdecl_QAudioRecorder (); static gsi::Methods methods_QAudioRecorder_Adaptor () { gsi::Methods methods; methods += new qt_gsi::GenericStaticMethod ("new", "@brief Constructor QAudioRecorder::QAudioRecorder(QObject *parent)\nThis method creates an object of class QAudioRecorder.", &_init_ctor_QAudioRecorder_Adaptor_1302, &_call_ctor_QAudioRecorder_Adaptor_1302); - methods += new qt_gsi::GenericMethod ("emit_actualLocationChanged", "@brief Emitter for signal void QAudioRecorder::actualLocationChanged(const QUrl &location)\nCall this method to emit this signal.", false, &_init_emitter_actualLocationChanged_1701, &_call_emitter_actualLocationChanged_1701); - methods += new qt_gsi::GenericMethod ("emit_audioInputChanged", "@brief Emitter for signal void QAudioRecorder::audioInputChanged(const QString &name)\nCall this method to emit this signal.", false, &_init_emitter_audioInputChanged_2025, &_call_emitter_audioInputChanged_2025); - methods += new qt_gsi::GenericMethod ("emit_availabilityChanged_bool", "@brief Emitter for signal void QAudioRecorder::availabilityChanged(bool available)\nCall this method to emit this signal.", false, &_init_emitter_availabilityChanged_864, &_call_emitter_availabilityChanged_864); - methods += new qt_gsi::GenericMethod ("emit_availabilityChanged_status", "@brief Emitter for signal void QAudioRecorder::availabilityChanged(QMultimedia::AvailabilityStatus availability)\nCall this method to emit this signal.", false, &_init_emitter_availabilityChanged_3555, &_call_emitter_availabilityChanged_3555); - methods += new qt_gsi::GenericMethod ("emit_availableAudioInputsChanged", "@brief Emitter for signal void QAudioRecorder::availableAudioInputsChanged()\nCall this method to emit this signal.", false, &_init_emitter_availableAudioInputsChanged_0, &_call_emitter_availableAudioInputsChanged_0); methods += new qt_gsi::GenericMethod ("*childEvent", "@brief Virtual method void QAudioRecorder::childEvent(QChildEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QAudioRecorder::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); - methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QAudioRecorder::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QAudioRecorder::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); - methods += new qt_gsi::GenericMethod ("emit_durationChanged", "@brief Emitter for signal void QAudioRecorder::durationChanged(qint64 duration)\nCall this method to emit this signal.", false, &_init_emitter_durationChanged_986, &_call_emitter_durationChanged_986); - methods += new qt_gsi::GenericMethod ("emit_error", "@brief Emitter for signal void QAudioRecorder::error(QMediaRecorder::Error error)\nCall this method to emit this signal.", false, &_init_emitter_error_2457, &_call_emitter_error_2457); methods += new qt_gsi::GenericMethod ("event", "@brief Virtual method bool QAudioRecorder::event(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0); methods += new qt_gsi::GenericMethod ("event", "@hide", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0, &_set_callback_cbs_event_1217_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QAudioRecorder::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); @@ -1084,21 +719,13 @@ static gsi::Methods methods_QAudioRecorder_Adaptor () { methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QAudioRecorder::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); methods += new qt_gsi::GenericMethod ("mediaObject", "@brief Virtual method QMediaObject *QAudioRecorder::mediaObject()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_mediaObject_c0_0, &_call_cbs_mediaObject_c0_0); methods += new qt_gsi::GenericMethod ("mediaObject", "@hide", true, &_init_cbs_mediaObject_c0_0, &_call_cbs_mediaObject_c0_0, &_set_callback_cbs_mediaObject_c0_0); - methods += new qt_gsi::GenericMethod ("emit_metaDataAvailableChanged", "@brief Emitter for signal void QAudioRecorder::metaDataAvailableChanged(bool available)\nCall this method to emit this signal.", false, &_init_emitter_metaDataAvailableChanged_864, &_call_emitter_metaDataAvailableChanged_864); - methods += new qt_gsi::GenericMethod ("emit_metaDataChanged", "@brief Emitter for signal void QAudioRecorder::metaDataChanged()\nCall this method to emit this signal.", false, &_init_emitter_metaDataChanged_0, &_call_emitter_metaDataChanged_0); - methods += new qt_gsi::GenericMethod ("emit_metaDataChanged_kv", "@brief Emitter for signal void QAudioRecorder::metaDataChanged(const QString &key, const QVariant &value)\nCall this method to emit this signal.", false, &_init_emitter_metaDataChanged_4036, &_call_emitter_metaDataChanged_4036); - methods += new qt_gsi::GenericMethod ("emit_metaDataWritableChanged", "@brief Emitter for signal void QAudioRecorder::metaDataWritableChanged(bool writable)\nCall this method to emit this signal.", false, &_init_emitter_metaDataWritableChanged_864, &_call_emitter_metaDataWritableChanged_864); - methods += new qt_gsi::GenericMethod ("emit_mutedChanged", "@brief Emitter for signal void QAudioRecorder::mutedChanged(bool muted)\nCall this method to emit this signal.", false, &_init_emitter_mutedChanged_864, &_call_emitter_mutedChanged_864); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QAudioRecorder::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QAudioRecorder::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QAudioRecorder::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); methods += new qt_gsi::GenericMethod ("*setMediaObject", "@brief Virtual method bool QAudioRecorder::setMediaObject(QMediaObject *object)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_setMediaObject_1782_0, &_call_cbs_setMediaObject_1782_0); methods += new qt_gsi::GenericMethod ("*setMediaObject", "@hide", false, &_init_cbs_setMediaObject_1782_0, &_call_cbs_setMediaObject_1782_0, &_set_callback_cbs_setMediaObject_1782_0); - methods += new qt_gsi::GenericMethod ("emit_stateChanged", "@brief Emitter for signal void QAudioRecorder::stateChanged(QMediaRecorder::State state)\nCall this method to emit this signal.", false, &_init_emitter_stateChanged_2448, &_call_emitter_stateChanged_2448); - methods += new qt_gsi::GenericMethod ("emit_statusChanged", "@brief Emitter for signal void QAudioRecorder::statusChanged(QMediaRecorder::Status status)\nCall this method to emit this signal.", false, &_init_emitter_statusChanged_2579, &_call_emitter_statusChanged_2579); methods += new qt_gsi::GenericMethod ("*timerEvent", "@brief Virtual method void QAudioRecorder::timerEvent(QTimerEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_timerEvent_1730_0, &_call_cbs_timerEvent_1730_0); methods += new qt_gsi::GenericMethod ("*timerEvent", "@hide", false, &_init_cbs_timerEvent_1730_0, &_call_cbs_timerEvent_1730_0, &_set_callback_cbs_timerEvent_1730_0); - methods += new qt_gsi::GenericMethod ("emit_volumeChanged", "@brief Emitter for signal void QAudioRecorder::volumeChanged(double volume)\nCall this method to emit this signal.", false, &_init_emitter_volumeChanged_1071, &_call_emitter_volumeChanged_1071); return methods; } diff --git a/src/gsiqt/qt5/QtMultimedia/gsiDeclQAudioSystemPlugin.cc b/src/gsiqt/qt5/QtMultimedia/gsiDeclQAudioSystemPlugin.cc index 5a29a3df3..689e29e0d 100644 --- a/src/gsiqt/qt5/QtMultimedia/gsiDeclQAudioSystemPlugin.cc +++ b/src/gsiqt/qt5/QtMultimedia/gsiDeclQAudioSystemPlugin.cc @@ -242,7 +242,6 @@ static gsi::Methods methods_QAudioSystemPlugin () { methods += new qt_gsi::GenericMethod ("createDeviceInfo", "@brief Method QAbstractAudioDeviceInfo *QAudioSystemPlugin::createDeviceInfo(const QByteArray &device, QAudio::Mode mode)\nThis is a reimplementation of QAudioSystemFactoryInterface::createDeviceInfo", false, &_init_f_createDeviceInfo_3721, &_call_f_createDeviceInfo_3721); methods += new qt_gsi::GenericMethod ("createInput", "@brief Method QAbstractAudioInput *QAudioSystemPlugin::createInput(const QByteArray &device)\nThis is a reimplementation of QAudioSystemFactoryInterface::createInput", false, &_init_f_createInput_2309, &_call_f_createInput_2309); methods += new qt_gsi::GenericMethod ("createOutput", "@brief Method QAbstractAudioOutput *QAudioSystemPlugin::createOutput(const QByteArray &device)\nThis is a reimplementation of QAudioSystemFactoryInterface::createOutput", false, &_init_f_createOutput_2309, &_call_f_createOutput_2309); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QAudioSystemPlugin::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QAudioSystemPlugin::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QAudioSystemPlugin::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); methods += new qt_gsi::GenericMethod ("asQObject", "@brief Delivers the base class interface QObject of QAudioSystemPlugin\nClass QAudioSystemPlugin is derived from multiple base classes. This method delivers the QObject base class aspect.", false, &_init_f_QAudioSystemPlugin_as_QObject, &_call_f_QAudioSystemPlugin_as_QObject); @@ -366,12 +365,6 @@ public: } } - // [emitter impl] void QAudioSystemPlugin::destroyed(QObject *) - void emitter_QAudioSystemPlugin_destroyed_1302(QObject *arg1) - { - emit QAudioSystemPlugin::destroyed(arg1); - } - // [adaptor impl] bool QAudioSystemPlugin::event(QEvent *) bool cbs_event_1217_0(QEvent *arg1) { @@ -637,24 +630,6 @@ static void _set_callback_cbs_customEvent_1217_0 (void *cls, const gsi::Callback } -// emitter void QAudioSystemPlugin::destroyed(QObject *) - -static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - ((QAudioSystemPlugin_Adaptor *)cls)->emitter_QAudioSystemPlugin_destroyed_1302 (arg1); -} - - // void QAudioSystemPlugin::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -836,7 +811,6 @@ static gsi::Methods methods_QAudioSystemPlugin_Adaptor () { methods += new qt_gsi::GenericMethod ("createOutput", "@hide", false, &_init_cbs_createOutput_2309_0, &_call_cbs_createOutput_2309_0, &_set_callback_cbs_createOutput_2309_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QAudioSystemPlugin::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); - methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QAudioSystemPlugin::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QAudioSystemPlugin::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("event", "@brief Virtual method bool QAudioSystemPlugin::event(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0); diff --git a/src/gsiqt/qt5/QtMultimedia/gsiDeclQCamera.cc b/src/gsiqt/qt5/QtMultimedia/gsiDeclQCamera.cc index cf9dec18a..e27aaab5a 100644 --- a/src/gsiqt/qt5/QtMultimedia/gsiDeclQCamera.cc +++ b/src/gsiqt/qt5/QtMultimedia/gsiDeclQCamera.cc @@ -83,6 +83,26 @@ static void _call_f_captureMode_c0 (const qt_gsi::GenericMethod * /*decl*/, void } +// void QCamera::captureModeChanged(QFlags) + + +static void _init_f_captureModeChanged_3027 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("arg1"); + decl->add_arg > (argspec_0); + decl->set_return (); +} + +static void _call_f_captureModeChanged_3027 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + QFlags arg1 = gsi::arg_reader >() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QCamera *)cls)->captureModeChanged (arg1); +} + + // QCamera::Error QCamera::error() @@ -98,6 +118,26 @@ static void _call_f_error_c0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, } +// void QCamera::error(QCamera::Error) + + +static void _init_f_error_1740 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("arg1"); + decl->add_arg::target_type & > (argspec_0); + decl->set_return (); +} + +static void _call_f_error_1740 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QCamera *)cls)->error (qt_gsi::QtToCppAdaptor(arg1).cref()); +} + + // QString QCamera::errorString() @@ -193,6 +233,22 @@ static void _call_f_load_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, g } +// void QCamera::lockFailed() + + +static void _init_f_lockFailed_0 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_f_lockFailed_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + __SUPPRESS_UNUSED_WARNING(ret); + ((QCamera *)cls)->lockFailed (); +} + + // QCamera::LockStatus QCamera::lockStatus() @@ -227,6 +283,71 @@ static void _call_f_lockStatus_c2029 (const qt_gsi::GenericMethod * /*decl*/, vo } +// void QCamera::lockStatusChanged(QCamera::LockStatus, QCamera::LockChangeReason) + + +static void _init_f_lockStatusChanged_4956 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("arg1"); + decl->add_arg::target_type & > (argspec_0); + static gsi::ArgSpecBase argspec_1 ("arg2"); + decl->add_arg::target_type & > (argspec_1); + decl->set_return (); +} + +static void _call_f_lockStatusChanged_4956 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); + const qt_gsi::Converter::target_type & arg2 = gsi::arg_reader::target_type & >() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QCamera *)cls)->lockStatusChanged (qt_gsi::QtToCppAdaptor(arg1).cref(), qt_gsi::QtToCppAdaptor(arg2).cref()); +} + + +// void QCamera::lockStatusChanged(QCamera::LockType, QCamera::LockStatus, QCamera::LockChangeReason) + + +static void _init_f_lockStatusChanged_6877 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("arg1"); + decl->add_arg::target_type & > (argspec_0); + static gsi::ArgSpecBase argspec_1 ("arg2"); + decl->add_arg::target_type & > (argspec_1); + static gsi::ArgSpecBase argspec_2 ("arg3"); + decl->add_arg::target_type & > (argspec_2); + decl->set_return (); +} + +static void _call_f_lockStatusChanged_6877 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); + const qt_gsi::Converter::target_type & arg2 = gsi::arg_reader::target_type & >() (args, heap); + const qt_gsi::Converter::target_type & arg3 = gsi::arg_reader::target_type & >() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QCamera *)cls)->lockStatusChanged (qt_gsi::QtToCppAdaptor(arg1).cref(), qt_gsi::QtToCppAdaptor(arg2).cref(), qt_gsi::QtToCppAdaptor(arg3).cref()); +} + + +// void QCamera::locked() + + +static void _init_f_locked_0 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_f_locked_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + __SUPPRESS_UNUSED_WARNING(ret); + ((QCamera *)cls)->locked (); +} + + // QFlags QCamera::requestedLocks() @@ -409,6 +530,26 @@ static void _call_f_state_c0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, } +// void QCamera::stateChanged(QCamera::State) + + +static void _init_f_stateChanged_1731 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("arg1"); + decl->add_arg::target_type & > (argspec_0); + decl->set_return (); +} + +static void _call_f_stateChanged_1731 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QCamera *)cls)->stateChanged (qt_gsi::QtToCppAdaptor(arg1).cref()); +} + + // QCamera::Status QCamera::status() @@ -424,6 +565,26 @@ static void _call_f_status_c0 (const qt_gsi::GenericMethod * /*decl*/, void *cls } +// void QCamera::statusChanged(QCamera::Status) + + +static void _init_f_statusChanged_1862 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("arg1"); + decl->add_arg::target_type & > (argspec_0); + decl->set_return (); +} + +static void _call_f_statusChanged_1862 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QCamera *)cls)->statusChanged (qt_gsi::QtToCppAdaptor(arg1).cref()); +} + + // void QCamera::stop() @@ -690,15 +851,21 @@ static gsi::Methods methods_QCamera () { methods += new qt_gsi::GenericStaticMethod ("staticMetaObject", "@brief Obtains the static MetaObject for this class.", &_init_smo, &_call_smo); methods += new qt_gsi::GenericMethod ("availability", "@brief Method QMultimedia::AvailabilityStatus QCamera::availability()\nThis is a reimplementation of QMediaObject::availability", true, &_init_f_availability_c0, &_call_f_availability_c0); methods += new qt_gsi::GenericMethod (":captureMode", "@brief Method QFlags QCamera::captureMode()\n", true, &_init_f_captureMode_c0, &_call_f_captureMode_c0); + methods += new qt_gsi::GenericMethod ("captureModeChanged", "@brief Method void QCamera::captureModeChanged(QFlags)\n", false, &_init_f_captureModeChanged_3027, &_call_f_captureModeChanged_3027); methods += new qt_gsi::GenericMethod ("error", "@brief Method QCamera::Error QCamera::error()\n", true, &_init_f_error_c0, &_call_f_error_c0); + methods += new qt_gsi::GenericMethod ("error_sig", "@brief Method void QCamera::error(QCamera::Error)\n", false, &_init_f_error_1740, &_call_f_error_1740); methods += new qt_gsi::GenericMethod ("errorString", "@brief Method QString QCamera::errorString()\n", true, &_init_f_errorString_c0, &_call_f_errorString_c0); methods += new qt_gsi::GenericMethod ("exposure", "@brief Method QCameraExposure *QCamera::exposure()\n", true, &_init_f_exposure_c0, &_call_f_exposure_c0); methods += new qt_gsi::GenericMethod ("focus", "@brief Method QCameraFocus *QCamera::focus()\n", true, &_init_f_focus_c0, &_call_f_focus_c0); methods += new qt_gsi::GenericMethod ("imageProcessing", "@brief Method QCameraImageProcessing *QCamera::imageProcessing()\n", true, &_init_f_imageProcessing_c0, &_call_f_imageProcessing_c0); methods += new qt_gsi::GenericMethod ("isCaptureModeSupported?", "@brief Method bool QCamera::isCaptureModeSupported(QFlags mode)\n", true, &_init_f_isCaptureModeSupported_c3027, &_call_f_isCaptureModeSupported_c3027); methods += new qt_gsi::GenericMethod ("load", "@brief Method void QCamera::load()\n", false, &_init_f_load_0, &_call_f_load_0); + methods += new qt_gsi::GenericMethod ("lockFailed", "@brief Method void QCamera::lockFailed()\n", false, &_init_f_lockFailed_0, &_call_f_lockFailed_0); methods += new qt_gsi::GenericMethod (":lockStatus", "@brief Method QCamera::LockStatus QCamera::lockStatus()\n", true, &_init_f_lockStatus_c0, &_call_f_lockStatus_c0); methods += new qt_gsi::GenericMethod ("lockStatus", "@brief Method QCamera::LockStatus QCamera::lockStatus(QCamera::LockType lock)\n", true, &_init_f_lockStatus_c2029, &_call_f_lockStatus_c2029); + methods += new qt_gsi::GenericMethod ("lockStatusChanged", "@brief Method void QCamera::lockStatusChanged(QCamera::LockStatus, QCamera::LockChangeReason)\n", false, &_init_f_lockStatusChanged_4956, &_call_f_lockStatusChanged_4956); + methods += new qt_gsi::GenericMethod ("lockStatusChanged_withType", "@brief Method void QCamera::lockStatusChanged(QCamera::LockType, QCamera::LockStatus, QCamera::LockChangeReason)\n", false, &_init_f_lockStatusChanged_6877, &_call_f_lockStatusChanged_6877); + methods += new qt_gsi::GenericMethod ("locked", "@brief Method void QCamera::locked()\n", false, &_init_f_locked_0, &_call_f_locked_0); methods += new qt_gsi::GenericMethod ("requestedLocks", "@brief Method QFlags QCamera::requestedLocks()\n", true, &_init_f_requestedLocks_c0, &_call_f_requestedLocks_c0); methods += new qt_gsi::GenericMethod ("searchAndLock", "@brief Method void QCamera::searchAndLock()\n", false, &_init_f_searchAndLock_0, &_call_f_searchAndLock_0); methods += new qt_gsi::GenericMethod ("searchAndLock", "@brief Method void QCamera::searchAndLock(QFlags locks)\n", false, &_init_f_searchAndLock_2725, &_call_f_searchAndLock_2725); @@ -709,7 +876,9 @@ static gsi::Methods methods_QCamera () { methods += new qt_gsi::GenericMethod ("setViewfinderSettings|viewfinderSettings=", "@brief Method void QCamera::setViewfinderSettings(const QCameraViewfinderSettings &settings)\n", false, &_init_f_setViewfinderSettings_3871, &_call_f_setViewfinderSettings_3871); methods += new qt_gsi::GenericMethod ("start", "@brief Method void QCamera::start()\n", false, &_init_f_start_0, &_call_f_start_0); methods += new qt_gsi::GenericMethod (":state", "@brief Method QCamera::State QCamera::state()\n", true, &_init_f_state_c0, &_call_f_state_c0); + methods += new qt_gsi::GenericMethod ("stateChanged", "@brief Method void QCamera::stateChanged(QCamera::State)\n", false, &_init_f_stateChanged_1731, &_call_f_stateChanged_1731); methods += new qt_gsi::GenericMethod (":status", "@brief Method QCamera::Status QCamera::status()\n", true, &_init_f_status_c0, &_call_f_status_c0); + methods += new qt_gsi::GenericMethod ("statusChanged", "@brief Method void QCamera::statusChanged(QCamera::Status)\n", false, &_init_f_statusChanged_1862, &_call_f_statusChanged_1862); methods += new qt_gsi::GenericMethod ("stop", "@brief Method void QCamera::stop()\n", false, &_init_f_stop_0, &_call_f_stop_0); methods += new qt_gsi::GenericMethod ("supportedLocks", "@brief Method QFlags QCamera::supportedLocks()\n", true, &_init_f_supportedLocks_c0, &_call_f_supportedLocks_c0); methods += new qt_gsi::GenericMethod ("supportedViewfinderFrameRateRanges", "@brief Method QList QCamera::supportedViewfinderFrameRateRanges(const QCameraViewfinderSettings &settings)\n", true, &_init_f_supportedViewfinderFrameRateRanges_c3871, &_call_f_supportedViewfinderFrameRateRanges_c3871); @@ -720,21 +889,6 @@ static gsi::Methods methods_QCamera () { methods += new qt_gsi::GenericMethod ("unlock", "@brief Method void QCamera::unlock()\n", false, &_init_f_unlock_0, &_call_f_unlock_0); methods += new qt_gsi::GenericMethod ("unlock", "@brief Method void QCamera::unlock(QFlags locks)\n", false, &_init_f_unlock_2725, &_call_f_unlock_2725); methods += new qt_gsi::GenericMethod (":viewfinderSettings", "@brief Method QCameraViewfinderSettings QCamera::viewfinderSettings()\n", true, &_init_f_viewfinderSettings_c0, &_call_f_viewfinderSettings_c0); - methods += gsi::qt_signal ("availabilityChanged(bool)", "availabilityChanged_bool", gsi::arg("available"), "@brief Signal declaration for QCamera::availabilityChanged(bool available)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal::target_type & > ("availabilityChanged(QMultimedia::AvailabilityStatus)", "availabilityChanged_status", gsi::arg("availability"), "@brief Signal declaration for QCamera::availabilityChanged(QMultimedia::AvailabilityStatus availability)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal > ("captureModeChanged(QFlags)", "captureModeChanged", gsi::arg("arg1"), "@brief Signal declaration for QCamera::captureModeChanged(QFlags)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QCamera::destroyed(QObject *)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal::target_type & > ("error(QCamera::Error)", "error_sig", gsi::arg("arg1"), "@brief Signal declaration for QCamera::error(QCamera::Error)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("lockFailed()", "lockFailed", "@brief Signal declaration for QCamera::lockFailed()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal::target_type &, const qt_gsi::Converter::target_type & > ("lockStatusChanged(QCamera::LockStatus, QCamera::LockChangeReason)", "lockStatusChanged", gsi::arg("arg1"), gsi::arg("arg2"), "@brief Signal declaration for QCamera::lockStatusChanged(QCamera::LockStatus, QCamera::LockChangeReason)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal::target_type &, const qt_gsi::Converter::target_type &, const qt_gsi::Converter::target_type & > ("lockStatusChanged(QCamera::LockType, QCamera::LockStatus, QCamera::LockChangeReason)", "lockStatusChanged_withType", gsi::arg("arg1"), gsi::arg("arg2"), gsi::arg("arg3"), "@brief Signal declaration for QCamera::lockStatusChanged(QCamera::LockType, QCamera::LockStatus, QCamera::LockChangeReason)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("locked()", "locked", "@brief Signal declaration for QCamera::locked()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("metaDataAvailableChanged(bool)", "metaDataAvailableChanged", gsi::arg("available"), "@brief Signal declaration for QCamera::metaDataAvailableChanged(bool available)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("metaDataChanged()", "metaDataChanged", "@brief Signal declaration for QCamera::metaDataChanged()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("metaDataChanged(const QString &, const QVariant &)", "metaDataChanged_kv", gsi::arg("key"), gsi::arg("value"), "@brief Signal declaration for QCamera::metaDataChanged(const QString &key, const QVariant &value)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("notifyIntervalChanged(int)", "notifyIntervalChanged", gsi::arg("milliSeconds"), "@brief Signal declaration for QCamera::notifyIntervalChanged(int milliSeconds)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal::target_type & > ("stateChanged(QCamera::State)", "stateChanged", gsi::arg("arg1"), "@brief Signal declaration for QCamera::stateChanged(QCamera::State)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal::target_type & > ("statusChanged(QCamera::Status)", "statusChanged", gsi::arg("arg1"), "@brief Signal declaration for QCamera::statusChanged(QCamera::Status)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("availableDevices", "@brief Static method QList QCamera::availableDevices()\nThis method is static and can be called without an instance.", &_init_f_availableDevices_0, &_call_f_availableDevices_0); methods += new qt_gsi::GenericStaticMethod ("deviceDescription", "@brief Static method QString QCamera::deviceDescription(const QByteArray &device)\nThis method is static and can be called without an instance.", &_init_f_deviceDescription_2309, &_call_f_deviceDescription_2309); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QCamera::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); @@ -852,18 +1006,6 @@ public: } } - // [emitter impl] void QCamera::availabilityChanged(bool available) - void emitter_QCamera_availabilityChanged_864(bool available) - { - emit QCamera::availabilityChanged(available); - } - - // [emitter impl] void QCamera::availabilityChanged(QMultimedia::AvailabilityStatus availability) - void emitter_QCamera_availabilityChanged_3555(QMultimedia::AvailabilityStatus availability) - { - emit QCamera::availabilityChanged(availability); - } - // [adaptor impl] bool QCamera::bind(QObject *) bool cbs_bind_1302_0(QObject *arg1) { @@ -879,24 +1021,6 @@ public: } } - // [emitter impl] void QCamera::captureModeChanged(QFlags) - void emitter_QCamera_captureModeChanged_3027(QFlags arg1) - { - emit QCamera::captureModeChanged(arg1); - } - - // [emitter impl] void QCamera::destroyed(QObject *) - void emitter_QCamera_destroyed_1302(QObject *arg1) - { - emit QCamera::destroyed(arg1); - } - - // [emitter impl] void QCamera::error(QCamera::Error) - void emitter_QCamera_error_1740(QCamera::Error arg1) - { - emit QCamera::error(arg1); - } - // [adaptor impl] bool QCamera::event(QEvent *) bool cbs_event_1217_0(QEvent *arg1) { @@ -942,54 +1066,6 @@ public: } } - // [emitter impl] void QCamera::lockFailed() - void emitter_QCamera_lockFailed_0() - { - emit QCamera::lockFailed(); - } - - // [emitter impl] void QCamera::lockStatusChanged(QCamera::LockStatus, QCamera::LockChangeReason) - void emitter_QCamera_lockStatusChanged_4956(QCamera::LockStatus arg1, QCamera::LockChangeReason arg2) - { - emit QCamera::lockStatusChanged(arg1, arg2); - } - - // [emitter impl] void QCamera::lockStatusChanged(QCamera::LockType, QCamera::LockStatus, QCamera::LockChangeReason) - void emitter_QCamera_lockStatusChanged_6877(QCamera::LockType arg1, QCamera::LockStatus arg2, QCamera::LockChangeReason arg3) - { - emit QCamera::lockStatusChanged(arg1, arg2, arg3); - } - - // [emitter impl] void QCamera::locked() - void emitter_QCamera_locked_0() - { - emit QCamera::locked(); - } - - // [emitter impl] void QCamera::metaDataAvailableChanged(bool available) - void emitter_QCamera_metaDataAvailableChanged_864(bool available) - { - emit QCamera::metaDataAvailableChanged(available); - } - - // [emitter impl] void QCamera::metaDataChanged() - void emitter_QCamera_metaDataChanged_0() - { - emit QCamera::metaDataChanged(); - } - - // [emitter impl] void QCamera::metaDataChanged(const QString &key, const QVariant &value) - void emitter_QCamera_metaDataChanged_4036(const QString &key, const QVariant &value) - { - emit QCamera::metaDataChanged(key, value); - } - - // [emitter impl] void QCamera::notifyIntervalChanged(int milliSeconds) - void emitter_QCamera_notifyIntervalChanged_767(int milliSeconds) - { - emit QCamera::notifyIntervalChanged(milliSeconds); - } - // [adaptor impl] QMediaService *QCamera::service() QMediaService * cbs_service_c0_0() const { @@ -1005,18 +1081,6 @@ public: } } - // [emitter impl] void QCamera::stateChanged(QCamera::State) - void emitter_QCamera_stateChanged_1731(QCamera::State arg1) - { - emit QCamera::stateChanged(arg1); - } - - // [emitter impl] void QCamera::statusChanged(QCamera::Status) - void emitter_QCamera_statusChanged_1862(QCamera::Status arg1) - { - emit QCamera::statusChanged(arg1); - } - // [adaptor impl] void QCamera::unbind(QObject *) void cbs_unbind_1302_0(QObject *arg1) { @@ -1226,42 +1290,6 @@ static void _set_callback_cbs_availability_c0_0 (void *cls, const gsi::Callback } -// emitter void QCamera::availabilityChanged(bool available) - -static void _init_emitter_availabilityChanged_864 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("available"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_availabilityChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - bool arg1 = gsi::arg_reader() (args, heap); - ((QCamera_Adaptor *)cls)->emitter_QCamera_availabilityChanged_864 (arg1); -} - - -// emitter void QCamera::availabilityChanged(QMultimedia::AvailabilityStatus availability) - -static void _init_emitter_availabilityChanged_3555 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("availability"); - decl->add_arg::target_type & > (argspec_0); - decl->set_return (); -} - -static void _call_emitter_availabilityChanged_3555 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); - ((QCamera_Adaptor *)cls)->emitter_QCamera_availabilityChanged_3555 (arg1); -} - - // bool QCamera::bind(QObject *) static void _init_cbs_bind_1302_0 (qt_gsi::GenericMethod *decl) @@ -1285,24 +1313,6 @@ static void _set_callback_cbs_bind_1302_0 (void *cls, const gsi::Callback &cb) } -// emitter void QCamera::captureModeChanged(QFlags) - -static void _init_emitter_captureModeChanged_3027 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1"); - decl->add_arg > (argspec_0); - decl->set_return (); -} - -static void _call_emitter_captureModeChanged_3027 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QFlags arg1 = gsi::arg_reader >() (args, heap); - ((QCamera_Adaptor *)cls)->emitter_QCamera_captureModeChanged_3027 (arg1); -} - - // void QCamera::childEvent(QChildEvent *) static void _init_cbs_childEvent_1701_0 (qt_gsi::GenericMethod *decl) @@ -1351,24 +1361,6 @@ static void _set_callback_cbs_customEvent_1217_0 (void *cls, const gsi::Callback } -// emitter void QCamera::destroyed(QObject *) - -static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - ((QCamera_Adaptor *)cls)->emitter_QCamera_destroyed_1302 (arg1); -} - - // void QCamera::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -1393,24 +1385,6 @@ static void _set_callback_cbs_disconnectNotify_2394_0 (void *cls, const gsi::Cal } -// emitter void QCamera::error(QCamera::Error) - -static void _init_emitter_error_1740 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1"); - decl->add_arg::target_type & > (argspec_0); - decl->set_return (); -} - -static void _call_emitter_error_1740 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); - ((QCamera_Adaptor *)cls)->emitter_QCamera_error_1740 (arg1); -} - - // bool QCamera::event(QEvent *) static void _init_cbs_event_1217_0 (qt_gsi::GenericMethod *decl) @@ -1497,150 +1471,6 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } -// emitter void QCamera::lockFailed() - -static void _init_emitter_lockFailed_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_lockFailed_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QCamera_Adaptor *)cls)->emitter_QCamera_lockFailed_0 (); -} - - -// emitter void QCamera::lockStatusChanged(QCamera::LockStatus, QCamera::LockChangeReason) - -static void _init_emitter_lockStatusChanged_4956 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1"); - decl->add_arg::target_type & > (argspec_0); - static gsi::ArgSpecBase argspec_1 ("arg2"); - decl->add_arg::target_type & > (argspec_1); - decl->set_return (); -} - -static void _call_emitter_lockStatusChanged_4956 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); - const qt_gsi::Converter::target_type & arg2 = gsi::arg_reader::target_type & >() (args, heap); - ((QCamera_Adaptor *)cls)->emitter_QCamera_lockStatusChanged_4956 (arg1, arg2); -} - - -// emitter void QCamera::lockStatusChanged(QCamera::LockType, QCamera::LockStatus, QCamera::LockChangeReason) - -static void _init_emitter_lockStatusChanged_6877 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1"); - decl->add_arg::target_type & > (argspec_0); - static gsi::ArgSpecBase argspec_1 ("arg2"); - decl->add_arg::target_type & > (argspec_1); - static gsi::ArgSpecBase argspec_2 ("arg3"); - decl->add_arg::target_type & > (argspec_2); - decl->set_return (); -} - -static void _call_emitter_lockStatusChanged_6877 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); - const qt_gsi::Converter::target_type & arg2 = gsi::arg_reader::target_type & >() (args, heap); - const qt_gsi::Converter::target_type & arg3 = gsi::arg_reader::target_type & >() (args, heap); - ((QCamera_Adaptor *)cls)->emitter_QCamera_lockStatusChanged_6877 (arg1, arg2, arg3); -} - - -// emitter void QCamera::locked() - -static void _init_emitter_locked_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_locked_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QCamera_Adaptor *)cls)->emitter_QCamera_locked_0 (); -} - - -// emitter void QCamera::metaDataAvailableChanged(bool available) - -static void _init_emitter_metaDataAvailableChanged_864 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("available"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_metaDataAvailableChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - bool arg1 = gsi::arg_reader() (args, heap); - ((QCamera_Adaptor *)cls)->emitter_QCamera_metaDataAvailableChanged_864 (arg1); -} - - -// emitter void QCamera::metaDataChanged() - -static void _init_emitter_metaDataChanged_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_metaDataChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QCamera_Adaptor *)cls)->emitter_QCamera_metaDataChanged_0 (); -} - - -// emitter void QCamera::metaDataChanged(const QString &key, const QVariant &value) - -static void _init_emitter_metaDataChanged_4036 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("key"); - decl->add_arg (argspec_0); - static gsi::ArgSpecBase argspec_1 ("value"); - decl->add_arg (argspec_1); - decl->set_return (); -} - -static void _call_emitter_metaDataChanged_4036 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const QString &arg1 = gsi::arg_reader() (args, heap); - const QVariant &arg2 = gsi::arg_reader() (args, heap); - ((QCamera_Adaptor *)cls)->emitter_QCamera_metaDataChanged_4036 (arg1, arg2); -} - - -// emitter void QCamera::notifyIntervalChanged(int milliSeconds) - -static void _init_emitter_notifyIntervalChanged_767 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("milliSeconds"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_notifyIntervalChanged_767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - int arg1 = gsi::arg_reader() (args, heap); - ((QCamera_Adaptor *)cls)->emitter_QCamera_notifyIntervalChanged_767 (arg1); -} - - // exposed int QCamera::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -1725,42 +1555,6 @@ static void _set_callback_cbs_service_c0_0 (void *cls, const gsi::Callback &cb) } -// emitter void QCamera::stateChanged(QCamera::State) - -static void _init_emitter_stateChanged_1731 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1"); - decl->add_arg::target_type & > (argspec_0); - decl->set_return (); -} - -static void _call_emitter_stateChanged_1731 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); - ((QCamera_Adaptor *)cls)->emitter_QCamera_stateChanged_1731 (arg1); -} - - -// emitter void QCamera::statusChanged(QCamera::Status) - -static void _init_emitter_statusChanged_1862 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1"); - decl->add_arg::target_type & > (argspec_0); - decl->set_return (); -} - -static void _call_emitter_statusChanged_1862 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); - ((QCamera_Adaptor *)cls)->emitter_QCamera_statusChanged_1862 (arg1); -} - - // void QCamera::timerEvent(QTimerEvent *) static void _init_cbs_timerEvent_1730_0 (qt_gsi::GenericMethod *decl) @@ -1823,19 +1617,14 @@ static gsi::Methods methods_QCamera_Adaptor () { methods += new qt_gsi::GenericMethod ("*addPropertyWatch", "@brief Method void QCamera::addPropertyWatch(QByteArray const &name)\nThis method is protected and can only be called from inside a derived class.", false, &_init_fp_addPropertyWatch_2309, &_call_fp_addPropertyWatch_2309); methods += new qt_gsi::GenericMethod ("availability", "@brief Virtual method QMultimedia::AvailabilityStatus QCamera::availability()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_availability_c0_0, &_call_cbs_availability_c0_0); methods += new qt_gsi::GenericMethod ("availability", "@hide", true, &_init_cbs_availability_c0_0, &_call_cbs_availability_c0_0, &_set_callback_cbs_availability_c0_0); - methods += new qt_gsi::GenericMethod ("emit_availabilityChanged_bool", "@brief Emitter for signal void QCamera::availabilityChanged(bool available)\nCall this method to emit this signal.", false, &_init_emitter_availabilityChanged_864, &_call_emitter_availabilityChanged_864); - methods += new qt_gsi::GenericMethod ("emit_availabilityChanged_status", "@brief Emitter for signal void QCamera::availabilityChanged(QMultimedia::AvailabilityStatus availability)\nCall this method to emit this signal.", false, &_init_emitter_availabilityChanged_3555, &_call_emitter_availabilityChanged_3555); methods += new qt_gsi::GenericMethod ("bind", "@brief Virtual method bool QCamera::bind(QObject *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_bind_1302_0, &_call_cbs_bind_1302_0); methods += new qt_gsi::GenericMethod ("bind", "@hide", false, &_init_cbs_bind_1302_0, &_call_cbs_bind_1302_0, &_set_callback_cbs_bind_1302_0); - methods += new qt_gsi::GenericMethod ("emit_captureModeChanged", "@brief Emitter for signal void QCamera::captureModeChanged(QFlags)\nCall this method to emit this signal.", false, &_init_emitter_captureModeChanged_3027, &_call_emitter_captureModeChanged_3027); methods += new qt_gsi::GenericMethod ("*childEvent", "@brief Virtual method void QCamera::childEvent(QChildEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QCamera::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); - methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QCamera::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QCamera::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); - methods += new qt_gsi::GenericMethod ("emit_error_sig", "@brief Emitter for signal void QCamera::error(QCamera::Error)\nCall this method to emit this signal.", false, &_init_emitter_error_1740, &_call_emitter_error_1740); methods += new qt_gsi::GenericMethod ("event", "@brief Virtual method bool QCamera::event(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0); methods += new qt_gsi::GenericMethod ("event", "@hide", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0, &_set_callback_cbs_event_1217_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QCamera::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); @@ -1843,22 +1632,12 @@ static gsi::Methods methods_QCamera_Adaptor () { methods += new qt_gsi::GenericMethod ("isAvailable", "@brief Virtual method bool QCamera::isAvailable()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_isAvailable_c0_0, &_call_cbs_isAvailable_c0_0); methods += new qt_gsi::GenericMethod ("isAvailable", "@hide", true, &_init_cbs_isAvailable_c0_0, &_call_cbs_isAvailable_c0_0, &_set_callback_cbs_isAvailable_c0_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QCamera::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); - methods += new qt_gsi::GenericMethod ("emit_lockFailed", "@brief Emitter for signal void QCamera::lockFailed()\nCall this method to emit this signal.", false, &_init_emitter_lockFailed_0, &_call_emitter_lockFailed_0); - methods += new qt_gsi::GenericMethod ("emit_lockStatusChanged", "@brief Emitter for signal void QCamera::lockStatusChanged(QCamera::LockStatus, QCamera::LockChangeReason)\nCall this method to emit this signal.", false, &_init_emitter_lockStatusChanged_4956, &_call_emitter_lockStatusChanged_4956); - methods += new qt_gsi::GenericMethod ("emit_lockStatusChanged_withType", "@brief Emitter for signal void QCamera::lockStatusChanged(QCamera::LockType, QCamera::LockStatus, QCamera::LockChangeReason)\nCall this method to emit this signal.", false, &_init_emitter_lockStatusChanged_6877, &_call_emitter_lockStatusChanged_6877); - methods += new qt_gsi::GenericMethod ("emit_locked", "@brief Emitter for signal void QCamera::locked()\nCall this method to emit this signal.", false, &_init_emitter_locked_0, &_call_emitter_locked_0); - methods += new qt_gsi::GenericMethod ("emit_metaDataAvailableChanged", "@brief Emitter for signal void QCamera::metaDataAvailableChanged(bool available)\nCall this method to emit this signal.", false, &_init_emitter_metaDataAvailableChanged_864, &_call_emitter_metaDataAvailableChanged_864); - methods += new qt_gsi::GenericMethod ("emit_metaDataChanged", "@brief Emitter for signal void QCamera::metaDataChanged()\nCall this method to emit this signal.", false, &_init_emitter_metaDataChanged_0, &_call_emitter_metaDataChanged_0); - methods += new qt_gsi::GenericMethod ("emit_metaDataChanged_kv", "@brief Emitter for signal void QCamera::metaDataChanged(const QString &key, const QVariant &value)\nCall this method to emit this signal.", false, &_init_emitter_metaDataChanged_4036, &_call_emitter_metaDataChanged_4036); - methods += new qt_gsi::GenericMethod ("emit_notifyIntervalChanged", "@brief Emitter for signal void QCamera::notifyIntervalChanged(int milliSeconds)\nCall this method to emit this signal.", false, &_init_emitter_notifyIntervalChanged_767, &_call_emitter_notifyIntervalChanged_767); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QCamera::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*removePropertyWatch", "@brief Method void QCamera::removePropertyWatch(QByteArray const &name)\nThis method is protected and can only be called from inside a derived class.", false, &_init_fp_removePropertyWatch_2309, &_call_fp_removePropertyWatch_2309); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QCamera::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QCamera::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); methods += new qt_gsi::GenericMethod ("service", "@brief Virtual method QMediaService *QCamera::service()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_service_c0_0, &_call_cbs_service_c0_0); methods += new qt_gsi::GenericMethod ("service", "@hide", true, &_init_cbs_service_c0_0, &_call_cbs_service_c0_0, &_set_callback_cbs_service_c0_0); - methods += new qt_gsi::GenericMethod ("emit_stateChanged", "@brief Emitter for signal void QCamera::stateChanged(QCamera::State)\nCall this method to emit this signal.", false, &_init_emitter_stateChanged_1731, &_call_emitter_stateChanged_1731); - methods += new qt_gsi::GenericMethod ("emit_statusChanged", "@brief Emitter for signal void QCamera::statusChanged(QCamera::Status)\nCall this method to emit this signal.", false, &_init_emitter_statusChanged_1862, &_call_emitter_statusChanged_1862); methods += new qt_gsi::GenericMethod ("*timerEvent", "@brief Virtual method void QCamera::timerEvent(QTimerEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_timerEvent_1730_0, &_call_cbs_timerEvent_1730_0); methods += new qt_gsi::GenericMethod ("*timerEvent", "@hide", false, &_init_cbs_timerEvent_1730_0, &_call_cbs_timerEvent_1730_0, &_set_callback_cbs_timerEvent_1730_0); methods += new qt_gsi::GenericMethod ("unbind", "@brief Virtual method void QCamera::unbind(QObject *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_unbind_1302_0, &_call_cbs_unbind_1302_0); diff --git a/src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraCaptureBufferFormatControl.cc b/src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraCaptureBufferFormatControl.cc index d1cef1753..78b436b58 100644 --- a/src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraCaptureBufferFormatControl.cc +++ b/src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraCaptureBufferFormatControl.cc @@ -70,6 +70,26 @@ static void _call_f_bufferFormat_c0 (const qt_gsi::GenericMethod * /*decl*/, voi } +// void QCameraCaptureBufferFormatControl::bufferFormatChanged(QVideoFrame::PixelFormat) + + +static void _init_f_bufferFormatChanged_2758 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("arg1"); + decl->add_arg::target_type & > (argspec_0); + decl->set_return (); +} + +static void _call_f_bufferFormatChanged_2758 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QCameraCaptureBufferFormatControl *)cls)->bufferFormatChanged (qt_gsi::QtToCppAdaptor(arg1).cref()); +} + + // void QCameraCaptureBufferFormatControl::setBufferFormat(QVideoFrame::PixelFormat format) @@ -162,10 +182,9 @@ static gsi::Methods methods_QCameraCaptureBufferFormatControl () { gsi::Methods methods; methods += new qt_gsi::GenericStaticMethod ("staticMetaObject", "@brief Obtains the static MetaObject for this class.", &_init_smo, &_call_smo); methods += new qt_gsi::GenericMethod (":bufferFormat", "@brief Method QVideoFrame::PixelFormat QCameraCaptureBufferFormatControl::bufferFormat()\n", true, &_init_f_bufferFormat_c0, &_call_f_bufferFormat_c0); + methods += new qt_gsi::GenericMethod ("bufferFormatChanged", "@brief Method void QCameraCaptureBufferFormatControl::bufferFormatChanged(QVideoFrame::PixelFormat)\n", false, &_init_f_bufferFormatChanged_2758, &_call_f_bufferFormatChanged_2758); methods += new qt_gsi::GenericMethod ("setBufferFormat|bufferFormat=", "@brief Method void QCameraCaptureBufferFormatControl::setBufferFormat(QVideoFrame::PixelFormat format)\n", false, &_init_f_setBufferFormat_2758, &_call_f_setBufferFormat_2758); methods += new qt_gsi::GenericMethod ("supportedBufferFormats", "@brief Method QList QCameraCaptureBufferFormatControl::supportedBufferFormats()\n", true, &_init_f_supportedBufferFormats_c0, &_call_f_supportedBufferFormats_c0); - methods += gsi::qt_signal::target_type & > ("bufferFormatChanged(QVideoFrame::PixelFormat)", "bufferFormatChanged", gsi::arg("arg1"), "@brief Signal declaration for QCameraCaptureBufferFormatControl::bufferFormatChanged(QVideoFrame::PixelFormat)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QCameraCaptureBufferFormatControl::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QCameraCaptureBufferFormatControl::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QCameraCaptureBufferFormatControl::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -229,18 +248,6 @@ public: } } - // [emitter impl] void QCameraCaptureBufferFormatControl::bufferFormatChanged(QVideoFrame::PixelFormat) - void emitter_QCameraCaptureBufferFormatControl_bufferFormatChanged_2758(QVideoFrame::PixelFormat arg1) - { - emit QCameraCaptureBufferFormatControl::bufferFormatChanged(arg1); - } - - // [emitter impl] void QCameraCaptureBufferFormatControl::destroyed(QObject *) - void emitter_QCameraCaptureBufferFormatControl_destroyed_1302(QObject *arg1) - { - emit QCameraCaptureBufferFormatControl::destroyed(arg1); - } - // [adaptor impl] bool QCameraCaptureBufferFormatControl::event(QEvent *) bool cbs_event_1217_0(QEvent *arg1) { @@ -408,24 +415,6 @@ static void _set_callback_cbs_bufferFormat_c0_0 (void *cls, const gsi::Callback } -// emitter void QCameraCaptureBufferFormatControl::bufferFormatChanged(QVideoFrame::PixelFormat) - -static void _init_emitter_bufferFormatChanged_2758 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1"); - decl->add_arg::target_type & > (argspec_0); - decl->set_return (); -} - -static void _call_emitter_bufferFormatChanged_2758 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); - ((QCameraCaptureBufferFormatControl_Adaptor *)cls)->emitter_QCameraCaptureBufferFormatControl_bufferFormatChanged_2758 (arg1); -} - - // void QCameraCaptureBufferFormatControl::childEvent(QChildEvent *) static void _init_cbs_childEvent_1701_0 (qt_gsi::GenericMethod *decl) @@ -474,24 +463,6 @@ static void _set_callback_cbs_customEvent_1217_0 (void *cls, const gsi::Callback } -// emitter void QCameraCaptureBufferFormatControl::destroyed(QObject *) - -static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - ((QCameraCaptureBufferFormatControl_Adaptor *)cls)->emitter_QCameraCaptureBufferFormatControl_destroyed_1302 (arg1); -} - - // void QCameraCaptureBufferFormatControl::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -706,12 +677,10 @@ static gsi::Methods methods_QCameraCaptureBufferFormatControl_Adaptor () { methods += new qt_gsi::GenericStaticMethod ("new", "@brief Constructor QCameraCaptureBufferFormatControl::QCameraCaptureBufferFormatControl()\nThis method creates an object of class QCameraCaptureBufferFormatControl.", &_init_ctor_QCameraCaptureBufferFormatControl_Adaptor_0, &_call_ctor_QCameraCaptureBufferFormatControl_Adaptor_0); methods += new qt_gsi::GenericMethod ("bufferFormat", "@brief Virtual method QVideoFrame::PixelFormat QCameraCaptureBufferFormatControl::bufferFormat()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_bufferFormat_c0_0, &_call_cbs_bufferFormat_c0_0); methods += new qt_gsi::GenericMethod ("bufferFormat", "@hide", true, &_init_cbs_bufferFormat_c0_0, &_call_cbs_bufferFormat_c0_0, &_set_callback_cbs_bufferFormat_c0_0); - methods += new qt_gsi::GenericMethod ("emit_bufferFormatChanged", "@brief Emitter for signal void QCameraCaptureBufferFormatControl::bufferFormatChanged(QVideoFrame::PixelFormat)\nCall this method to emit this signal.", false, &_init_emitter_bufferFormatChanged_2758, &_call_emitter_bufferFormatChanged_2758); methods += new qt_gsi::GenericMethod ("*childEvent", "@brief Virtual method void QCameraCaptureBufferFormatControl::childEvent(QChildEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QCameraCaptureBufferFormatControl::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); - methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QCameraCaptureBufferFormatControl::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QCameraCaptureBufferFormatControl::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("event", "@brief Virtual method bool QCameraCaptureBufferFormatControl::event(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0); diff --git a/src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraCaptureDestinationControl.cc b/src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraCaptureDestinationControl.cc index fb67950b6..2a63fb81b 100644 --- a/src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraCaptureDestinationControl.cc +++ b/src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraCaptureDestinationControl.cc @@ -70,6 +70,26 @@ static void _call_f_captureDestination_c0 (const qt_gsi::GenericMethod * /*decl* } +// void QCameraCaptureDestinationControl::captureDestinationChanged(QFlags) + + +static void _init_f_captureDestinationChanged_4999 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("arg1"); + decl->add_arg > (argspec_0); + decl->set_return (); +} + +static void _call_f_captureDestinationChanged_4999 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + QFlags arg1 = gsi::arg_reader >() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QCameraCaptureDestinationControl *)cls)->captureDestinationChanged (arg1); +} + + // bool QCameraCaptureDestinationControl::isCaptureDestinationSupported(QFlags destination) @@ -166,10 +186,9 @@ static gsi::Methods methods_QCameraCaptureDestinationControl () { gsi::Methods methods; methods += new qt_gsi::GenericStaticMethod ("staticMetaObject", "@brief Obtains the static MetaObject for this class.", &_init_smo, &_call_smo); methods += new qt_gsi::GenericMethod (":captureDestination", "@brief Method QFlags QCameraCaptureDestinationControl::captureDestination()\n", true, &_init_f_captureDestination_c0, &_call_f_captureDestination_c0); + methods += new qt_gsi::GenericMethod ("captureDestinationChanged", "@brief Method void QCameraCaptureDestinationControl::captureDestinationChanged(QFlags)\n", false, &_init_f_captureDestinationChanged_4999, &_call_f_captureDestinationChanged_4999); methods += new qt_gsi::GenericMethod ("isCaptureDestinationSupported?", "@brief Method bool QCameraCaptureDestinationControl::isCaptureDestinationSupported(QFlags destination)\n", true, &_init_f_isCaptureDestinationSupported_c4999, &_call_f_isCaptureDestinationSupported_c4999); methods += new qt_gsi::GenericMethod ("setCaptureDestination|captureDestination=", "@brief Method void QCameraCaptureDestinationControl::setCaptureDestination(QFlags destination)\n", false, &_init_f_setCaptureDestination_4999, &_call_f_setCaptureDestination_4999); - methods += gsi::qt_signal > ("captureDestinationChanged(QFlags)", "captureDestinationChanged", gsi::arg("arg1"), "@brief Signal declaration for QCameraCaptureDestinationControl::captureDestinationChanged(QFlags)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QCameraCaptureDestinationControl::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QCameraCaptureDestinationControl::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QCameraCaptureDestinationControl::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -233,18 +252,6 @@ public: } } - // [emitter impl] void QCameraCaptureDestinationControl::captureDestinationChanged(QFlags) - void emitter_QCameraCaptureDestinationControl_captureDestinationChanged_4999(QFlags arg1) - { - emit QCameraCaptureDestinationControl::captureDestinationChanged(arg1); - } - - // [emitter impl] void QCameraCaptureDestinationControl::destroyed(QObject *) - void emitter_QCameraCaptureDestinationControl_destroyed_1302(QObject *arg1) - { - emit QCameraCaptureDestinationControl::destroyed(arg1); - } - // [adaptor impl] bool QCameraCaptureDestinationControl::event(QEvent *) bool cbs_event_1217_0(QEvent *arg1) { @@ -413,24 +420,6 @@ static void _set_callback_cbs_captureDestination_c0_0 (void *cls, const gsi::Cal } -// emitter void QCameraCaptureDestinationControl::captureDestinationChanged(QFlags) - -static void _init_emitter_captureDestinationChanged_4999 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1"); - decl->add_arg > (argspec_0); - decl->set_return (); -} - -static void _call_emitter_captureDestinationChanged_4999 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QFlags arg1 = gsi::arg_reader >() (args, heap); - ((QCameraCaptureDestinationControl_Adaptor *)cls)->emitter_QCameraCaptureDestinationControl_captureDestinationChanged_4999 (arg1); -} - - // void QCameraCaptureDestinationControl::childEvent(QChildEvent *) static void _init_cbs_childEvent_1701_0 (qt_gsi::GenericMethod *decl) @@ -479,24 +468,6 @@ static void _set_callback_cbs_customEvent_1217_0 (void *cls, const gsi::Callback } -// emitter void QCameraCaptureDestinationControl::destroyed(QObject *) - -static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - ((QCameraCaptureDestinationControl_Adaptor *)cls)->emitter_QCameraCaptureDestinationControl_destroyed_1302 (arg1); -} - - // void QCameraCaptureDestinationControl::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -715,12 +686,10 @@ static gsi::Methods methods_QCameraCaptureDestinationControl_Adaptor () { methods += new qt_gsi::GenericStaticMethod ("new", "@brief Constructor QCameraCaptureDestinationControl::QCameraCaptureDestinationControl()\nThis method creates an object of class QCameraCaptureDestinationControl.", &_init_ctor_QCameraCaptureDestinationControl_Adaptor_0, &_call_ctor_QCameraCaptureDestinationControl_Adaptor_0); methods += new qt_gsi::GenericMethod ("captureDestination", "@brief Virtual method QFlags QCameraCaptureDestinationControl::captureDestination()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_captureDestination_c0_0, &_call_cbs_captureDestination_c0_0); methods += new qt_gsi::GenericMethod ("captureDestination", "@hide", true, &_init_cbs_captureDestination_c0_0, &_call_cbs_captureDestination_c0_0, &_set_callback_cbs_captureDestination_c0_0); - methods += new qt_gsi::GenericMethod ("emit_captureDestinationChanged", "@brief Emitter for signal void QCameraCaptureDestinationControl::captureDestinationChanged(QFlags)\nCall this method to emit this signal.", false, &_init_emitter_captureDestinationChanged_4999, &_call_emitter_captureDestinationChanged_4999); methods += new qt_gsi::GenericMethod ("*childEvent", "@brief Virtual method void QCameraCaptureDestinationControl::childEvent(QChildEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QCameraCaptureDestinationControl::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); - methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QCameraCaptureDestinationControl::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QCameraCaptureDestinationControl::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("event", "@brief Virtual method bool QCameraCaptureDestinationControl::event(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0); diff --git a/src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraControl.cc b/src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraControl.cc index 855834888..f7b5277b8 100644 --- a/src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraControl.cc +++ b/src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraControl.cc @@ -92,6 +92,49 @@ static void _call_f_captureMode_c0 (const qt_gsi::GenericMethod * /*decl*/, void } +// void QCameraControl::captureModeChanged(QFlags) + + +static void _init_f_captureModeChanged_3027 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("arg1"); + decl->add_arg > (argspec_0); + decl->set_return (); +} + +static void _call_f_captureModeChanged_3027 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + QFlags arg1 = gsi::arg_reader >() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QCameraControl *)cls)->captureModeChanged (arg1); +} + + +// void QCameraControl::error(int error, const QString &errorString) + + +static void _init_f_error_2684 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("error"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("errorString"); + decl->add_arg (argspec_1); + decl->set_return (); +} + +static void _call_f_error_2684 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + int arg1 = gsi::arg_reader() (args, heap); + const QString &arg2 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QCameraControl *)cls)->error (arg1, arg2); +} + + // bool QCameraControl::isCaptureModeSupported(QFlags mode) @@ -166,6 +209,26 @@ static void _call_f_state_c0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, } +// void QCameraControl::stateChanged(QCamera::State) + + +static void _init_f_stateChanged_1731 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("arg1"); + decl->add_arg::target_type & > (argspec_0); + decl->set_return (); +} + +static void _call_f_stateChanged_1731 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QCameraControl *)cls)->stateChanged (qt_gsi::QtToCppAdaptor(arg1).cref()); +} + + // QCamera::Status QCameraControl::status() @@ -181,6 +244,26 @@ static void _call_f_status_c0 (const qt_gsi::GenericMethod * /*decl*/, void *cls } +// void QCameraControl::statusChanged(QCamera::Status) + + +static void _init_f_statusChanged_1862 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("arg1"); + decl->add_arg::target_type & > (argspec_0); + decl->set_return (); +} + +static void _call_f_statusChanged_1862 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QCameraControl *)cls)->statusChanged (qt_gsi::QtToCppAdaptor(arg1).cref()); +} + + // static QString QCameraControl::tr(const char *s, const char *c, int n) @@ -239,16 +322,15 @@ static gsi::Methods methods_QCameraControl () { methods += new qt_gsi::GenericStaticMethod ("staticMetaObject", "@brief Obtains the static MetaObject for this class.", &_init_smo, &_call_smo); methods += new qt_gsi::GenericMethod ("canChangeProperty", "@brief Method bool QCameraControl::canChangeProperty(QCameraControl::PropertyChangeType changeType, QCamera::Status status)\n", true, &_init_f_canChangeProperty_c5578, &_call_f_canChangeProperty_c5578); methods += new qt_gsi::GenericMethod (":captureMode", "@brief Method QFlags QCameraControl::captureMode()\n", true, &_init_f_captureMode_c0, &_call_f_captureMode_c0); + methods += new qt_gsi::GenericMethod ("captureModeChanged", "@brief Method void QCameraControl::captureModeChanged(QFlags)\n", false, &_init_f_captureModeChanged_3027, &_call_f_captureModeChanged_3027); + methods += new qt_gsi::GenericMethod ("error", "@brief Method void QCameraControl::error(int error, const QString &errorString)\n", false, &_init_f_error_2684, &_call_f_error_2684); methods += new qt_gsi::GenericMethod ("isCaptureModeSupported?", "@brief Method bool QCameraControl::isCaptureModeSupported(QFlags mode)\n", true, &_init_f_isCaptureModeSupported_c3027, &_call_f_isCaptureModeSupported_c3027); methods += new qt_gsi::GenericMethod ("setCaptureMode|captureMode=", "@brief Method void QCameraControl::setCaptureMode(QFlags)\n", false, &_init_f_setCaptureMode_3027, &_call_f_setCaptureMode_3027); methods += new qt_gsi::GenericMethod ("setState|state=", "@brief Method void QCameraControl::setState(QCamera::State state)\n", false, &_init_f_setState_1731, &_call_f_setState_1731); methods += new qt_gsi::GenericMethod (":state", "@brief Method QCamera::State QCameraControl::state()\n", true, &_init_f_state_c0, &_call_f_state_c0); + methods += new qt_gsi::GenericMethod ("stateChanged", "@brief Method void QCameraControl::stateChanged(QCamera::State)\n", false, &_init_f_stateChanged_1731, &_call_f_stateChanged_1731); methods += new qt_gsi::GenericMethod ("status", "@brief Method QCamera::Status QCameraControl::status()\n", true, &_init_f_status_c0, &_call_f_status_c0); - methods += gsi::qt_signal > ("captureModeChanged(QFlags)", "captureModeChanged", gsi::arg("arg1"), "@brief Signal declaration for QCameraControl::captureModeChanged(QFlags)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QCameraControl::destroyed(QObject *)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("error(int, const QString &)", "error", gsi::arg("error"), gsi::arg("errorString"), "@brief Signal declaration for QCameraControl::error(int error, const QString &errorString)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal::target_type & > ("stateChanged(QCamera::State)", "stateChanged", gsi::arg("arg1"), "@brief Signal declaration for QCameraControl::stateChanged(QCamera::State)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal::target_type & > ("statusChanged(QCamera::Status)", "statusChanged", gsi::arg("arg1"), "@brief Signal declaration for QCameraControl::statusChanged(QCamera::Status)\nYou can bind a procedure to this signal."); + methods += new qt_gsi::GenericMethod ("statusChanged", "@brief Method void QCameraControl::statusChanged(QCamera::Status)\n", false, &_init_f_statusChanged_1862, &_call_f_statusChanged_1862); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QCameraControl::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QCameraControl::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -329,24 +411,6 @@ public: } } - // [emitter impl] void QCameraControl::captureModeChanged(QFlags) - void emitter_QCameraControl_captureModeChanged_3027(QFlags arg1) - { - emit QCameraControl::captureModeChanged(arg1); - } - - // [emitter impl] void QCameraControl::destroyed(QObject *) - void emitter_QCameraControl_destroyed_1302(QObject *arg1) - { - emit QCameraControl::destroyed(arg1); - } - - // [emitter impl] void QCameraControl::error(int error, const QString &errorString) - void emitter_QCameraControl_error_2684(int _error, const QString &errorString) - { - emit QCameraControl::error(_error, errorString); - } - // [adaptor impl] bool QCameraControl::event(QEvent *) bool cbs_event_1217_0(QEvent *arg1) { @@ -440,12 +504,6 @@ public: } } - // [emitter impl] void QCameraControl::stateChanged(QCamera::State) - void emitter_QCameraControl_stateChanged_1731(QCamera::State arg1) - { - emit QCameraControl::stateChanged(arg1); - } - // [adaptor impl] QCamera::Status QCameraControl::status() qt_gsi::Converter::target_type cbs_status_c0_0() const { @@ -461,12 +519,6 @@ public: } } - // [emitter impl] void QCameraControl::statusChanged(QCamera::Status) - void emitter_QCameraControl_statusChanged_1862(QCamera::Status arg1) - { - emit QCameraControl::statusChanged(arg1); - } - // [adaptor impl] void QCameraControl::childEvent(QChildEvent *) void cbs_childEvent_1701_0(QChildEvent *arg1) { @@ -603,24 +655,6 @@ static void _set_callback_cbs_captureMode_c0_0 (void *cls, const gsi::Callback & } -// emitter void QCameraControl::captureModeChanged(QFlags) - -static void _init_emitter_captureModeChanged_3027 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1"); - decl->add_arg > (argspec_0); - decl->set_return (); -} - -static void _call_emitter_captureModeChanged_3027 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QFlags arg1 = gsi::arg_reader >() (args, heap); - ((QCameraControl_Adaptor *)cls)->emitter_QCameraControl_captureModeChanged_3027 (arg1); -} - - // void QCameraControl::childEvent(QChildEvent *) static void _init_cbs_childEvent_1701_0 (qt_gsi::GenericMethod *decl) @@ -669,24 +703,6 @@ static void _set_callback_cbs_customEvent_1217_0 (void *cls, const gsi::Callback } -// emitter void QCameraControl::destroyed(QObject *) - -static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - ((QCameraControl_Adaptor *)cls)->emitter_QCameraControl_destroyed_1302 (arg1); -} - - // void QCameraControl::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -711,27 +727,6 @@ static void _set_callback_cbs_disconnectNotify_2394_0 (void *cls, const gsi::Cal } -// emitter void QCameraControl::error(int error, const QString &errorString) - -static void _init_emitter_error_2684 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("error"); - decl->add_arg (argspec_0); - static gsi::ArgSpecBase argspec_1 ("errorString"); - decl->add_arg (argspec_1); - decl->set_return (); -} - -static void _call_emitter_error_2684 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - int arg1 = gsi::arg_reader() (args, heap); - const QString &arg2 = gsi::arg_reader() (args, heap); - ((QCameraControl_Adaptor *)cls)->emitter_QCameraControl_error_2684 (arg1, arg2); -} - - // bool QCameraControl::event(QEvent *) static void _init_cbs_event_1217_0 (qt_gsi::GenericMethod *decl) @@ -935,24 +930,6 @@ static void _set_callback_cbs_state_c0_0 (void *cls, const gsi::Callback &cb) } -// emitter void QCameraControl::stateChanged(QCamera::State) - -static void _init_emitter_stateChanged_1731 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1"); - decl->add_arg::target_type & > (argspec_0); - decl->set_return (); -} - -static void _call_emitter_stateChanged_1731 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); - ((QCameraControl_Adaptor *)cls)->emitter_QCameraControl_stateChanged_1731 (arg1); -} - - // QCamera::Status QCameraControl::status() static void _init_cbs_status_c0_0 (qt_gsi::GenericMethod *decl) @@ -972,24 +949,6 @@ static void _set_callback_cbs_status_c0_0 (void *cls, const gsi::Callback &cb) } -// emitter void QCameraControl::statusChanged(QCamera::Status) - -static void _init_emitter_statusChanged_1862 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1"); - decl->add_arg::target_type & > (argspec_0); - decl->set_return (); -} - -static void _call_emitter_statusChanged_1862 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); - ((QCameraControl_Adaptor *)cls)->emitter_QCameraControl_statusChanged_1862 (arg1); -} - - // void QCameraControl::timerEvent(QTimerEvent *) static void _init_cbs_timerEvent_1730_0 (qt_gsi::GenericMethod *decl) @@ -1026,15 +985,12 @@ static gsi::Methods methods_QCameraControl_Adaptor () { methods += new qt_gsi::GenericMethod ("canChangeProperty", "@hide", true, &_init_cbs_canChangeProperty_c5578_0, &_call_cbs_canChangeProperty_c5578_0, &_set_callback_cbs_canChangeProperty_c5578_0); methods += new qt_gsi::GenericMethod ("captureMode", "@brief Virtual method QFlags QCameraControl::captureMode()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_captureMode_c0_0, &_call_cbs_captureMode_c0_0); methods += new qt_gsi::GenericMethod ("captureMode", "@hide", true, &_init_cbs_captureMode_c0_0, &_call_cbs_captureMode_c0_0, &_set_callback_cbs_captureMode_c0_0); - methods += new qt_gsi::GenericMethod ("emit_captureModeChanged", "@brief Emitter for signal void QCameraControl::captureModeChanged(QFlags)\nCall this method to emit this signal.", false, &_init_emitter_captureModeChanged_3027, &_call_emitter_captureModeChanged_3027); methods += new qt_gsi::GenericMethod ("*childEvent", "@brief Virtual method void QCameraControl::childEvent(QChildEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QCameraControl::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); - methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QCameraControl::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QCameraControl::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); - methods += new qt_gsi::GenericMethod ("emit_error", "@brief Emitter for signal void QCameraControl::error(int error, const QString &errorString)\nCall this method to emit this signal.", false, &_init_emitter_error_2684, &_call_emitter_error_2684); methods += new qt_gsi::GenericMethod ("event", "@brief Virtual method bool QCameraControl::event(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0); methods += new qt_gsi::GenericMethod ("event", "@hide", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0, &_set_callback_cbs_event_1217_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QCameraControl::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); @@ -1051,10 +1007,8 @@ static gsi::Methods methods_QCameraControl_Adaptor () { methods += new qt_gsi::GenericMethod ("setState", "@hide", false, &_init_cbs_setState_1731_0, &_call_cbs_setState_1731_0, &_set_callback_cbs_setState_1731_0); methods += new qt_gsi::GenericMethod ("state", "@brief Virtual method QCamera::State QCameraControl::state()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_state_c0_0, &_call_cbs_state_c0_0); methods += new qt_gsi::GenericMethod ("state", "@hide", true, &_init_cbs_state_c0_0, &_call_cbs_state_c0_0, &_set_callback_cbs_state_c0_0); - methods += new qt_gsi::GenericMethod ("emit_stateChanged", "@brief Emitter for signal void QCameraControl::stateChanged(QCamera::State)\nCall this method to emit this signal.", false, &_init_emitter_stateChanged_1731, &_call_emitter_stateChanged_1731); methods += new qt_gsi::GenericMethod ("status", "@brief Virtual method QCamera::Status QCameraControl::status()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_status_c0_0, &_call_cbs_status_c0_0); methods += new qt_gsi::GenericMethod ("status", "@hide", true, &_init_cbs_status_c0_0, &_call_cbs_status_c0_0, &_set_callback_cbs_status_c0_0); - methods += new qt_gsi::GenericMethod ("emit_statusChanged", "@brief Emitter for signal void QCameraControl::statusChanged(QCamera::Status)\nCall this method to emit this signal.", false, &_init_emitter_statusChanged_1862, &_call_emitter_statusChanged_1862); methods += new qt_gsi::GenericMethod ("*timerEvent", "@brief Virtual method void QCameraControl::timerEvent(QTimerEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_timerEvent_1730_0, &_call_cbs_timerEvent_1730_0); methods += new qt_gsi::GenericMethod ("*timerEvent", "@hide", false, &_init_cbs_timerEvent_1730_0, &_call_cbs_timerEvent_1730_0, &_set_callback_cbs_timerEvent_1730_0); return methods; diff --git a/src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraExposure.cc b/src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraExposure.cc index dff300cc8..22924fc94 100644 --- a/src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraExposure.cc +++ b/src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraExposure.cc @@ -69,6 +69,42 @@ static void _call_f_aperture_c0 (const qt_gsi::GenericMethod * /*decl*/, void *c } +// void QCameraExposure::apertureChanged(double) + + +static void _init_f_apertureChanged_1071 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("arg1"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_apertureChanged_1071 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + double arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QCameraExposure *)cls)->apertureChanged (arg1); +} + + +// void QCameraExposure::apertureRangeChanged() + + +static void _init_f_apertureRangeChanged_0 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_f_apertureRangeChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + __SUPPRESS_UNUSED_WARNING(ret); + ((QCameraExposure *)cls)->apertureRangeChanged (); +} + + // double QCameraExposure::exposureCompensation() @@ -84,6 +120,26 @@ static void _call_f_exposureCompensation_c0 (const qt_gsi::GenericMethod * /*dec } +// void QCameraExposure::exposureCompensationChanged(double) + + +static void _init_f_exposureCompensationChanged_1071 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("arg1"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_exposureCompensationChanged_1071 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + double arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QCameraExposure *)cls)->exposureCompensationChanged (arg1); +} + + // QCameraExposure::ExposureMode QCameraExposure::exposureMode() @@ -114,6 +170,26 @@ static void _call_f_flashMode_c0 (const qt_gsi::GenericMethod * /*decl*/, void * } +// void QCameraExposure::flashReady(bool) + + +static void _init_f_flashReady_864 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("arg1"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_flashReady_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + bool arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QCameraExposure *)cls)->flashReady (arg1); +} + + // bool QCameraExposure::isAvailable() @@ -216,6 +292,26 @@ static void _call_f_isoSensitivity_c0 (const qt_gsi::GenericMethod * /*decl*/, v } +// void QCameraExposure::isoSensitivityChanged(int) + + +static void _init_f_isoSensitivityChanged_767 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("arg1"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_isoSensitivityChanged_767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + int arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QCameraExposure *)cls)->isoSensitivityChanged (arg1); +} + + // QCameraExposure::MeteringMode QCameraExposure::meteringMode() @@ -499,6 +595,42 @@ static void _call_f_shutterSpeed_c0 (const qt_gsi::GenericMethod * /*decl*/, voi } +// void QCameraExposure::shutterSpeedChanged(double) + + +static void _init_f_shutterSpeedChanged_1071 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("arg1"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_shutterSpeedChanged_1071 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + double arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QCameraExposure *)cls)->shutterSpeedChanged (arg1); +} + + +// void QCameraExposure::shutterSpeedRangeChanged() + + +static void _init_f_shutterSpeedRangeChanged_0 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_f_shutterSpeedRangeChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + __SUPPRESS_UNUSED_WARNING(ret); + ((QCameraExposure *)cls)->shutterSpeedRangeChanged (); +} + + // QPointF QCameraExposure::spotMeteringPoint() @@ -629,15 +761,20 @@ static gsi::Methods methods_QCameraExposure () { gsi::Methods methods; methods += new qt_gsi::GenericStaticMethod ("staticMetaObject", "@brief Obtains the static MetaObject for this class.", &_init_smo, &_call_smo); methods += new qt_gsi::GenericMethod (":aperture", "@brief Method double QCameraExposure::aperture()\n", true, &_init_f_aperture_c0, &_call_f_aperture_c0); + methods += new qt_gsi::GenericMethod ("apertureChanged", "@brief Method void QCameraExposure::apertureChanged(double)\n", false, &_init_f_apertureChanged_1071, &_call_f_apertureChanged_1071); + methods += new qt_gsi::GenericMethod ("apertureRangeChanged", "@brief Method void QCameraExposure::apertureRangeChanged()\n", false, &_init_f_apertureRangeChanged_0, &_call_f_apertureRangeChanged_0); methods += new qt_gsi::GenericMethod (":exposureCompensation", "@brief Method double QCameraExposure::exposureCompensation()\n", true, &_init_f_exposureCompensation_c0, &_call_f_exposureCompensation_c0); + methods += new qt_gsi::GenericMethod ("exposureCompensationChanged", "@brief Method void QCameraExposure::exposureCompensationChanged(double)\n", false, &_init_f_exposureCompensationChanged_1071, &_call_f_exposureCompensationChanged_1071); methods += new qt_gsi::GenericMethod (":exposureMode", "@brief Method QCameraExposure::ExposureMode QCameraExposure::exposureMode()\n", true, &_init_f_exposureMode_c0, &_call_f_exposureMode_c0); methods += new qt_gsi::GenericMethod (":flashMode", "@brief Method QFlags QCameraExposure::flashMode()\n", true, &_init_f_flashMode_c0, &_call_f_flashMode_c0); + methods += new qt_gsi::GenericMethod ("flashReady_sig", "@brief Method void QCameraExposure::flashReady(bool)\n", false, &_init_f_flashReady_864, &_call_f_flashReady_864); methods += new qt_gsi::GenericMethod ("isAvailable?", "@brief Method bool QCameraExposure::isAvailable()\n", true, &_init_f_isAvailable_c0, &_call_f_isAvailable_c0); methods += new qt_gsi::GenericMethod ("isExposureModeSupported?", "@brief Method bool QCameraExposure::isExposureModeSupported(QCameraExposure::ExposureMode mode)\n", true, &_init_f_isExposureModeSupported_c3325, &_call_f_isExposureModeSupported_c3325); methods += new qt_gsi::GenericMethod ("isFlashModeSupported?", "@brief Method bool QCameraExposure::isFlashModeSupported(QFlags mode)\n", true, &_init_f_isFlashModeSupported_c3656, &_call_f_isFlashModeSupported_c3656); methods += new qt_gsi::GenericMethod ("isFlashReady?|:flashReady", "@brief Method bool QCameraExposure::isFlashReady()\n", true, &_init_f_isFlashReady_c0, &_call_f_isFlashReady_c0); methods += new qt_gsi::GenericMethod ("isMeteringModeSupported?", "@brief Method bool QCameraExposure::isMeteringModeSupported(QCameraExposure::MeteringMode mode)\n", true, &_init_f_isMeteringModeSupported_c3293, &_call_f_isMeteringModeSupported_c3293); methods += new qt_gsi::GenericMethod (":isoSensitivity", "@brief Method int QCameraExposure::isoSensitivity()\n", true, &_init_f_isoSensitivity_c0, &_call_f_isoSensitivity_c0); + methods += new qt_gsi::GenericMethod ("isoSensitivityChanged", "@brief Method void QCameraExposure::isoSensitivityChanged(int)\n", false, &_init_f_isoSensitivityChanged_767, &_call_f_isoSensitivityChanged_767); methods += new qt_gsi::GenericMethod (":meteringMode", "@brief Method QCameraExposure::MeteringMode QCameraExposure::meteringMode()\n", true, &_init_f_meteringMode_c0, &_call_f_meteringMode_c0); methods += new qt_gsi::GenericMethod ("requestedAperture", "@brief Method double QCameraExposure::requestedAperture()\n", true, &_init_f_requestedAperture_c0, &_call_f_requestedAperture_c0); methods += new qt_gsi::GenericMethod ("requestedIsoSensitivity", "@brief Method int QCameraExposure::requestedIsoSensitivity()\n", true, &_init_f_requestedIsoSensitivity_c0, &_call_f_requestedIsoSensitivity_c0); @@ -654,18 +791,12 @@ static gsi::Methods methods_QCameraExposure () { methods += new qt_gsi::GenericMethod ("setMeteringMode|meteringMode=", "@brief Method void QCameraExposure::setMeteringMode(QCameraExposure::MeteringMode mode)\n", false, &_init_f_setMeteringMode_3293, &_call_f_setMeteringMode_3293); methods += new qt_gsi::GenericMethod ("setSpotMeteringPoint|spotMeteringPoint=", "@brief Method void QCameraExposure::setSpotMeteringPoint(const QPointF &point)\n", false, &_init_f_setSpotMeteringPoint_1986, &_call_f_setSpotMeteringPoint_1986); methods += new qt_gsi::GenericMethod (":shutterSpeed", "@brief Method double QCameraExposure::shutterSpeed()\n", true, &_init_f_shutterSpeed_c0, &_call_f_shutterSpeed_c0); + methods += new qt_gsi::GenericMethod ("shutterSpeedChanged", "@brief Method void QCameraExposure::shutterSpeedChanged(double)\n", false, &_init_f_shutterSpeedChanged_1071, &_call_f_shutterSpeedChanged_1071); + methods += new qt_gsi::GenericMethod ("shutterSpeedRangeChanged", "@brief Method void QCameraExposure::shutterSpeedRangeChanged()\n", false, &_init_f_shutterSpeedRangeChanged_0, &_call_f_shutterSpeedRangeChanged_0); methods += new qt_gsi::GenericMethod (":spotMeteringPoint", "@brief Method QPointF QCameraExposure::spotMeteringPoint()\n", true, &_init_f_spotMeteringPoint_c0, &_call_f_spotMeteringPoint_c0); methods += new qt_gsi::GenericMethod ("supportedApertures", "@brief Method QList QCameraExposure::supportedApertures(bool *continuous)\n", true, &_init_f_supportedApertures_c1050, &_call_f_supportedApertures_c1050); methods += new qt_gsi::GenericMethod ("supportedIsoSensitivities", "@brief Method QList QCameraExposure::supportedIsoSensitivities(bool *continuous)\n", true, &_init_f_supportedIsoSensitivities_c1050, &_call_f_supportedIsoSensitivities_c1050); methods += new qt_gsi::GenericMethod ("supportedShutterSpeeds", "@brief Method QList QCameraExposure::supportedShutterSpeeds(bool *continuous)\n", true, &_init_f_supportedShutterSpeeds_c1050, &_call_f_supportedShutterSpeeds_c1050); - methods += gsi::qt_signal ("apertureChanged(double)", "apertureChanged", gsi::arg("arg1"), "@brief Signal declaration for QCameraExposure::apertureChanged(double)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("apertureRangeChanged()", "apertureRangeChanged", "@brief Signal declaration for QCameraExposure::apertureRangeChanged()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QCameraExposure::destroyed(QObject *)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("exposureCompensationChanged(double)", "exposureCompensationChanged", gsi::arg("arg1"), "@brief Signal declaration for QCameraExposure::exposureCompensationChanged(double)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("flashReady(bool)", "flashReady_sig", gsi::arg("arg1"), "@brief Signal declaration for QCameraExposure::flashReady(bool)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("isoSensitivityChanged(int)", "isoSensitivityChanged", gsi::arg("arg1"), "@brief Signal declaration for QCameraExposure::isoSensitivityChanged(int)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("shutterSpeedChanged(double)", "shutterSpeedChanged", gsi::arg("arg1"), "@brief Signal declaration for QCameraExposure::shutterSpeedChanged(double)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("shutterSpeedRangeChanged()", "shutterSpeedRangeChanged", "@brief Signal declaration for QCameraExposure::shutterSpeedRangeChanged()\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QCameraExposure::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QCameraExposure::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; diff --git a/src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraExposureControl.cc b/src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraExposureControl.cc index c1258711e..82e14c9b4 100644 --- a/src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraExposureControl.cc +++ b/src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraExposureControl.cc @@ -74,6 +74,26 @@ static void _call_f_actualValue_c4602 (const qt_gsi::GenericMethod * /*decl*/, v } +// void QCameraExposureControl::actualValueChanged(int parameter) + + +static void _init_f_actualValueChanged_767 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parameter"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_actualValueChanged_767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + int arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QCameraExposureControl *)cls)->actualValueChanged (arg1); +} + + // bool QCameraExposureControl::isParameterSupported(QCameraExposureControl::ExposureParameter parameter) @@ -93,6 +113,26 @@ static void _call_f_isParameterSupported_c4602 (const qt_gsi::GenericMethod * /* } +// void QCameraExposureControl::parameterRangeChanged(int parameter) + + +static void _init_f_parameterRangeChanged_767 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parameter"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_parameterRangeChanged_767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + int arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QCameraExposureControl *)cls)->parameterRangeChanged (arg1); +} + + // QVariant QCameraExposureControl::requestedValue(QCameraExposureControl::ExposureParameter parameter) @@ -112,6 +152,26 @@ static void _call_f_requestedValue_c4602 (const qt_gsi::GenericMethod * /*decl*/ } +// void QCameraExposureControl::requestedValueChanged(int parameter) + + +static void _init_f_requestedValueChanged_767 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parameter"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_requestedValueChanged_767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + int arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QCameraExposureControl *)cls)->requestedValueChanged (arg1); +} + + // bool QCameraExposureControl::setValue(QCameraExposureControl::ExposureParameter parameter, const QVariant &value) @@ -213,14 +273,13 @@ static gsi::Methods methods_QCameraExposureControl () { gsi::Methods methods; methods += new qt_gsi::GenericStaticMethod ("staticMetaObject", "@brief Obtains the static MetaObject for this class.", &_init_smo, &_call_smo); methods += new qt_gsi::GenericMethod ("actualValue", "@brief Method QVariant QCameraExposureControl::actualValue(QCameraExposureControl::ExposureParameter parameter)\n", true, &_init_f_actualValue_c4602, &_call_f_actualValue_c4602); + methods += new qt_gsi::GenericMethod ("actualValueChanged", "@brief Method void QCameraExposureControl::actualValueChanged(int parameter)\n", false, &_init_f_actualValueChanged_767, &_call_f_actualValueChanged_767); methods += new qt_gsi::GenericMethod ("isParameterSupported?", "@brief Method bool QCameraExposureControl::isParameterSupported(QCameraExposureControl::ExposureParameter parameter)\n", true, &_init_f_isParameterSupported_c4602, &_call_f_isParameterSupported_c4602); + methods += new qt_gsi::GenericMethod ("parameterRangeChanged", "@brief Method void QCameraExposureControl::parameterRangeChanged(int parameter)\n", false, &_init_f_parameterRangeChanged_767, &_call_f_parameterRangeChanged_767); methods += new qt_gsi::GenericMethod ("requestedValue", "@brief Method QVariant QCameraExposureControl::requestedValue(QCameraExposureControl::ExposureParameter parameter)\n", true, &_init_f_requestedValue_c4602, &_call_f_requestedValue_c4602); + methods += new qt_gsi::GenericMethod ("requestedValueChanged", "@brief Method void QCameraExposureControl::requestedValueChanged(int parameter)\n", false, &_init_f_requestedValueChanged_767, &_call_f_requestedValueChanged_767); methods += new qt_gsi::GenericMethod ("setValue", "@brief Method bool QCameraExposureControl::setValue(QCameraExposureControl::ExposureParameter parameter, const QVariant &value)\n", false, &_init_f_setValue_6613, &_call_f_setValue_6613); methods += new qt_gsi::GenericMethod ("supportedParameterRange", "@brief Method QList QCameraExposureControl::supportedParameterRange(QCameraExposureControl::ExposureParameter parameter, bool *continuous)\n", true, &_init_f_supportedParameterRange_c5544, &_call_f_supportedParameterRange_c5544); - methods += gsi::qt_signal ("actualValueChanged(int)", "actualValueChanged", gsi::arg("parameter"), "@brief Signal declaration for QCameraExposureControl::actualValueChanged(int parameter)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QCameraExposureControl::destroyed(QObject *)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("parameterRangeChanged(int)", "parameterRangeChanged", gsi::arg("parameter"), "@brief Signal declaration for QCameraExposureControl::parameterRangeChanged(int parameter)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("requestedValueChanged(int)", "requestedValueChanged", gsi::arg("parameter"), "@brief Signal declaration for QCameraExposureControl::requestedValueChanged(int parameter)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QCameraExposureControl::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QCameraExposureControl::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -285,18 +344,6 @@ public: } } - // [emitter impl] void QCameraExposureControl::actualValueChanged(int parameter) - void emitter_QCameraExposureControl_actualValueChanged_767(int parameter) - { - emit QCameraExposureControl::actualValueChanged(parameter); - } - - // [emitter impl] void QCameraExposureControl::destroyed(QObject *) - void emitter_QCameraExposureControl_destroyed_1302(QObject *arg1) - { - emit QCameraExposureControl::destroyed(arg1); - } - // [adaptor impl] bool QCameraExposureControl::event(QEvent *) bool cbs_event_1217_0(QEvent *arg1) { @@ -343,12 +390,6 @@ public: } } - // [emitter impl] void QCameraExposureControl::parameterRangeChanged(int parameter) - void emitter_QCameraExposureControl_parameterRangeChanged_767(int parameter) - { - emit QCameraExposureControl::parameterRangeChanged(parameter); - } - // [adaptor impl] QVariant QCameraExposureControl::requestedValue(QCameraExposureControl::ExposureParameter parameter) QVariant cbs_requestedValue_c4602_0(const qt_gsi::Converter::target_type & parameter) const { @@ -365,12 +406,6 @@ public: } } - // [emitter impl] void QCameraExposureControl::requestedValueChanged(int parameter) - void emitter_QCameraExposureControl_requestedValueChanged_767(int parameter) - { - emit QCameraExposureControl::requestedValueChanged(parameter); - } - // [adaptor impl] bool QCameraExposureControl::setValue(QCameraExposureControl::ExposureParameter parameter, const QVariant &value) bool cbs_setValue_6613_0(const qt_gsi::Converter::target_type & parameter, const QVariant &value) { @@ -517,24 +552,6 @@ static void _set_callback_cbs_actualValue_c4602_0 (void *cls, const gsi::Callbac } -// emitter void QCameraExposureControl::actualValueChanged(int parameter) - -static void _init_emitter_actualValueChanged_767 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("parameter"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_actualValueChanged_767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - int arg1 = gsi::arg_reader() (args, heap); - ((QCameraExposureControl_Adaptor *)cls)->emitter_QCameraExposureControl_actualValueChanged_767 (arg1); -} - - // void QCameraExposureControl::childEvent(QChildEvent *) static void _init_cbs_childEvent_1701_0 (qt_gsi::GenericMethod *decl) @@ -583,24 +600,6 @@ static void _set_callback_cbs_customEvent_1217_0 (void *cls, const gsi::Callback } -// emitter void QCameraExposureControl::destroyed(QObject *) - -static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - ((QCameraExposureControl_Adaptor *)cls)->emitter_QCameraExposureControl_destroyed_1302 (arg1); -} - - // void QCameraExposureControl::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -715,24 +714,6 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } -// emitter void QCameraExposureControl::parameterRangeChanged(int parameter) - -static void _init_emitter_parameterRangeChanged_767 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("parameter"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_parameterRangeChanged_767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - int arg1 = gsi::arg_reader() (args, heap); - ((QCameraExposureControl_Adaptor *)cls)->emitter_QCameraExposureControl_parameterRangeChanged_767 (arg1); -} - - // exposed int QCameraExposureControl::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -774,24 +755,6 @@ static void _set_callback_cbs_requestedValue_c4602_0 (void *cls, const gsi::Call } -// emitter void QCameraExposureControl::requestedValueChanged(int parameter) - -static void _init_emitter_requestedValueChanged_767 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("parameter"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_requestedValueChanged_767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - int arg1 = gsi::arg_reader() (args, heap); - ((QCameraExposureControl_Adaptor *)cls)->emitter_QCameraExposureControl_requestedValueChanged_767 (arg1); -} - - // exposed QObject *QCameraExposureControl::sender() static void _init_fp_sender_c0 (qt_gsi::GenericMethod *decl) @@ -906,12 +869,10 @@ static gsi::Methods methods_QCameraExposureControl_Adaptor () { methods += new qt_gsi::GenericStaticMethod ("new", "@brief Constructor QCameraExposureControl::QCameraExposureControl()\nThis method creates an object of class QCameraExposureControl.", &_init_ctor_QCameraExposureControl_Adaptor_0, &_call_ctor_QCameraExposureControl_Adaptor_0); methods += new qt_gsi::GenericMethod ("actualValue", "@brief Virtual method QVariant QCameraExposureControl::actualValue(QCameraExposureControl::ExposureParameter parameter)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_actualValue_c4602_0, &_call_cbs_actualValue_c4602_0); methods += new qt_gsi::GenericMethod ("actualValue", "@hide", true, &_init_cbs_actualValue_c4602_0, &_call_cbs_actualValue_c4602_0, &_set_callback_cbs_actualValue_c4602_0); - methods += new qt_gsi::GenericMethod ("emit_actualValueChanged", "@brief Emitter for signal void QCameraExposureControl::actualValueChanged(int parameter)\nCall this method to emit this signal.", false, &_init_emitter_actualValueChanged_767, &_call_emitter_actualValueChanged_767); methods += new qt_gsi::GenericMethod ("*childEvent", "@brief Virtual method void QCameraExposureControl::childEvent(QChildEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QCameraExposureControl::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); - methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QCameraExposureControl::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QCameraExposureControl::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("event", "@brief Virtual method bool QCameraExposureControl::event(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0); @@ -921,11 +882,9 @@ static gsi::Methods methods_QCameraExposureControl_Adaptor () { methods += new qt_gsi::GenericMethod ("isParameterSupported", "@brief Virtual method bool QCameraExposureControl::isParameterSupported(QCameraExposureControl::ExposureParameter parameter)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_isParameterSupported_c4602_0, &_call_cbs_isParameterSupported_c4602_0); methods += new qt_gsi::GenericMethod ("isParameterSupported", "@hide", true, &_init_cbs_isParameterSupported_c4602_0, &_call_cbs_isParameterSupported_c4602_0, &_set_callback_cbs_isParameterSupported_c4602_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QCameraExposureControl::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); - methods += new qt_gsi::GenericMethod ("emit_parameterRangeChanged", "@brief Emitter for signal void QCameraExposureControl::parameterRangeChanged(int parameter)\nCall this method to emit this signal.", false, &_init_emitter_parameterRangeChanged_767, &_call_emitter_parameterRangeChanged_767); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QCameraExposureControl::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("requestedValue", "@brief Virtual method QVariant QCameraExposureControl::requestedValue(QCameraExposureControl::ExposureParameter parameter)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_requestedValue_c4602_0, &_call_cbs_requestedValue_c4602_0); methods += new qt_gsi::GenericMethod ("requestedValue", "@hide", true, &_init_cbs_requestedValue_c4602_0, &_call_cbs_requestedValue_c4602_0, &_set_callback_cbs_requestedValue_c4602_0); - methods += new qt_gsi::GenericMethod ("emit_requestedValueChanged", "@brief Emitter for signal void QCameraExposureControl::requestedValueChanged(int parameter)\nCall this method to emit this signal.", false, &_init_emitter_requestedValueChanged_767, &_call_emitter_requestedValueChanged_767); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QCameraExposureControl::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QCameraExposureControl::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); methods += new qt_gsi::GenericMethod ("setValue", "@brief Virtual method bool QCameraExposureControl::setValue(QCameraExposureControl::ExposureParameter parameter, const QVariant &value)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_setValue_6613_0, &_call_cbs_setValue_6613_0); diff --git a/src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraFeedbackControl.cc b/src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraFeedbackControl.cc index e33c68b69..0f277057c 100644 --- a/src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraFeedbackControl.cc +++ b/src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraFeedbackControl.cc @@ -218,7 +218,6 @@ static gsi::Methods methods_QCameraFeedbackControl () { methods += new qt_gsi::GenericMethod ("resetEventFeedback", "@brief Method void QCameraFeedbackControl::resetEventFeedback(QCameraFeedbackControl::EventType)\n", false, &_init_f_resetEventFeedback_3660, &_call_f_resetEventFeedback_3660); methods += new qt_gsi::GenericMethod ("setEventFeedbackEnabled", "@brief Method bool QCameraFeedbackControl::setEventFeedbackEnabled(QCameraFeedbackControl::EventType, bool)\n", false, &_init_f_setEventFeedbackEnabled_4416, &_call_f_setEventFeedbackEnabled_4416); methods += new qt_gsi::GenericMethod ("setEventFeedbackSound", "@brief Method bool QCameraFeedbackControl::setEventFeedbackSound(QCameraFeedbackControl::EventType, const QString &filePath)\n", false, &_init_f_setEventFeedbackSound_5577, &_call_f_setEventFeedbackSound_5577); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QCameraFeedbackControl::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QCameraFeedbackControl::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QCameraFeedbackControl::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -267,12 +266,6 @@ public: return QCameraFeedbackControl::senderSignalIndex(); } - // [emitter impl] void QCameraFeedbackControl::destroyed(QObject *) - void emitter_QCameraFeedbackControl_destroyed_1302(QObject *arg1) - { - emit QCameraFeedbackControl::destroyed(arg1); - } - // [adaptor impl] bool QCameraFeedbackControl::event(QEvent *) bool cbs_event_1217_0(QEvent *arg1) { @@ -522,24 +515,6 @@ static void _set_callback_cbs_customEvent_1217_0 (void *cls, const gsi::Callback } -// emitter void QCameraFeedbackControl::destroyed(QObject *) - -static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - ((QCameraFeedbackControl_Adaptor *)cls)->emitter_QCameraFeedbackControl_destroyed_1302 (arg1); -} - - // void QCameraFeedbackControl::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -835,7 +810,6 @@ static gsi::Methods methods_QCameraFeedbackControl_Adaptor () { methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QCameraFeedbackControl::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); - methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QCameraFeedbackControl::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QCameraFeedbackControl::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("event", "@brief Virtual method bool QCameraFeedbackControl::event(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0); diff --git a/src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraFlashControl.cc b/src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraFlashControl.cc index 64d96f5d9..219635cf7 100644 --- a/src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraFlashControl.cc +++ b/src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraFlashControl.cc @@ -70,6 +70,26 @@ static void _call_f_flashMode_c0 (const qt_gsi::GenericMethod * /*decl*/, void * } +// void QCameraFlashControl::flashReady(bool) + + +static void _init_f_flashReady_864 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("arg1"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_flashReady_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + bool arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QCameraFlashControl *)cls)->flashReady (arg1); +} + + // bool QCameraFlashControl::isFlashModeSupported(QFlags mode) @@ -181,11 +201,10 @@ static gsi::Methods methods_QCameraFlashControl () { gsi::Methods methods; methods += new qt_gsi::GenericStaticMethod ("staticMetaObject", "@brief Obtains the static MetaObject for this class.", &_init_smo, &_call_smo); methods += new qt_gsi::GenericMethod (":flashMode", "@brief Method QFlags QCameraFlashControl::flashMode()\n", true, &_init_f_flashMode_c0, &_call_f_flashMode_c0); + methods += new qt_gsi::GenericMethod ("flashReady", "@brief Method void QCameraFlashControl::flashReady(bool)\n", false, &_init_f_flashReady_864, &_call_f_flashReady_864); methods += new qt_gsi::GenericMethod ("isFlashModeSupported?", "@brief Method bool QCameraFlashControl::isFlashModeSupported(QFlags mode)\n", true, &_init_f_isFlashModeSupported_c3656, &_call_f_isFlashModeSupported_c3656); methods += new qt_gsi::GenericMethod ("isFlashReady?", "@brief Method bool QCameraFlashControl::isFlashReady()\n", true, &_init_f_isFlashReady_c0, &_call_f_isFlashReady_c0); methods += new qt_gsi::GenericMethod ("setFlashMode|flashMode=", "@brief Method void QCameraFlashControl::setFlashMode(QFlags mode)\n", false, &_init_f_setFlashMode_3656, &_call_f_setFlashMode_3656); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QCameraFlashControl::destroyed(QObject *)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("flashReady(bool)", "flashReady", gsi::arg("arg1"), "@brief Signal declaration for QCameraFlashControl::flashReady(bool)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QCameraFlashControl::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QCameraFlashControl::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -234,12 +253,6 @@ public: return QCameraFlashControl::senderSignalIndex(); } - // [emitter impl] void QCameraFlashControl::destroyed(QObject *) - void emitter_QCameraFlashControl_destroyed_1302(QObject *arg1) - { - emit QCameraFlashControl::destroyed(arg1); - } - // [adaptor impl] bool QCameraFlashControl::event(QEvent *) bool cbs_event_1217_0(QEvent *arg1) { @@ -285,12 +298,6 @@ public: } } - // [emitter impl] void QCameraFlashControl::flashReady(bool) - void emitter_QCameraFlashControl_flashReady_864(bool arg1) - { - emit QCameraFlashControl::flashReady(arg1); - } - // [adaptor impl] bool QCameraFlashControl::isFlashModeSupported(QFlags mode) bool cbs_isFlashModeSupported_c3656_0(QFlags mode) const { @@ -474,24 +481,6 @@ static void _set_callback_cbs_customEvent_1217_0 (void *cls, const gsi::Callback } -// emitter void QCameraFlashControl::destroyed(QObject *) - -static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - ((QCameraFlashControl_Adaptor *)cls)->emitter_QCameraFlashControl_destroyed_1302 (arg1); -} - - // void QCameraFlashControl::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -584,24 +573,6 @@ static void _set_callback_cbs_flashMode_c0_0 (void *cls, const gsi::Callback &cb } -// emitter void QCameraFlashControl::flashReady(bool) - -static void _init_emitter_flashReady_864 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_flashReady_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - bool arg1 = gsi::arg_reader() (args, heap); - ((QCameraFlashControl_Adaptor *)cls)->emitter_QCameraFlashControl_flashReady_864 (arg1); -} - - // bool QCameraFlashControl::isFlashModeSupported(QFlags mode) static void _init_cbs_isFlashModeSupported_c3656_0 (qt_gsi::GenericMethod *decl) @@ -768,7 +739,6 @@ static gsi::Methods methods_QCameraFlashControl_Adaptor () { methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QCameraFlashControl::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); - methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QCameraFlashControl::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QCameraFlashControl::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("event", "@brief Virtual method bool QCameraFlashControl::event(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0); @@ -777,7 +747,6 @@ static gsi::Methods methods_QCameraFlashControl_Adaptor () { methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("flashMode", "@brief Virtual method QFlags QCameraFlashControl::flashMode()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_flashMode_c0_0, &_call_cbs_flashMode_c0_0); methods += new qt_gsi::GenericMethod ("flashMode", "@hide", true, &_init_cbs_flashMode_c0_0, &_call_cbs_flashMode_c0_0, &_set_callback_cbs_flashMode_c0_0); - methods += new qt_gsi::GenericMethod ("emit_flashReady", "@brief Emitter for signal void QCameraFlashControl::flashReady(bool)\nCall this method to emit this signal.", false, &_init_emitter_flashReady_864, &_call_emitter_flashReady_864); methods += new qt_gsi::GenericMethod ("isFlashModeSupported", "@brief Virtual method bool QCameraFlashControl::isFlashModeSupported(QFlags mode)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_isFlashModeSupported_c3656_0, &_call_cbs_isFlashModeSupported_c3656_0); methods += new qt_gsi::GenericMethod ("isFlashModeSupported", "@hide", true, &_init_cbs_isFlashModeSupported_c3656_0, &_call_cbs_isFlashModeSupported_c3656_0, &_set_callback_cbs_isFlashModeSupported_c3656_0); methods += new qt_gsi::GenericMethod ("isFlashReady", "@brief Virtual method bool QCameraFlashControl::isFlashReady()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_isFlashReady_c0_0, &_call_cbs_isFlashReady_c0_0); diff --git a/src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraFocus.cc b/src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraFocus.cc index 9f655f00e..c3ba1b48c 100644 --- a/src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraFocus.cc +++ b/src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraFocus.cc @@ -85,6 +85,26 @@ static void _call_f_digitalZoom_c0 (const qt_gsi::GenericMethod * /*decl*/, void } +// void QCameraFocus::digitalZoomChanged(double) + + +static void _init_f_digitalZoomChanged_1071 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("arg1"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_digitalZoomChanged_1071 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + double arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QCameraFocus *)cls)->digitalZoomChanged (arg1); +} + + // QFlags QCameraFocus::focusMode() @@ -130,6 +150,22 @@ static void _call_f_focusZones_c0 (const qt_gsi::GenericMethod * /*decl*/, void } +// void QCameraFocus::focusZonesChanged() + + +static void _init_f_focusZonesChanged_0 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_f_focusZonesChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + __SUPPRESS_UNUSED_WARNING(ret); + ((QCameraFocus *)cls)->focusZonesChanged (); +} + + // bool QCameraFocus::isAvailable() @@ -198,6 +234,26 @@ static void _call_f_maximumDigitalZoom_c0 (const qt_gsi::GenericMethod * /*decl* } +// void QCameraFocus::maximumDigitalZoomChanged(double) + + +static void _init_f_maximumDigitalZoomChanged_1071 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("arg1"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_maximumDigitalZoomChanged_1071 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + double arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QCameraFocus *)cls)->maximumDigitalZoomChanged (arg1); +} + + // double QCameraFocus::maximumOpticalZoom() @@ -213,6 +269,26 @@ static void _call_f_maximumOpticalZoom_c0 (const qt_gsi::GenericMethod * /*decl* } +// void QCameraFocus::maximumOpticalZoomChanged(double) + + +static void _init_f_maximumOpticalZoomChanged_1071 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("arg1"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_maximumOpticalZoomChanged_1071 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + double arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QCameraFocus *)cls)->maximumOpticalZoomChanged (arg1); +} + + // double QCameraFocus::opticalZoom() @@ -228,6 +304,26 @@ static void _call_f_opticalZoom_c0 (const qt_gsi::GenericMethod * /*decl*/, void } +// void QCameraFocus::opticalZoomChanged(double) + + +static void _init_f_opticalZoomChanged_1071 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("arg1"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_opticalZoomChanged_1071 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + double arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QCameraFocus *)cls)->opticalZoomChanged (arg1); +} + + // void QCameraFocus::setCustomFocusPoint(const QPointF &point) @@ -370,25 +466,24 @@ static gsi::Methods methods_QCameraFocus () { methods += new qt_gsi::GenericStaticMethod ("staticMetaObject", "@brief Obtains the static MetaObject for this class.", &_init_smo, &_call_smo); methods += new qt_gsi::GenericMethod (":customFocusPoint", "@brief Method QPointF QCameraFocus::customFocusPoint()\n", true, &_init_f_customFocusPoint_c0, &_call_f_customFocusPoint_c0); methods += new qt_gsi::GenericMethod (":digitalZoom", "@brief Method double QCameraFocus::digitalZoom()\n", true, &_init_f_digitalZoom_c0, &_call_f_digitalZoom_c0); + methods += new qt_gsi::GenericMethod ("digitalZoomChanged", "@brief Method void QCameraFocus::digitalZoomChanged(double)\n", false, &_init_f_digitalZoomChanged_1071, &_call_f_digitalZoomChanged_1071); methods += new qt_gsi::GenericMethod (":focusMode", "@brief Method QFlags QCameraFocus::focusMode()\n", true, &_init_f_focusMode_c0, &_call_f_focusMode_c0); methods += new qt_gsi::GenericMethod (":focusPointMode", "@brief Method QCameraFocus::FocusPointMode QCameraFocus::focusPointMode()\n", true, &_init_f_focusPointMode_c0, &_call_f_focusPointMode_c0); methods += new qt_gsi::GenericMethod (":focusZones", "@brief Method QList QCameraFocus::focusZones()\n", true, &_init_f_focusZones_c0, &_call_f_focusZones_c0); + methods += new qt_gsi::GenericMethod ("focusZonesChanged", "@brief Method void QCameraFocus::focusZonesChanged()\n", false, &_init_f_focusZonesChanged_0, &_call_f_focusZonesChanged_0); methods += new qt_gsi::GenericMethod ("isAvailable?", "@brief Method bool QCameraFocus::isAvailable()\n", true, &_init_f_isAvailable_c0, &_call_f_isAvailable_c0); methods += new qt_gsi::GenericMethod ("isFocusModeSupported?", "@brief Method bool QCameraFocus::isFocusModeSupported(QFlags mode)\n", true, &_init_f_isFocusModeSupported_c3327, &_call_f_isFocusModeSupported_c3327); methods += new qt_gsi::GenericMethod ("isFocusPointModeSupported?", "@brief Method bool QCameraFocus::isFocusPointModeSupported(QCameraFocus::FocusPointMode)\n", true, &_init_f_isFocusPointModeSupported_c3153, &_call_f_isFocusPointModeSupported_c3153); methods += new qt_gsi::GenericMethod ("maximumDigitalZoom", "@brief Method double QCameraFocus::maximumDigitalZoom()\n", true, &_init_f_maximumDigitalZoom_c0, &_call_f_maximumDigitalZoom_c0); + methods += new qt_gsi::GenericMethod ("maximumDigitalZoomChanged", "@brief Method void QCameraFocus::maximumDigitalZoomChanged(double)\n", false, &_init_f_maximumDigitalZoomChanged_1071, &_call_f_maximumDigitalZoomChanged_1071); methods += new qt_gsi::GenericMethod ("maximumOpticalZoom", "@brief Method double QCameraFocus::maximumOpticalZoom()\n", true, &_init_f_maximumOpticalZoom_c0, &_call_f_maximumOpticalZoom_c0); + methods += new qt_gsi::GenericMethod ("maximumOpticalZoomChanged", "@brief Method void QCameraFocus::maximumOpticalZoomChanged(double)\n", false, &_init_f_maximumOpticalZoomChanged_1071, &_call_f_maximumOpticalZoomChanged_1071); methods += new qt_gsi::GenericMethod (":opticalZoom", "@brief Method double QCameraFocus::opticalZoom()\n", true, &_init_f_opticalZoom_c0, &_call_f_opticalZoom_c0); + methods += new qt_gsi::GenericMethod ("opticalZoomChanged", "@brief Method void QCameraFocus::opticalZoomChanged(double)\n", false, &_init_f_opticalZoomChanged_1071, &_call_f_opticalZoomChanged_1071); methods += new qt_gsi::GenericMethod ("setCustomFocusPoint|customFocusPoint=", "@brief Method void QCameraFocus::setCustomFocusPoint(const QPointF &point)\n", false, &_init_f_setCustomFocusPoint_1986, &_call_f_setCustomFocusPoint_1986); methods += new qt_gsi::GenericMethod ("setFocusMode|focusMode=", "@brief Method void QCameraFocus::setFocusMode(QFlags mode)\n", false, &_init_f_setFocusMode_3327, &_call_f_setFocusMode_3327); methods += new qt_gsi::GenericMethod ("setFocusPointMode|focusPointMode=", "@brief Method void QCameraFocus::setFocusPointMode(QCameraFocus::FocusPointMode mode)\n", false, &_init_f_setFocusPointMode_3153, &_call_f_setFocusPointMode_3153); methods += new qt_gsi::GenericMethod ("zoomTo", "@brief Method void QCameraFocus::zoomTo(double opticalZoom, double digitalZoom)\n", false, &_init_f_zoomTo_2034, &_call_f_zoomTo_2034); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QCameraFocus::destroyed(QObject *)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("digitalZoomChanged(double)", "digitalZoomChanged", gsi::arg("arg1"), "@brief Signal declaration for QCameraFocus::digitalZoomChanged(double)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("focusZonesChanged()", "focusZonesChanged", "@brief Signal declaration for QCameraFocus::focusZonesChanged()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("maximumDigitalZoomChanged(double)", "maximumDigitalZoomChanged", gsi::arg("arg1"), "@brief Signal declaration for QCameraFocus::maximumDigitalZoomChanged(double)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("maximumOpticalZoomChanged(double)", "maximumOpticalZoomChanged", gsi::arg("arg1"), "@brief Signal declaration for QCameraFocus::maximumOpticalZoomChanged(double)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("opticalZoomChanged(double)", "opticalZoomChanged", gsi::arg("arg1"), "@brief Signal declaration for QCameraFocus::opticalZoomChanged(double)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QCameraFocus::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QCameraFocus::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; diff --git a/src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraFocusControl.cc b/src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraFocusControl.cc index 80aa280de..58f921a6e 100644 --- a/src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraFocusControl.cc +++ b/src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraFocusControl.cc @@ -72,6 +72,26 @@ static void _call_f_customFocusPoint_c0 (const qt_gsi::GenericMethod * /*decl*/, } +// void QCameraFocusControl::customFocusPointChanged(const QPointF &point) + + +static void _init_f_customFocusPointChanged_1986 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("point"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_customFocusPointChanged_1986 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QPointF &arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QCameraFocusControl *)cls)->customFocusPointChanged (arg1); +} + + // QFlags QCameraFocusControl::focusMode() @@ -87,6 +107,26 @@ static void _call_f_focusMode_c0 (const qt_gsi::GenericMethod * /*decl*/, void * } +// void QCameraFocusControl::focusModeChanged(QFlags mode) + + +static void _init_f_focusModeChanged_3327 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("mode"); + decl->add_arg > (argspec_0); + decl->set_return (); +} + +static void _call_f_focusModeChanged_3327 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + QFlags arg1 = gsi::arg_reader >() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QCameraFocusControl *)cls)->focusModeChanged (arg1); +} + + // QCameraFocus::FocusPointMode QCameraFocusControl::focusPointMode() @@ -102,6 +142,26 @@ static void _call_f_focusPointMode_c0 (const qt_gsi::GenericMethod * /*decl*/, v } +// void QCameraFocusControl::focusPointModeChanged(QCameraFocus::FocusPointMode mode) + + +static void _init_f_focusPointModeChanged_3153 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("mode"); + decl->add_arg::target_type & > (argspec_0); + decl->set_return (); +} + +static void _call_f_focusPointModeChanged_3153 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QCameraFocusControl *)cls)->focusPointModeChanged (qt_gsi::QtToCppAdaptor(arg1).cref()); +} + + // QList QCameraFocusControl::focusZones() @@ -117,6 +177,22 @@ static void _call_f_focusZones_c0 (const qt_gsi::GenericMethod * /*decl*/, void } +// void QCameraFocusControl::focusZonesChanged() + + +static void _init_f_focusZonesChanged_0 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_f_focusZonesChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + __SUPPRESS_UNUSED_WARNING(ret); + ((QCameraFocusControl *)cls)->focusZonesChanged (); +} + + // bool QCameraFocusControl::isFocusModeSupported(QFlags mode) @@ -272,19 +348,18 @@ static gsi::Methods methods_QCameraFocusControl () { gsi::Methods methods; methods += new qt_gsi::GenericStaticMethod ("staticMetaObject", "@brief Obtains the static MetaObject for this class.", &_init_smo, &_call_smo); methods += new qt_gsi::GenericMethod (":customFocusPoint", "@brief Method QPointF QCameraFocusControl::customFocusPoint()\n", true, &_init_f_customFocusPoint_c0, &_call_f_customFocusPoint_c0); + methods += new qt_gsi::GenericMethod ("customFocusPointChanged", "@brief Method void QCameraFocusControl::customFocusPointChanged(const QPointF &point)\n", false, &_init_f_customFocusPointChanged_1986, &_call_f_customFocusPointChanged_1986); methods += new qt_gsi::GenericMethod (":focusMode", "@brief Method QFlags QCameraFocusControl::focusMode()\n", true, &_init_f_focusMode_c0, &_call_f_focusMode_c0); + methods += new qt_gsi::GenericMethod ("focusModeChanged", "@brief Method void QCameraFocusControl::focusModeChanged(QFlags mode)\n", false, &_init_f_focusModeChanged_3327, &_call_f_focusModeChanged_3327); methods += new qt_gsi::GenericMethod (":focusPointMode", "@brief Method QCameraFocus::FocusPointMode QCameraFocusControl::focusPointMode()\n", true, &_init_f_focusPointMode_c0, &_call_f_focusPointMode_c0); + methods += new qt_gsi::GenericMethod ("focusPointModeChanged", "@brief Method void QCameraFocusControl::focusPointModeChanged(QCameraFocus::FocusPointMode mode)\n", false, &_init_f_focusPointModeChanged_3153, &_call_f_focusPointModeChanged_3153); methods += new qt_gsi::GenericMethod ("focusZones", "@brief Method QList QCameraFocusControl::focusZones()\n", true, &_init_f_focusZones_c0, &_call_f_focusZones_c0); + methods += new qt_gsi::GenericMethod ("focusZonesChanged", "@brief Method void QCameraFocusControl::focusZonesChanged()\n", false, &_init_f_focusZonesChanged_0, &_call_f_focusZonesChanged_0); methods += new qt_gsi::GenericMethod ("isFocusModeSupported?", "@brief Method bool QCameraFocusControl::isFocusModeSupported(QFlags mode)\n", true, &_init_f_isFocusModeSupported_c3327, &_call_f_isFocusModeSupported_c3327); methods += new qt_gsi::GenericMethod ("isFocusPointModeSupported?", "@brief Method bool QCameraFocusControl::isFocusPointModeSupported(QCameraFocus::FocusPointMode mode)\n", true, &_init_f_isFocusPointModeSupported_c3153, &_call_f_isFocusPointModeSupported_c3153); methods += new qt_gsi::GenericMethod ("setCustomFocusPoint|customFocusPoint=", "@brief Method void QCameraFocusControl::setCustomFocusPoint(const QPointF &point)\n", false, &_init_f_setCustomFocusPoint_1986, &_call_f_setCustomFocusPoint_1986); methods += new qt_gsi::GenericMethod ("setFocusMode|focusMode=", "@brief Method void QCameraFocusControl::setFocusMode(QFlags mode)\n", false, &_init_f_setFocusMode_3327, &_call_f_setFocusMode_3327); methods += new qt_gsi::GenericMethod ("setFocusPointMode|focusPointMode=", "@brief Method void QCameraFocusControl::setFocusPointMode(QCameraFocus::FocusPointMode mode)\n", false, &_init_f_setFocusPointMode_3153, &_call_f_setFocusPointMode_3153); - methods += gsi::qt_signal ("customFocusPointChanged(const QPointF &)", "customFocusPointChanged", gsi::arg("point"), "@brief Signal declaration for QCameraFocusControl::customFocusPointChanged(const QPointF &point)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QCameraFocusControl::destroyed(QObject *)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal > ("focusModeChanged(QFlags)", "focusModeChanged", gsi::arg("mode"), "@brief Signal declaration for QCameraFocusControl::focusModeChanged(QFlags mode)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal::target_type & > ("focusPointModeChanged(QCameraFocus::FocusPointMode)", "focusPointModeChanged", gsi::arg("mode"), "@brief Signal declaration for QCameraFocusControl::focusPointModeChanged(QCameraFocus::FocusPointMode mode)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("focusZonesChanged()", "focusZonesChanged", "@brief Signal declaration for QCameraFocusControl::focusZonesChanged()\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QCameraFocusControl::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QCameraFocusControl::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -348,18 +423,6 @@ public: } } - // [emitter impl] void QCameraFocusControl::customFocusPointChanged(const QPointF &point) - void emitter_QCameraFocusControl_customFocusPointChanged_1986(const QPointF &point) - { - emit QCameraFocusControl::customFocusPointChanged(point); - } - - // [emitter impl] void QCameraFocusControl::destroyed(QObject *) - void emitter_QCameraFocusControl_destroyed_1302(QObject *arg1) - { - emit QCameraFocusControl::destroyed(arg1); - } - // [adaptor impl] bool QCameraFocusControl::event(QEvent *) bool cbs_event_1217_0(QEvent *arg1) { @@ -405,12 +468,6 @@ public: } } - // [emitter impl] void QCameraFocusControl::focusModeChanged(QFlags mode) - void emitter_QCameraFocusControl_focusModeChanged_3327(QFlags mode) - { - emit QCameraFocusControl::focusModeChanged(mode); - } - // [adaptor impl] QCameraFocus::FocusPointMode QCameraFocusControl::focusPointMode() qt_gsi::Converter::target_type cbs_focusPointMode_c0_0() const { @@ -426,12 +483,6 @@ public: } } - // [emitter impl] void QCameraFocusControl::focusPointModeChanged(QCameraFocus::FocusPointMode mode) - void emitter_QCameraFocusControl_focusPointModeChanged_3153(QCameraFocus::FocusPointMode mode) - { - emit QCameraFocusControl::focusPointModeChanged(mode); - } - // [adaptor impl] QList QCameraFocusControl::focusZones() QList cbs_focusZones_c0_0() const { @@ -447,12 +498,6 @@ public: } } - // [emitter impl] void QCameraFocusControl::focusZonesChanged() - void emitter_QCameraFocusControl_focusZonesChanged_0() - { - emit QCameraFocusControl::focusZonesChanged(); - } - // [adaptor impl] bool QCameraFocusControl::isFocusModeSupported(QFlags mode) bool cbs_isFocusModeSupported_c3327_0(QFlags mode) const { @@ -693,42 +738,6 @@ static void _set_callback_cbs_customFocusPoint_c0_0 (void *cls, const gsi::Callb } -// emitter void QCameraFocusControl::customFocusPointChanged(const QPointF &point) - -static void _init_emitter_customFocusPointChanged_1986 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("point"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_customFocusPointChanged_1986 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const QPointF &arg1 = gsi::arg_reader() (args, heap); - ((QCameraFocusControl_Adaptor *)cls)->emitter_QCameraFocusControl_customFocusPointChanged_1986 (arg1); -} - - -// emitter void QCameraFocusControl::destroyed(QObject *) - -static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - ((QCameraFocusControl_Adaptor *)cls)->emitter_QCameraFocusControl_destroyed_1302 (arg1); -} - - // void QCameraFocusControl::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -821,24 +830,6 @@ static void _set_callback_cbs_focusMode_c0_0 (void *cls, const gsi::Callback &cb } -// emitter void QCameraFocusControl::focusModeChanged(QFlags mode) - -static void _init_emitter_focusModeChanged_3327 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("mode"); - decl->add_arg > (argspec_0); - decl->set_return (); -} - -static void _call_emitter_focusModeChanged_3327 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QFlags arg1 = gsi::arg_reader >() (args, heap); - ((QCameraFocusControl_Adaptor *)cls)->emitter_QCameraFocusControl_focusModeChanged_3327 (arg1); -} - - // QCameraFocus::FocusPointMode QCameraFocusControl::focusPointMode() static void _init_cbs_focusPointMode_c0_0 (qt_gsi::GenericMethod *decl) @@ -858,24 +849,6 @@ static void _set_callback_cbs_focusPointMode_c0_0 (void *cls, const gsi::Callbac } -// emitter void QCameraFocusControl::focusPointModeChanged(QCameraFocus::FocusPointMode mode) - -static void _init_emitter_focusPointModeChanged_3153 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("mode"); - decl->add_arg::target_type & > (argspec_0); - decl->set_return (); -} - -static void _call_emitter_focusPointModeChanged_3153 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); - ((QCameraFocusControl_Adaptor *)cls)->emitter_QCameraFocusControl_focusPointModeChanged_3153 (arg1); -} - - // QList QCameraFocusControl::focusZones() static void _init_cbs_focusZones_c0_0 (qt_gsi::GenericMethod *decl) @@ -895,20 +868,6 @@ static void _set_callback_cbs_focusZones_c0_0 (void *cls, const gsi::Callback &c } -// emitter void QCameraFocusControl::focusZonesChanged() - -static void _init_emitter_focusZonesChanged_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_focusZonesChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QCameraFocusControl_Adaptor *)cls)->emitter_QCameraFocusControl_focusZonesChanged_0 (); -} - - // bool QCameraFocusControl::isFocusModeSupported(QFlags mode) static void _init_cbs_isFocusModeSupported_c3327_0 (qt_gsi::GenericMethod *decl) @@ -1129,8 +1088,6 @@ static gsi::Methods methods_QCameraFocusControl_Adaptor () { methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("customFocusPoint", "@brief Virtual method QPointF QCameraFocusControl::customFocusPoint()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_customFocusPoint_c0_0, &_call_cbs_customFocusPoint_c0_0); methods += new qt_gsi::GenericMethod ("customFocusPoint", "@hide", true, &_init_cbs_customFocusPoint_c0_0, &_call_cbs_customFocusPoint_c0_0, &_set_callback_cbs_customFocusPoint_c0_0); - methods += new qt_gsi::GenericMethod ("emit_customFocusPointChanged", "@brief Emitter for signal void QCameraFocusControl::customFocusPointChanged(const QPointF &point)\nCall this method to emit this signal.", false, &_init_emitter_customFocusPointChanged_1986, &_call_emitter_customFocusPointChanged_1986); - methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QCameraFocusControl::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QCameraFocusControl::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("event", "@brief Virtual method bool QCameraFocusControl::event(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0); @@ -1139,13 +1096,10 @@ static gsi::Methods methods_QCameraFocusControl_Adaptor () { methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("focusMode", "@brief Virtual method QFlags QCameraFocusControl::focusMode()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_focusMode_c0_0, &_call_cbs_focusMode_c0_0); methods += new qt_gsi::GenericMethod ("focusMode", "@hide", true, &_init_cbs_focusMode_c0_0, &_call_cbs_focusMode_c0_0, &_set_callback_cbs_focusMode_c0_0); - methods += new qt_gsi::GenericMethod ("emit_focusModeChanged", "@brief Emitter for signal void QCameraFocusControl::focusModeChanged(QFlags mode)\nCall this method to emit this signal.", false, &_init_emitter_focusModeChanged_3327, &_call_emitter_focusModeChanged_3327); methods += new qt_gsi::GenericMethod ("focusPointMode", "@brief Virtual method QCameraFocus::FocusPointMode QCameraFocusControl::focusPointMode()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_focusPointMode_c0_0, &_call_cbs_focusPointMode_c0_0); methods += new qt_gsi::GenericMethod ("focusPointMode", "@hide", true, &_init_cbs_focusPointMode_c0_0, &_call_cbs_focusPointMode_c0_0, &_set_callback_cbs_focusPointMode_c0_0); - methods += new qt_gsi::GenericMethod ("emit_focusPointModeChanged", "@brief Emitter for signal void QCameraFocusControl::focusPointModeChanged(QCameraFocus::FocusPointMode mode)\nCall this method to emit this signal.", false, &_init_emitter_focusPointModeChanged_3153, &_call_emitter_focusPointModeChanged_3153); methods += new qt_gsi::GenericMethod ("focusZones", "@brief Virtual method QList QCameraFocusControl::focusZones()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_focusZones_c0_0, &_call_cbs_focusZones_c0_0); methods += new qt_gsi::GenericMethod ("focusZones", "@hide", true, &_init_cbs_focusZones_c0_0, &_call_cbs_focusZones_c0_0, &_set_callback_cbs_focusZones_c0_0); - methods += new qt_gsi::GenericMethod ("emit_focusZonesChanged", "@brief Emitter for signal void QCameraFocusControl::focusZonesChanged()\nCall this method to emit this signal.", false, &_init_emitter_focusZonesChanged_0, &_call_emitter_focusZonesChanged_0); methods += new qt_gsi::GenericMethod ("isFocusModeSupported", "@brief Virtual method bool QCameraFocusControl::isFocusModeSupported(QFlags mode)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_isFocusModeSupported_c3327_0, &_call_cbs_isFocusModeSupported_c3327_0); methods += new qt_gsi::GenericMethod ("isFocusModeSupported", "@hide", true, &_init_cbs_isFocusModeSupported_c3327_0, &_call_cbs_isFocusModeSupported_c3327_0, &_set_callback_cbs_isFocusModeSupported_c3327_0); methods += new qt_gsi::GenericMethod ("isFocusPointModeSupported", "@brief Virtual method bool QCameraFocusControl::isFocusPointModeSupported(QCameraFocus::FocusPointMode mode)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_isFocusPointModeSupported_c3153_0, &_call_cbs_isFocusPointModeSupported_c3153_0); diff --git a/src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraImageCapture.cc b/src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraImageCapture.cc index 1020e8594..1a747a48b 100644 --- a/src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraImageCapture.cc +++ b/src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraImageCapture.cc @@ -90,6 +90,26 @@ static void _call_f_bufferFormat_c0 (const qt_gsi::GenericMethod * /*decl*/, voi } +// void QCameraImageCapture::bufferFormatChanged(QVideoFrame::PixelFormat) + + +static void _init_f_bufferFormatChanged_2758 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("arg1"); + decl->add_arg::target_type & > (argspec_0); + decl->set_return (); +} + +static void _call_f_bufferFormatChanged_2758 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QCameraImageCapture *)cls)->bufferFormatChanged (qt_gsi::QtToCppAdaptor(arg1).cref()); +} + + // void QCameraImageCapture::cancelCapture() @@ -140,6 +160,26 @@ static void _call_f_captureDestination_c0 (const qt_gsi::GenericMethod * /*decl* } +// void QCameraImageCapture::captureDestinationChanged(QFlags) + + +static void _init_f_captureDestinationChanged_4999 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("arg1"); + decl->add_arg > (argspec_0); + decl->set_return (); +} + +static void _call_f_captureDestinationChanged_4999 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + QFlags arg1 = gsi::arg_reader >() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QCameraImageCapture *)cls)->captureDestinationChanged (arg1); +} + + // QImageEncoderSettings QCameraImageCapture::encodingSettings() @@ -170,6 +210,32 @@ static void _call_f_error_c0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, } +// void QCameraImageCapture::error(int id, QCameraImageCapture::Error error, const QString &errorString) + + +static void _init_f_error_5523 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("id"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("error"); + decl->add_arg::target_type & > (argspec_1); + static gsi::ArgSpecBase argspec_2 ("errorString"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_f_error_5523 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + int arg1 = gsi::arg_reader() (args, heap); + const qt_gsi::Converter::target_type & arg2 = gsi::arg_reader::target_type & >() (args, heap); + const QString &arg3 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QCameraImageCapture *)cls)->error (arg1, qt_gsi::QtToCppAdaptor(arg2).cref(), arg3); +} + + // QString QCameraImageCapture::errorString() @@ -185,6 +251,52 @@ static void _call_f_errorString_c0 (const qt_gsi::GenericMethod * /*decl*/, void } +// void QCameraImageCapture::imageAvailable(int id, const QVideoFrame &image) + + +static void _init_f_imageAvailable_3047 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("id"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("image"); + decl->add_arg (argspec_1); + decl->set_return (); +} + +static void _call_f_imageAvailable_3047 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + int arg1 = gsi::arg_reader() (args, heap); + const QVideoFrame &arg2 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QCameraImageCapture *)cls)->imageAvailable (arg1, arg2); +} + + +// void QCameraImageCapture::imageCaptured(int id, const QImage &preview) + + +static void _init_f_imageCaptured_2536 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("id"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("preview"); + decl->add_arg (argspec_1); + decl->set_return (); +} + +static void _call_f_imageCaptured_2536 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + int arg1 = gsi::arg_reader() (args, heap); + const QImage &arg2 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QCameraImageCapture *)cls)->imageCaptured (arg1, arg2); +} + + // QString QCameraImageCapture::imageCodecDescription(const QString &codecName) @@ -204,6 +316,75 @@ static void _call_f_imageCodecDescription_c2025 (const qt_gsi::GenericMethod * / } +// void QCameraImageCapture::imageExposed(int id) + + +static void _init_f_imageExposed_767 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("id"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_imageExposed_767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + int arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QCameraImageCapture *)cls)->imageExposed (arg1); +} + + +// void QCameraImageCapture::imageMetadataAvailable(int id, const QString &key, const QVariant &value) + + +static void _init_f_imageMetadataAvailable_4695 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("id"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("key"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("value"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_f_imageMetadataAvailable_4695 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + int arg1 = gsi::arg_reader() (args, heap); + const QString &arg2 = gsi::arg_reader() (args, heap); + const QVariant &arg3 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QCameraImageCapture *)cls)->imageMetadataAvailable (arg1, arg2, arg3); +} + + +// void QCameraImageCapture::imageSaved(int id, const QString &fileName) + + +static void _init_f_imageSaved_2684 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("id"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("fileName"); + decl->add_arg (argspec_1); + decl->set_return (); +} + +static void _call_f_imageSaved_2684 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + int arg1 = gsi::arg_reader() (args, heap); + const QString &arg2 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QCameraImageCapture *)cls)->imageSaved (arg1, arg2); +} + + // bool QCameraImageCapture::isAvailable() @@ -268,6 +449,26 @@ static void _call_f_mediaObject_c0 (const qt_gsi::GenericMethod * /*decl*/, void } +// void QCameraImageCapture::readyForCaptureChanged(bool) + + +static void _init_f_readyForCaptureChanged_864 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("arg1"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_readyForCaptureChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + bool arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QCameraImageCapture *)cls)->readyForCaptureChanged (arg1); +} + + // void QCameraImageCapture::setBufferFormat(const QVideoFrame::PixelFormat format) @@ -483,33 +684,32 @@ static gsi::Methods methods_QCameraImageCapture () { methods += new qt_gsi::GenericStaticMethod ("staticMetaObject", "@brief Obtains the static MetaObject for this class.", &_init_smo, &_call_smo); methods += new qt_gsi::GenericMethod ("availability", "@brief Method QMultimedia::AvailabilityStatus QCameraImageCapture::availability()\n", true, &_init_f_availability_c0, &_call_f_availability_c0); methods += new qt_gsi::GenericMethod (":bufferFormat", "@brief Method QVideoFrame::PixelFormat QCameraImageCapture::bufferFormat()\n", true, &_init_f_bufferFormat_c0, &_call_f_bufferFormat_c0); + methods += new qt_gsi::GenericMethod ("bufferFormatChanged", "@brief Method void QCameraImageCapture::bufferFormatChanged(QVideoFrame::PixelFormat)\n", false, &_init_f_bufferFormatChanged_2758, &_call_f_bufferFormatChanged_2758); methods += new qt_gsi::GenericMethod ("cancelCapture", "@brief Method void QCameraImageCapture::cancelCapture()\n", false, &_init_f_cancelCapture_0, &_call_f_cancelCapture_0); methods += new qt_gsi::GenericMethod ("capture", "@brief Method int QCameraImageCapture::capture(const QString &location)\n", false, &_init_f_capture_2025, &_call_f_capture_2025); methods += new qt_gsi::GenericMethod (":captureDestination", "@brief Method QFlags QCameraImageCapture::captureDestination()\n", true, &_init_f_captureDestination_c0, &_call_f_captureDestination_c0); + methods += new qt_gsi::GenericMethod ("captureDestinationChanged", "@brief Method void QCameraImageCapture::captureDestinationChanged(QFlags)\n", false, &_init_f_captureDestinationChanged_4999, &_call_f_captureDestinationChanged_4999); methods += new qt_gsi::GenericMethod (":encodingSettings", "@brief Method QImageEncoderSettings QCameraImageCapture::encodingSettings()\n", true, &_init_f_encodingSettings_c0, &_call_f_encodingSettings_c0); methods += new qt_gsi::GenericMethod ("error", "@brief Method QCameraImageCapture::Error QCameraImageCapture::error()\n", true, &_init_f_error_c0, &_call_f_error_c0); + methods += new qt_gsi::GenericMethod ("error_sig", "@brief Method void QCameraImageCapture::error(int id, QCameraImageCapture::Error error, const QString &errorString)\n", false, &_init_f_error_5523, &_call_f_error_5523); methods += new qt_gsi::GenericMethod ("errorString", "@brief Method QString QCameraImageCapture::errorString()\n", true, &_init_f_errorString_c0, &_call_f_errorString_c0); + methods += new qt_gsi::GenericMethod ("imageAvailable", "@brief Method void QCameraImageCapture::imageAvailable(int id, const QVideoFrame &image)\n", false, &_init_f_imageAvailable_3047, &_call_f_imageAvailable_3047); + methods += new qt_gsi::GenericMethod ("imageCaptured", "@brief Method void QCameraImageCapture::imageCaptured(int id, const QImage &preview)\n", false, &_init_f_imageCaptured_2536, &_call_f_imageCaptured_2536); methods += new qt_gsi::GenericMethod ("imageCodecDescription", "@brief Method QString QCameraImageCapture::imageCodecDescription(const QString &codecName)\n", true, &_init_f_imageCodecDescription_c2025, &_call_f_imageCodecDescription_c2025); + methods += new qt_gsi::GenericMethod ("imageExposed", "@brief Method void QCameraImageCapture::imageExposed(int id)\n", false, &_init_f_imageExposed_767, &_call_f_imageExposed_767); + methods += new qt_gsi::GenericMethod ("imageMetadataAvailable", "@brief Method void QCameraImageCapture::imageMetadataAvailable(int id, const QString &key, const QVariant &value)\n", false, &_init_f_imageMetadataAvailable_4695, &_call_f_imageMetadataAvailable_4695); + methods += new qt_gsi::GenericMethod ("imageSaved", "@brief Method void QCameraImageCapture::imageSaved(int id, const QString &fileName)\n", false, &_init_f_imageSaved_2684, &_call_f_imageSaved_2684); methods += new qt_gsi::GenericMethod ("isAvailable?", "@brief Method bool QCameraImageCapture::isAvailable()\n", true, &_init_f_isAvailable_c0, &_call_f_isAvailable_c0); methods += new qt_gsi::GenericMethod ("isCaptureDestinationSupported?", "@brief Method bool QCameraImageCapture::isCaptureDestinationSupported(QFlags destination)\n", true, &_init_f_isCaptureDestinationSupported_c4999, &_call_f_isCaptureDestinationSupported_c4999); methods += new qt_gsi::GenericMethod ("isReadyForCapture?|:readyForCapture", "@brief Method bool QCameraImageCapture::isReadyForCapture()\n", true, &_init_f_isReadyForCapture_c0, &_call_f_isReadyForCapture_c0); methods += new qt_gsi::GenericMethod ("mediaObject", "@brief Method QMediaObject *QCameraImageCapture::mediaObject()\nThis is a reimplementation of QMediaBindableInterface::mediaObject", true, &_init_f_mediaObject_c0, &_call_f_mediaObject_c0); + methods += new qt_gsi::GenericMethod ("readyForCaptureChanged", "@brief Method void QCameraImageCapture::readyForCaptureChanged(bool)\n", false, &_init_f_readyForCaptureChanged_864, &_call_f_readyForCaptureChanged_864); methods += new qt_gsi::GenericMethod ("setBufferFormat|bufferFormat=", "@brief Method void QCameraImageCapture::setBufferFormat(const QVideoFrame::PixelFormat format)\n", false, &_init_f_setBufferFormat_3453, &_call_f_setBufferFormat_3453); methods += new qt_gsi::GenericMethod ("setCaptureDestination|captureDestination=", "@brief Method void QCameraImageCapture::setCaptureDestination(QFlags destination)\n", false, &_init_f_setCaptureDestination_4999, &_call_f_setCaptureDestination_4999); methods += new qt_gsi::GenericMethod ("setEncodingSettings|encodingSettings=", "@brief Method void QCameraImageCapture::setEncodingSettings(const QImageEncoderSettings &settings)\n", false, &_init_f_setEncodingSettings_3430, &_call_f_setEncodingSettings_3430); methods += new qt_gsi::GenericMethod ("supportedBufferFormats", "@brief Method QList QCameraImageCapture::supportedBufferFormats()\n", true, &_init_f_supportedBufferFormats_c0, &_call_f_supportedBufferFormats_c0); methods += new qt_gsi::GenericMethod ("supportedImageCodecs", "@brief Method QStringList QCameraImageCapture::supportedImageCodecs()\n", true, &_init_f_supportedImageCodecs_c0, &_call_f_supportedImageCodecs_c0); methods += new qt_gsi::GenericMethod ("supportedResolutions", "@brief Method QList QCameraImageCapture::supportedResolutions(const QImageEncoderSettings &settings, bool *continuous)\n", true, &_init_f_supportedResolutions_c4372, &_call_f_supportedResolutions_c4372); - methods += gsi::qt_signal::target_type & > ("bufferFormatChanged(QVideoFrame::PixelFormat)", "bufferFormatChanged", gsi::arg("arg1"), "@brief Signal declaration for QCameraImageCapture::bufferFormatChanged(QVideoFrame::PixelFormat)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal > ("captureDestinationChanged(QFlags)", "captureDestinationChanged", gsi::arg("arg1"), "@brief Signal declaration for QCameraImageCapture::captureDestinationChanged(QFlags)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QCameraImageCapture::destroyed(QObject *)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal::target_type &, const QString & > ("error(int, QCameraImageCapture::Error, const QString &)", "error_sig", gsi::arg("id"), gsi::arg("error"), gsi::arg("errorString"), "@brief Signal declaration for QCameraImageCapture::error(int id, QCameraImageCapture::Error error, const QString &errorString)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("imageAvailable(int, const QVideoFrame &)", "imageAvailable", gsi::arg("id"), gsi::arg("image"), "@brief Signal declaration for QCameraImageCapture::imageAvailable(int id, const QVideoFrame &image)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("imageCaptured(int, const QImage &)", "imageCaptured", gsi::arg("id"), gsi::arg("preview"), "@brief Signal declaration for QCameraImageCapture::imageCaptured(int id, const QImage &preview)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("imageExposed(int)", "imageExposed", gsi::arg("id"), "@brief Signal declaration for QCameraImageCapture::imageExposed(int id)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("imageMetadataAvailable(int, const QString &, const QVariant &)", "imageMetadataAvailable", gsi::arg("id"), gsi::arg("key"), gsi::arg("value"), "@brief Signal declaration for QCameraImageCapture::imageMetadataAvailable(int id, const QString &key, const QVariant &value)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("imageSaved(int, const QString &)", "imageSaved", gsi::arg("id"), gsi::arg("fileName"), "@brief Signal declaration for QCameraImageCapture::imageSaved(int id, const QString &fileName)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("readyForCaptureChanged(bool)", "readyForCaptureChanged", gsi::arg("arg1"), "@brief Signal declaration for QCameraImageCapture::readyForCaptureChanged(bool)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QCameraImageCapture::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QCameraImageCapture::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); methods += new qt_gsi::GenericMethod ("asQObject", "@brief Delivers the base class interface QObject of QCameraImageCapture\nClass QCameraImageCapture is derived from multiple base classes. This method delivers the QObject base class aspect.", false, &_init_f_QCameraImageCapture_as_QObject, &_call_f_QCameraImageCapture_as_QObject); @@ -568,30 +768,6 @@ public: return QCameraImageCapture::senderSignalIndex(); } - // [emitter impl] void QCameraImageCapture::bufferFormatChanged(QVideoFrame::PixelFormat) - void emitter_QCameraImageCapture_bufferFormatChanged_2758(QVideoFrame::PixelFormat arg1) - { - emit QCameraImageCapture::bufferFormatChanged(arg1); - } - - // [emitter impl] void QCameraImageCapture::captureDestinationChanged(QFlags) - void emitter_QCameraImageCapture_captureDestinationChanged_4999(QFlags arg1) - { - emit QCameraImageCapture::captureDestinationChanged(arg1); - } - - // [emitter impl] void QCameraImageCapture::destroyed(QObject *) - void emitter_QCameraImageCapture_destroyed_1302(QObject *arg1) - { - emit QCameraImageCapture::destroyed(arg1); - } - - // [emitter impl] void QCameraImageCapture::error(int id, QCameraImageCapture::Error error, const QString &errorString) - void emitter_QCameraImageCapture_error_5523(int id, QCameraImageCapture::Error _error, const QString &errorString) - { - emit QCameraImageCapture::error(id, _error, errorString); - } - // [adaptor impl] bool QCameraImageCapture::event(QEvent *) bool cbs_event_1217_0(QEvent *arg1) { @@ -622,36 +798,6 @@ public: } } - // [emitter impl] void QCameraImageCapture::imageAvailable(int id, const QVideoFrame &image) - void emitter_QCameraImageCapture_imageAvailable_3047(int id, const QVideoFrame &image) - { - emit QCameraImageCapture::imageAvailable(id, image); - } - - // [emitter impl] void QCameraImageCapture::imageCaptured(int id, const QImage &preview) - void emitter_QCameraImageCapture_imageCaptured_2536(int id, const QImage &preview) - { - emit QCameraImageCapture::imageCaptured(id, preview); - } - - // [emitter impl] void QCameraImageCapture::imageExposed(int id) - void emitter_QCameraImageCapture_imageExposed_767(int id) - { - emit QCameraImageCapture::imageExposed(id); - } - - // [emitter impl] void QCameraImageCapture::imageMetadataAvailable(int id, const QString &key, const QVariant &value) - void emitter_QCameraImageCapture_imageMetadataAvailable_4695(int id, const QString &key, const QVariant &value) - { - emit QCameraImageCapture::imageMetadataAvailable(id, key, value); - } - - // [emitter impl] void QCameraImageCapture::imageSaved(int id, const QString &fileName) - void emitter_QCameraImageCapture_imageSaved_2684(int id, const QString &fileName) - { - emit QCameraImageCapture::imageSaved(id, fileName); - } - // [adaptor impl] QMediaObject *QCameraImageCapture::mediaObject() QMediaObject * cbs_mediaObject_c0_0() const { @@ -667,12 +813,6 @@ public: } } - // [emitter impl] void QCameraImageCapture::readyForCaptureChanged(bool) - void emitter_QCameraImageCapture_readyForCaptureChanged_864(bool arg1) - { - emit QCameraImageCapture::readyForCaptureChanged(arg1); - } - // [adaptor impl] void QCameraImageCapture::childEvent(QChildEvent *) void cbs_childEvent_1701_0(QChildEvent *arg1) { @@ -781,42 +921,6 @@ static void _call_ctor_QCameraImageCapture_Adaptor_2976 (const qt_gsi::GenericSt } -// emitter void QCameraImageCapture::bufferFormatChanged(QVideoFrame::PixelFormat) - -static void _init_emitter_bufferFormatChanged_2758 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1"); - decl->add_arg::target_type & > (argspec_0); - decl->set_return (); -} - -static void _call_emitter_bufferFormatChanged_2758 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); - ((QCameraImageCapture_Adaptor *)cls)->emitter_QCameraImageCapture_bufferFormatChanged_2758 (arg1); -} - - -// emitter void QCameraImageCapture::captureDestinationChanged(QFlags) - -static void _init_emitter_captureDestinationChanged_4999 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1"); - decl->add_arg > (argspec_0); - decl->set_return (); -} - -static void _call_emitter_captureDestinationChanged_4999 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QFlags arg1 = gsi::arg_reader >() (args, heap); - ((QCameraImageCapture_Adaptor *)cls)->emitter_QCameraImageCapture_captureDestinationChanged_4999 (arg1); -} - - // void QCameraImageCapture::childEvent(QChildEvent *) static void _init_cbs_childEvent_1701_0 (qt_gsi::GenericMethod *decl) @@ -865,24 +969,6 @@ static void _set_callback_cbs_customEvent_1217_0 (void *cls, const gsi::Callback } -// emitter void QCameraImageCapture::destroyed(QObject *) - -static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - ((QCameraImageCapture_Adaptor *)cls)->emitter_QCameraImageCapture_destroyed_1302 (arg1); -} - - // void QCameraImageCapture::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -907,30 +993,6 @@ static void _set_callback_cbs_disconnectNotify_2394_0 (void *cls, const gsi::Cal } -// emitter void QCameraImageCapture::error(int id, QCameraImageCapture::Error error, const QString &errorString) - -static void _init_emitter_error_5523 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("id"); - decl->add_arg (argspec_0); - static gsi::ArgSpecBase argspec_1 ("error"); - decl->add_arg::target_type & > (argspec_1); - static gsi::ArgSpecBase argspec_2 ("errorString"); - decl->add_arg (argspec_2); - decl->set_return (); -} - -static void _call_emitter_error_5523 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - int arg1 = gsi::arg_reader() (args, heap); - const qt_gsi::Converter::target_type & arg2 = gsi::arg_reader::target_type & >() (args, heap); - const QString &arg3 = gsi::arg_reader() (args, heap); - ((QCameraImageCapture_Adaptor *)cls)->emitter_QCameraImageCapture_error_5523 (arg1, arg2, arg3); -} - - // bool QCameraImageCapture::event(QEvent *) static void _init_cbs_event_1217_0 (qt_gsi::GenericMethod *decl) @@ -980,111 +1042,6 @@ static void _set_callback_cbs_eventFilter_2411_0 (void *cls, const gsi::Callback } -// emitter void QCameraImageCapture::imageAvailable(int id, const QVideoFrame &image) - -static void _init_emitter_imageAvailable_3047 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("id"); - decl->add_arg (argspec_0); - static gsi::ArgSpecBase argspec_1 ("image"); - decl->add_arg (argspec_1); - decl->set_return (); -} - -static void _call_emitter_imageAvailable_3047 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - int arg1 = gsi::arg_reader() (args, heap); - const QVideoFrame &arg2 = gsi::arg_reader() (args, heap); - ((QCameraImageCapture_Adaptor *)cls)->emitter_QCameraImageCapture_imageAvailable_3047 (arg1, arg2); -} - - -// emitter void QCameraImageCapture::imageCaptured(int id, const QImage &preview) - -static void _init_emitter_imageCaptured_2536 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("id"); - decl->add_arg (argspec_0); - static gsi::ArgSpecBase argspec_1 ("preview"); - decl->add_arg (argspec_1); - decl->set_return (); -} - -static void _call_emitter_imageCaptured_2536 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - int arg1 = gsi::arg_reader() (args, heap); - const QImage &arg2 = gsi::arg_reader() (args, heap); - ((QCameraImageCapture_Adaptor *)cls)->emitter_QCameraImageCapture_imageCaptured_2536 (arg1, arg2); -} - - -// emitter void QCameraImageCapture::imageExposed(int id) - -static void _init_emitter_imageExposed_767 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("id"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_imageExposed_767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - int arg1 = gsi::arg_reader() (args, heap); - ((QCameraImageCapture_Adaptor *)cls)->emitter_QCameraImageCapture_imageExposed_767 (arg1); -} - - -// emitter void QCameraImageCapture::imageMetadataAvailable(int id, const QString &key, const QVariant &value) - -static void _init_emitter_imageMetadataAvailable_4695 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("id"); - decl->add_arg (argspec_0); - static gsi::ArgSpecBase argspec_1 ("key"); - decl->add_arg (argspec_1); - static gsi::ArgSpecBase argspec_2 ("value"); - decl->add_arg (argspec_2); - decl->set_return (); -} - -static void _call_emitter_imageMetadataAvailable_4695 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - int arg1 = gsi::arg_reader() (args, heap); - const QString &arg2 = gsi::arg_reader() (args, heap); - const QVariant &arg3 = gsi::arg_reader() (args, heap); - ((QCameraImageCapture_Adaptor *)cls)->emitter_QCameraImageCapture_imageMetadataAvailable_4695 (arg1, arg2, arg3); -} - - -// emitter void QCameraImageCapture::imageSaved(int id, const QString &fileName) - -static void _init_emitter_imageSaved_2684 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("id"); - decl->add_arg (argspec_0); - static gsi::ArgSpecBase argspec_1 ("fileName"); - decl->add_arg (argspec_1); - decl->set_return (); -} - -static void _call_emitter_imageSaved_2684 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - int arg1 = gsi::arg_reader() (args, heap); - const QString &arg2 = gsi::arg_reader() (args, heap); - ((QCameraImageCapture_Adaptor *)cls)->emitter_QCameraImageCapture_imageSaved_2684 (arg1, arg2); -} - - // exposed bool QCameraImageCapture::isSignalConnected(const QMetaMethod &signal) static void _init_fp_isSignalConnected_c2394 (qt_gsi::GenericMethod *decl) @@ -1122,24 +1079,6 @@ static void _set_callback_cbs_mediaObject_c0_0 (void *cls, const gsi::Callback & } -// emitter void QCameraImageCapture::readyForCaptureChanged(bool) - -static void _init_emitter_readyForCaptureChanged_864 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_readyForCaptureChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - bool arg1 = gsi::arg_reader() (args, heap); - ((QCameraImageCapture_Adaptor *)cls)->emitter_QCameraImageCapture_readyForCaptureChanged_864 (arg1); -} - - // exposed int QCameraImageCapture::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -1241,29 +1180,19 @@ gsi::Class &qtdecl_QCameraImageCapture (); static gsi::Methods methods_QCameraImageCapture_Adaptor () { gsi::Methods methods; methods += new qt_gsi::GenericStaticMethod ("new", "@brief Constructor QCameraImageCapture::QCameraImageCapture(QMediaObject *mediaObject, QObject *parent)\nThis method creates an object of class QCameraImageCapture.", &_init_ctor_QCameraImageCapture_Adaptor_2976, &_call_ctor_QCameraImageCapture_Adaptor_2976); - methods += new qt_gsi::GenericMethod ("emit_bufferFormatChanged", "@brief Emitter for signal void QCameraImageCapture::bufferFormatChanged(QVideoFrame::PixelFormat)\nCall this method to emit this signal.", false, &_init_emitter_bufferFormatChanged_2758, &_call_emitter_bufferFormatChanged_2758); - methods += new qt_gsi::GenericMethod ("emit_captureDestinationChanged", "@brief Emitter for signal void QCameraImageCapture::captureDestinationChanged(QFlags)\nCall this method to emit this signal.", false, &_init_emitter_captureDestinationChanged_4999, &_call_emitter_captureDestinationChanged_4999); methods += new qt_gsi::GenericMethod ("*childEvent", "@brief Virtual method void QCameraImageCapture::childEvent(QChildEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QCameraImageCapture::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); - methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QCameraImageCapture::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QCameraImageCapture::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); - methods += new qt_gsi::GenericMethod ("emit_error_sig", "@brief Emitter for signal void QCameraImageCapture::error(int id, QCameraImageCapture::Error error, const QString &errorString)\nCall this method to emit this signal.", false, &_init_emitter_error_5523, &_call_emitter_error_5523); methods += new qt_gsi::GenericMethod ("event", "@brief Virtual method bool QCameraImageCapture::event(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0); methods += new qt_gsi::GenericMethod ("event", "@hide", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0, &_set_callback_cbs_event_1217_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QCameraImageCapture::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); - methods += new qt_gsi::GenericMethod ("emit_imageAvailable", "@brief Emitter for signal void QCameraImageCapture::imageAvailable(int id, const QVideoFrame &image)\nCall this method to emit this signal.", false, &_init_emitter_imageAvailable_3047, &_call_emitter_imageAvailable_3047); - methods += new qt_gsi::GenericMethod ("emit_imageCaptured", "@brief Emitter for signal void QCameraImageCapture::imageCaptured(int id, const QImage &preview)\nCall this method to emit this signal.", false, &_init_emitter_imageCaptured_2536, &_call_emitter_imageCaptured_2536); - methods += new qt_gsi::GenericMethod ("emit_imageExposed", "@brief Emitter for signal void QCameraImageCapture::imageExposed(int id)\nCall this method to emit this signal.", false, &_init_emitter_imageExposed_767, &_call_emitter_imageExposed_767); - methods += new qt_gsi::GenericMethod ("emit_imageMetadataAvailable", "@brief Emitter for signal void QCameraImageCapture::imageMetadataAvailable(int id, const QString &key, const QVariant &value)\nCall this method to emit this signal.", false, &_init_emitter_imageMetadataAvailable_4695, &_call_emitter_imageMetadataAvailable_4695); - methods += new qt_gsi::GenericMethod ("emit_imageSaved", "@brief Emitter for signal void QCameraImageCapture::imageSaved(int id, const QString &fileName)\nCall this method to emit this signal.", false, &_init_emitter_imageSaved_2684, &_call_emitter_imageSaved_2684); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QCameraImageCapture::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); methods += new qt_gsi::GenericMethod ("mediaObject", "@brief Virtual method QMediaObject *QCameraImageCapture::mediaObject()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_mediaObject_c0_0, &_call_cbs_mediaObject_c0_0); methods += new qt_gsi::GenericMethod ("mediaObject", "@hide", true, &_init_cbs_mediaObject_c0_0, &_call_cbs_mediaObject_c0_0, &_set_callback_cbs_mediaObject_c0_0); - methods += new qt_gsi::GenericMethod ("emit_readyForCaptureChanged", "@brief Emitter for signal void QCameraImageCapture::readyForCaptureChanged(bool)\nCall this method to emit this signal.", false, &_init_emitter_readyForCaptureChanged_864, &_call_emitter_readyForCaptureChanged_864); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QCameraImageCapture::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QCameraImageCapture::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QCameraImageCapture::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); diff --git a/src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraImageCaptureControl.cc b/src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraImageCaptureControl.cc index b37f0363a..c08ba67d0 100644 --- a/src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraImageCaptureControl.cc +++ b/src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraImageCaptureControl.cc @@ -107,6 +107,147 @@ static void _call_f_driveMode_c0 (const qt_gsi::GenericMethod * /*decl*/, void * } +// void QCameraImageCaptureControl::error(int id, int error, const QString &errorString) + + +static void _init_f_error_3343 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("id"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("error"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("errorString"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_f_error_3343 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + int arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + const QString &arg3 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QCameraImageCaptureControl *)cls)->error (arg1, arg2, arg3); +} + + +// void QCameraImageCaptureControl::imageAvailable(int id, const QVideoFrame &buffer) + + +static void _init_f_imageAvailable_3047 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("id"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("buffer"); + decl->add_arg (argspec_1); + decl->set_return (); +} + +static void _call_f_imageAvailable_3047 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + int arg1 = gsi::arg_reader() (args, heap); + const QVideoFrame &arg2 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QCameraImageCaptureControl *)cls)->imageAvailable (arg1, arg2); +} + + +// void QCameraImageCaptureControl::imageCaptured(int id, const QImage &preview) + + +static void _init_f_imageCaptured_2536 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("id"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("preview"); + decl->add_arg (argspec_1); + decl->set_return (); +} + +static void _call_f_imageCaptured_2536 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + int arg1 = gsi::arg_reader() (args, heap); + const QImage &arg2 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QCameraImageCaptureControl *)cls)->imageCaptured (arg1, arg2); +} + + +// void QCameraImageCaptureControl::imageExposed(int id) + + +static void _init_f_imageExposed_767 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("id"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_imageExposed_767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + int arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QCameraImageCaptureControl *)cls)->imageExposed (arg1); +} + + +// void QCameraImageCaptureControl::imageMetadataAvailable(int id, const QString &key, const QVariant &value) + + +static void _init_f_imageMetadataAvailable_4695 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("id"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("key"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("value"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_f_imageMetadataAvailable_4695 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + int arg1 = gsi::arg_reader() (args, heap); + const QString &arg2 = gsi::arg_reader() (args, heap); + const QVariant &arg3 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QCameraImageCaptureControl *)cls)->imageMetadataAvailable (arg1, arg2, arg3); +} + + +// void QCameraImageCaptureControl::imageSaved(int id, const QString &fileName) + + +static void _init_f_imageSaved_2684 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("id"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("fileName"); + decl->add_arg (argspec_1); + decl->set_return (); +} + +static void _call_f_imageSaved_2684 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + int arg1 = gsi::arg_reader() (args, heap); + const QString &arg2 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QCameraImageCaptureControl *)cls)->imageSaved (arg1, arg2); +} + + // bool QCameraImageCaptureControl::isReadyForCapture() @@ -122,6 +263,26 @@ static void _call_f_isReadyForCapture_c0 (const qt_gsi::GenericMethod * /*decl*/ } +// void QCameraImageCaptureControl::readyForCaptureChanged(bool) + + +static void _init_f_readyForCaptureChanged_864 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("arg1"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_readyForCaptureChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + bool arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QCameraImageCaptureControl *)cls)->readyForCaptureChanged (arg1); +} + + // void QCameraImageCaptureControl::setDriveMode(QCameraImageCapture::DriveMode mode) @@ -201,16 +362,15 @@ static gsi::Methods methods_QCameraImageCaptureControl () { methods += new qt_gsi::GenericMethod ("cancelCapture", "@brief Method void QCameraImageCaptureControl::cancelCapture()\n", false, &_init_f_cancelCapture_0, &_call_f_cancelCapture_0); methods += new qt_gsi::GenericMethod ("capture", "@brief Method int QCameraImageCaptureControl::capture(const QString &fileName)\n", false, &_init_f_capture_2025, &_call_f_capture_2025); methods += new qt_gsi::GenericMethod (":driveMode", "@brief Method QCameraImageCapture::DriveMode QCameraImageCaptureControl::driveMode()\n", true, &_init_f_driveMode_c0, &_call_f_driveMode_c0); + methods += new qt_gsi::GenericMethod ("error", "@brief Method void QCameraImageCaptureControl::error(int id, int error, const QString &errorString)\n", false, &_init_f_error_3343, &_call_f_error_3343); + methods += new qt_gsi::GenericMethod ("imageAvailable", "@brief Method void QCameraImageCaptureControl::imageAvailable(int id, const QVideoFrame &buffer)\n", false, &_init_f_imageAvailable_3047, &_call_f_imageAvailable_3047); + methods += new qt_gsi::GenericMethod ("imageCaptured", "@brief Method void QCameraImageCaptureControl::imageCaptured(int id, const QImage &preview)\n", false, &_init_f_imageCaptured_2536, &_call_f_imageCaptured_2536); + methods += new qt_gsi::GenericMethod ("imageExposed", "@brief Method void QCameraImageCaptureControl::imageExposed(int id)\n", false, &_init_f_imageExposed_767, &_call_f_imageExposed_767); + methods += new qt_gsi::GenericMethod ("imageMetadataAvailable", "@brief Method void QCameraImageCaptureControl::imageMetadataAvailable(int id, const QString &key, const QVariant &value)\n", false, &_init_f_imageMetadataAvailable_4695, &_call_f_imageMetadataAvailable_4695); + methods += new qt_gsi::GenericMethod ("imageSaved", "@brief Method void QCameraImageCaptureControl::imageSaved(int id, const QString &fileName)\n", false, &_init_f_imageSaved_2684, &_call_f_imageSaved_2684); methods += new qt_gsi::GenericMethod ("isReadyForCapture?", "@brief Method bool QCameraImageCaptureControl::isReadyForCapture()\n", true, &_init_f_isReadyForCapture_c0, &_call_f_isReadyForCapture_c0); + methods += new qt_gsi::GenericMethod ("readyForCaptureChanged", "@brief Method void QCameraImageCaptureControl::readyForCaptureChanged(bool)\n", false, &_init_f_readyForCaptureChanged_864, &_call_f_readyForCaptureChanged_864); methods += new qt_gsi::GenericMethod ("setDriveMode|driveMode=", "@brief Method void QCameraImageCaptureControl::setDriveMode(QCameraImageCapture::DriveMode mode)\n", false, &_init_f_setDriveMode_3320, &_call_f_setDriveMode_3320); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QCameraImageCaptureControl::destroyed(QObject *)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("error(int, int, const QString &)", "error", gsi::arg("id"), gsi::arg("error"), gsi::arg("errorString"), "@brief Signal declaration for QCameraImageCaptureControl::error(int id, int error, const QString &errorString)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("imageAvailable(int, const QVideoFrame &)", "imageAvailable", gsi::arg("id"), gsi::arg("buffer"), "@brief Signal declaration for QCameraImageCaptureControl::imageAvailable(int id, const QVideoFrame &buffer)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("imageCaptured(int, const QImage &)", "imageCaptured", gsi::arg("id"), gsi::arg("preview"), "@brief Signal declaration for QCameraImageCaptureControl::imageCaptured(int id, const QImage &preview)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("imageExposed(int)", "imageExposed", gsi::arg("id"), "@brief Signal declaration for QCameraImageCaptureControl::imageExposed(int id)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("imageMetadataAvailable(int, const QString &, const QVariant &)", "imageMetadataAvailable", gsi::arg("id"), gsi::arg("key"), gsi::arg("value"), "@brief Signal declaration for QCameraImageCaptureControl::imageMetadataAvailable(int id, const QString &key, const QVariant &value)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("imageSaved(int, const QString &)", "imageSaved", gsi::arg("id"), gsi::arg("fileName"), "@brief Signal declaration for QCameraImageCaptureControl::imageSaved(int id, const QString &fileName)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("readyForCaptureChanged(bool)", "readyForCaptureChanged", gsi::arg("arg1"), "@brief Signal declaration for QCameraImageCaptureControl::readyForCaptureChanged(bool)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QCameraImageCaptureControl::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QCameraImageCaptureControl::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -290,12 +450,6 @@ public: } } - // [emitter impl] void QCameraImageCaptureControl::destroyed(QObject *) - void emitter_QCameraImageCaptureControl_destroyed_1302(QObject *arg1) - { - emit QCameraImageCaptureControl::destroyed(arg1); - } - // [adaptor impl] QCameraImageCapture::DriveMode QCameraImageCaptureControl::driveMode() qt_gsi::Converter::target_type cbs_driveMode_c0_0() const { @@ -311,12 +465,6 @@ public: } } - // [emitter impl] void QCameraImageCaptureControl::error(int id, int error, const QString &errorString) - void emitter_QCameraImageCaptureControl_error_3343(int id, int _error, const QString &errorString) - { - emit QCameraImageCaptureControl::error(id, _error, errorString); - } - // [adaptor impl] bool QCameraImageCaptureControl::event(QEvent *) bool cbs_event_1217_0(QEvent *arg1) { @@ -347,36 +495,6 @@ public: } } - // [emitter impl] void QCameraImageCaptureControl::imageAvailable(int id, const QVideoFrame &buffer) - void emitter_QCameraImageCaptureControl_imageAvailable_3047(int id, const QVideoFrame &buffer) - { - emit QCameraImageCaptureControl::imageAvailable(id, buffer); - } - - // [emitter impl] void QCameraImageCaptureControl::imageCaptured(int id, const QImage &preview) - void emitter_QCameraImageCaptureControl_imageCaptured_2536(int id, const QImage &preview) - { - emit QCameraImageCaptureControl::imageCaptured(id, preview); - } - - // [emitter impl] void QCameraImageCaptureControl::imageExposed(int id) - void emitter_QCameraImageCaptureControl_imageExposed_767(int id) - { - emit QCameraImageCaptureControl::imageExposed(id); - } - - // [emitter impl] void QCameraImageCaptureControl::imageMetadataAvailable(int id, const QString &key, const QVariant &value) - void emitter_QCameraImageCaptureControl_imageMetadataAvailable_4695(int id, const QString &key, const QVariant &value) - { - emit QCameraImageCaptureControl::imageMetadataAvailable(id, key, value); - } - - // [emitter impl] void QCameraImageCaptureControl::imageSaved(int id, const QString &fileName) - void emitter_QCameraImageCaptureControl_imageSaved_2684(int id, const QString &fileName) - { - emit QCameraImageCaptureControl::imageSaved(id, fileName); - } - // [adaptor impl] bool QCameraImageCaptureControl::isReadyForCapture() bool cbs_isReadyForCapture_c0_0() const { @@ -392,12 +510,6 @@ public: } } - // [emitter impl] void QCameraImageCaptureControl::readyForCaptureChanged(bool) - void emitter_QCameraImageCaptureControl_readyForCaptureChanged_864(bool arg1) - { - emit QCameraImageCaptureControl::readyForCaptureChanged(arg1); - } - // [adaptor impl] void QCameraImageCaptureControl::setDriveMode(QCameraImageCapture::DriveMode mode) void cbs_setDriveMode_3320_0(const qt_gsi::Converter::target_type & mode) { @@ -594,24 +706,6 @@ static void _set_callback_cbs_customEvent_1217_0 (void *cls, const gsi::Callback } -// emitter void QCameraImageCaptureControl::destroyed(QObject *) - -static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - ((QCameraImageCaptureControl_Adaptor *)cls)->emitter_QCameraImageCaptureControl_destroyed_1302 (arg1); -} - - // void QCameraImageCaptureControl::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -655,30 +749,6 @@ static void _set_callback_cbs_driveMode_c0_0 (void *cls, const gsi::Callback &cb } -// emitter void QCameraImageCaptureControl::error(int id, int error, const QString &errorString) - -static void _init_emitter_error_3343 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("id"); - decl->add_arg (argspec_0); - static gsi::ArgSpecBase argspec_1 ("error"); - decl->add_arg (argspec_1); - static gsi::ArgSpecBase argspec_2 ("errorString"); - decl->add_arg (argspec_2); - decl->set_return (); -} - -static void _call_emitter_error_3343 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - int arg1 = gsi::arg_reader() (args, heap); - int arg2 = gsi::arg_reader() (args, heap); - const QString &arg3 = gsi::arg_reader() (args, heap); - ((QCameraImageCaptureControl_Adaptor *)cls)->emitter_QCameraImageCaptureControl_error_3343 (arg1, arg2, arg3); -} - - // bool QCameraImageCaptureControl::event(QEvent *) static void _init_cbs_event_1217_0 (qt_gsi::GenericMethod *decl) @@ -728,111 +798,6 @@ static void _set_callback_cbs_eventFilter_2411_0 (void *cls, const gsi::Callback } -// emitter void QCameraImageCaptureControl::imageAvailable(int id, const QVideoFrame &buffer) - -static void _init_emitter_imageAvailable_3047 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("id"); - decl->add_arg (argspec_0); - static gsi::ArgSpecBase argspec_1 ("buffer"); - decl->add_arg (argspec_1); - decl->set_return (); -} - -static void _call_emitter_imageAvailable_3047 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - int arg1 = gsi::arg_reader() (args, heap); - const QVideoFrame &arg2 = gsi::arg_reader() (args, heap); - ((QCameraImageCaptureControl_Adaptor *)cls)->emitter_QCameraImageCaptureControl_imageAvailable_3047 (arg1, arg2); -} - - -// emitter void QCameraImageCaptureControl::imageCaptured(int id, const QImage &preview) - -static void _init_emitter_imageCaptured_2536 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("id"); - decl->add_arg (argspec_0); - static gsi::ArgSpecBase argspec_1 ("preview"); - decl->add_arg (argspec_1); - decl->set_return (); -} - -static void _call_emitter_imageCaptured_2536 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - int arg1 = gsi::arg_reader() (args, heap); - const QImage &arg2 = gsi::arg_reader() (args, heap); - ((QCameraImageCaptureControl_Adaptor *)cls)->emitter_QCameraImageCaptureControl_imageCaptured_2536 (arg1, arg2); -} - - -// emitter void QCameraImageCaptureControl::imageExposed(int id) - -static void _init_emitter_imageExposed_767 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("id"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_imageExposed_767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - int arg1 = gsi::arg_reader() (args, heap); - ((QCameraImageCaptureControl_Adaptor *)cls)->emitter_QCameraImageCaptureControl_imageExposed_767 (arg1); -} - - -// emitter void QCameraImageCaptureControl::imageMetadataAvailable(int id, const QString &key, const QVariant &value) - -static void _init_emitter_imageMetadataAvailable_4695 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("id"); - decl->add_arg (argspec_0); - static gsi::ArgSpecBase argspec_1 ("key"); - decl->add_arg (argspec_1); - static gsi::ArgSpecBase argspec_2 ("value"); - decl->add_arg (argspec_2); - decl->set_return (); -} - -static void _call_emitter_imageMetadataAvailable_4695 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - int arg1 = gsi::arg_reader() (args, heap); - const QString &arg2 = gsi::arg_reader() (args, heap); - const QVariant &arg3 = gsi::arg_reader() (args, heap); - ((QCameraImageCaptureControl_Adaptor *)cls)->emitter_QCameraImageCaptureControl_imageMetadataAvailable_4695 (arg1, arg2, arg3); -} - - -// emitter void QCameraImageCaptureControl::imageSaved(int id, const QString &fileName) - -static void _init_emitter_imageSaved_2684 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("id"); - decl->add_arg (argspec_0); - static gsi::ArgSpecBase argspec_1 ("fileName"); - decl->add_arg (argspec_1); - decl->set_return (); -} - -static void _call_emitter_imageSaved_2684 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - int arg1 = gsi::arg_reader() (args, heap); - const QString &arg2 = gsi::arg_reader() (args, heap); - ((QCameraImageCaptureControl_Adaptor *)cls)->emitter_QCameraImageCaptureControl_imageSaved_2684 (arg1, arg2); -} - - // bool QCameraImageCaptureControl::isReadyForCapture() static void _init_cbs_isReadyForCapture_c0_0 (qt_gsi::GenericMethod *decl) @@ -870,24 +835,6 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } -// emitter void QCameraImageCaptureControl::readyForCaptureChanged(bool) - -static void _init_emitter_readyForCaptureChanged_864 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_readyForCaptureChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - bool arg1 = gsi::arg_reader() (args, heap); - ((QCameraImageCaptureControl_Adaptor *)cls)->emitter_QCameraImageCaptureControl_readyForCaptureChanged_864 (arg1); -} - - // exposed int QCameraImageCaptureControl::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -998,25 +945,17 @@ static gsi::Methods methods_QCameraImageCaptureControl_Adaptor () { methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QCameraImageCaptureControl::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); - methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QCameraImageCaptureControl::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QCameraImageCaptureControl::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("driveMode", "@brief Virtual method QCameraImageCapture::DriveMode QCameraImageCaptureControl::driveMode()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_driveMode_c0_0, &_call_cbs_driveMode_c0_0); methods += new qt_gsi::GenericMethod ("driveMode", "@hide", true, &_init_cbs_driveMode_c0_0, &_call_cbs_driveMode_c0_0, &_set_callback_cbs_driveMode_c0_0); - methods += new qt_gsi::GenericMethod ("emit_error", "@brief Emitter for signal void QCameraImageCaptureControl::error(int id, int error, const QString &errorString)\nCall this method to emit this signal.", false, &_init_emitter_error_3343, &_call_emitter_error_3343); methods += new qt_gsi::GenericMethod ("event", "@brief Virtual method bool QCameraImageCaptureControl::event(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0); methods += new qt_gsi::GenericMethod ("event", "@hide", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0, &_set_callback_cbs_event_1217_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QCameraImageCaptureControl::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); - methods += new qt_gsi::GenericMethod ("emit_imageAvailable", "@brief Emitter for signal void QCameraImageCaptureControl::imageAvailable(int id, const QVideoFrame &buffer)\nCall this method to emit this signal.", false, &_init_emitter_imageAvailable_3047, &_call_emitter_imageAvailable_3047); - methods += new qt_gsi::GenericMethod ("emit_imageCaptured", "@brief Emitter for signal void QCameraImageCaptureControl::imageCaptured(int id, const QImage &preview)\nCall this method to emit this signal.", false, &_init_emitter_imageCaptured_2536, &_call_emitter_imageCaptured_2536); - methods += new qt_gsi::GenericMethod ("emit_imageExposed", "@brief Emitter for signal void QCameraImageCaptureControl::imageExposed(int id)\nCall this method to emit this signal.", false, &_init_emitter_imageExposed_767, &_call_emitter_imageExposed_767); - methods += new qt_gsi::GenericMethod ("emit_imageMetadataAvailable", "@brief Emitter for signal void QCameraImageCaptureControl::imageMetadataAvailable(int id, const QString &key, const QVariant &value)\nCall this method to emit this signal.", false, &_init_emitter_imageMetadataAvailable_4695, &_call_emitter_imageMetadataAvailable_4695); - methods += new qt_gsi::GenericMethod ("emit_imageSaved", "@brief Emitter for signal void QCameraImageCaptureControl::imageSaved(int id, const QString &fileName)\nCall this method to emit this signal.", false, &_init_emitter_imageSaved_2684, &_call_emitter_imageSaved_2684); methods += new qt_gsi::GenericMethod ("isReadyForCapture", "@brief Virtual method bool QCameraImageCaptureControl::isReadyForCapture()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_isReadyForCapture_c0_0, &_call_cbs_isReadyForCapture_c0_0); methods += new qt_gsi::GenericMethod ("isReadyForCapture", "@hide", true, &_init_cbs_isReadyForCapture_c0_0, &_call_cbs_isReadyForCapture_c0_0, &_set_callback_cbs_isReadyForCapture_c0_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QCameraImageCaptureControl::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); - methods += new qt_gsi::GenericMethod ("emit_readyForCaptureChanged", "@brief Emitter for signal void QCameraImageCaptureControl::readyForCaptureChanged(bool)\nCall this method to emit this signal.", false, &_init_emitter_readyForCaptureChanged_864, &_call_emitter_readyForCaptureChanged_864); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QCameraImageCaptureControl::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QCameraImageCaptureControl::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QCameraImageCaptureControl::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); diff --git a/src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraImageProcessing.cc b/src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraImageProcessing.cc index 696b34cc3..8a4538e66 100644 --- a/src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraImageProcessing.cc +++ b/src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraImageProcessing.cc @@ -425,7 +425,6 @@ static gsi::Methods methods_QCameraImageProcessing () { methods += new qt_gsi::GenericMethod ("setWhiteBalanceMode|whiteBalanceMode=", "@brief Method void QCameraImageProcessing::setWhiteBalanceMode(QCameraImageProcessing::WhiteBalanceMode mode)\n", false, &_init_f_setWhiteBalanceMode_4334, &_call_f_setWhiteBalanceMode_4334); methods += new qt_gsi::GenericMethod (":sharpeningLevel", "@brief Method double QCameraImageProcessing::sharpeningLevel()\n", true, &_init_f_sharpeningLevel_c0, &_call_f_sharpeningLevel_c0); methods += new qt_gsi::GenericMethod (":whiteBalanceMode", "@brief Method QCameraImageProcessing::WhiteBalanceMode QCameraImageProcessing::whiteBalanceMode()\n", true, &_init_f_whiteBalanceMode_c0, &_call_f_whiteBalanceMode_c0); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QCameraImageProcessing::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QCameraImageProcessing::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QCameraImageProcessing::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; diff --git a/src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraImageProcessingControl.cc b/src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraImageProcessingControl.cc index e6d2db758..f1b9600fd 100644 --- a/src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraImageProcessingControl.cc +++ b/src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraImageProcessingControl.cc @@ -198,7 +198,6 @@ static gsi::Methods methods_QCameraImageProcessingControl () { methods += new qt_gsi::GenericMethod ("isParameterValueSupported?", "@brief Method bool QCameraImageProcessingControl::isParameterValueSupported(QCameraImageProcessingControl::ProcessingParameter parameter, const QVariant &value)\n", true, &_init_f_isParameterValueSupported_c7484, &_call_f_isParameterValueSupported_c7484); methods += new qt_gsi::GenericMethod ("parameter", "@brief Method QVariant QCameraImageProcessingControl::parameter(QCameraImageProcessingControl::ProcessingParameter parameter)\n", true, &_init_f_parameter_c5473, &_call_f_parameter_c5473); methods += new qt_gsi::GenericMethod ("setParameter", "@brief Method void QCameraImageProcessingControl::setParameter(QCameraImageProcessingControl::ProcessingParameter parameter, const QVariant &value)\n", false, &_init_f_setParameter_7484, &_call_f_setParameter_7484); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QCameraImageProcessingControl::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QCameraImageProcessingControl::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QCameraImageProcessingControl::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -247,12 +246,6 @@ public: return QCameraImageProcessingControl::senderSignalIndex(); } - // [emitter impl] void QCameraImageProcessingControl::destroyed(QObject *) - void emitter_QCameraImageProcessingControl_destroyed_1302(QObject *arg1) - { - emit QCameraImageProcessingControl::destroyed(arg1); - } - // [adaptor impl] bool QCameraImageProcessingControl::event(QEvent *) bool cbs_event_1217_0(QEvent *arg1) { @@ -485,24 +478,6 @@ static void _set_callback_cbs_customEvent_1217_0 (void *cls, const gsi::Callback } -// emitter void QCameraImageProcessingControl::destroyed(QObject *) - -static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - ((QCameraImageProcessingControl_Adaptor *)cls)->emitter_QCameraImageProcessingControl_destroyed_1302 (arg1); -} - - // void QCameraImageProcessingControl::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -775,7 +750,6 @@ static gsi::Methods methods_QCameraImageProcessingControl_Adaptor () { methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QCameraImageProcessingControl::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); - methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QCameraImageProcessingControl::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QCameraImageProcessingControl::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("event", "@brief Virtual method bool QCameraImageProcessingControl::event(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0); diff --git a/src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraInfoControl.cc b/src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraInfoControl.cc index 641da6fb6..4508b8810 100644 --- a/src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraInfoControl.cc +++ b/src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraInfoControl.cc @@ -151,7 +151,6 @@ static gsi::Methods methods_QCameraInfoControl () { methods += new qt_gsi::GenericStaticMethod ("staticMetaObject", "@brief Obtains the static MetaObject for this class.", &_init_smo, &_call_smo); methods += new qt_gsi::GenericMethod ("cameraOrientation", "@brief Method int QCameraInfoControl::cameraOrientation(const QString &deviceName)\n", true, &_init_f_cameraOrientation_c2025, &_call_f_cameraOrientation_c2025); methods += new qt_gsi::GenericMethod ("cameraPosition", "@brief Method QCamera::Position QCameraInfoControl::cameraPosition(const QString &deviceName)\n", true, &_init_f_cameraPosition_c2025, &_call_f_cameraPosition_c2025); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QCameraInfoControl::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QCameraInfoControl::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QCameraInfoControl::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -232,12 +231,6 @@ public: } } - // [emitter impl] void QCameraInfoControl::destroyed(QObject *) - void emitter_QCameraInfoControl_destroyed_1302(QObject *arg1) - { - emit QCameraInfoControl::destroyed(arg1); - } - // [adaptor impl] bool QCameraInfoControl::event(QEvent *) bool cbs_event_1217_0(QEvent *arg1) { @@ -448,24 +441,6 @@ static void _set_callback_cbs_customEvent_1217_0 (void *cls, const gsi::Callback } -// emitter void QCameraInfoControl::destroyed(QObject *) - -static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - ((QCameraInfoControl_Adaptor *)cls)->emitter_QCameraInfoControl_destroyed_1302 (arg1); -} - - // void QCameraInfoControl::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -643,7 +618,6 @@ static gsi::Methods methods_QCameraInfoControl_Adaptor () { methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QCameraInfoControl::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); - methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QCameraInfoControl::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QCameraInfoControl::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("event", "@brief Virtual method bool QCameraInfoControl::event(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0); diff --git a/src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraLocksControl.cc b/src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraLocksControl.cc index 0956c6373..417ca65d4 100644 --- a/src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraLocksControl.cc +++ b/src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraLocksControl.cc @@ -74,6 +74,32 @@ static void _call_f_lockStatus_c2029 (const qt_gsi::GenericMethod * /*decl*/, vo } +// void QCameraLocksControl::lockStatusChanged(QCamera::LockType type, QCamera::LockStatus status, QCamera::LockChangeReason reason) + + +static void _init_f_lockStatusChanged_6877 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("type"); + decl->add_arg::target_type & > (argspec_0); + static gsi::ArgSpecBase argspec_1 ("status"); + decl->add_arg::target_type & > (argspec_1); + static gsi::ArgSpecBase argspec_2 ("reason"); + decl->add_arg::target_type & > (argspec_2); + decl->set_return (); +} + +static void _call_f_lockStatusChanged_6877 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); + const qt_gsi::Converter::target_type & arg2 = gsi::arg_reader::target_type & >() (args, heap); + const qt_gsi::Converter::target_type & arg3 = gsi::arg_reader::target_type & >() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QCameraLocksControl *)cls)->lockStatusChanged (qt_gsi::QtToCppAdaptor(arg1).cref(), qt_gsi::QtToCppAdaptor(arg2).cref(), qt_gsi::QtToCppAdaptor(arg3).cref()); +} + + // void QCameraLocksControl::searchAndLock(QFlags locks) @@ -186,11 +212,10 @@ static gsi::Methods methods_QCameraLocksControl () { gsi::Methods methods; methods += new qt_gsi::GenericStaticMethod ("staticMetaObject", "@brief Obtains the static MetaObject for this class.", &_init_smo, &_call_smo); methods += new qt_gsi::GenericMethod ("lockStatus", "@brief Method QCamera::LockStatus QCameraLocksControl::lockStatus(QCamera::LockType lock)\n", true, &_init_f_lockStatus_c2029, &_call_f_lockStatus_c2029); + methods += new qt_gsi::GenericMethod ("lockStatusChanged", "@brief Method void QCameraLocksControl::lockStatusChanged(QCamera::LockType type, QCamera::LockStatus status, QCamera::LockChangeReason reason)\n", false, &_init_f_lockStatusChanged_6877, &_call_f_lockStatusChanged_6877); methods += new qt_gsi::GenericMethod ("searchAndLock", "@brief Method void QCameraLocksControl::searchAndLock(QFlags locks)\n", false, &_init_f_searchAndLock_2725, &_call_f_searchAndLock_2725); methods += new qt_gsi::GenericMethod ("supportedLocks", "@brief Method QFlags QCameraLocksControl::supportedLocks()\n", true, &_init_f_supportedLocks_c0, &_call_f_supportedLocks_c0); methods += new qt_gsi::GenericMethod ("unlock", "@brief Method void QCameraLocksControl::unlock(QFlags locks)\n", false, &_init_f_unlock_2725, &_call_f_unlock_2725); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QCameraLocksControl::destroyed(QObject *)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal::target_type &, const qt_gsi::Converter::target_type &, const qt_gsi::Converter::target_type & > ("lockStatusChanged(QCamera::LockType, QCamera::LockStatus, QCamera::LockChangeReason)", "lockStatusChanged", gsi::arg("type"), gsi::arg("status"), gsi::arg("reason"), "@brief Signal declaration for QCameraLocksControl::lockStatusChanged(QCamera::LockType type, QCamera::LockStatus status, QCamera::LockChangeReason reason)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QCameraLocksControl::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QCameraLocksControl::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -239,12 +264,6 @@ public: return QCameraLocksControl::senderSignalIndex(); } - // [emitter impl] void QCameraLocksControl::destroyed(QObject *) - void emitter_QCameraLocksControl_destroyed_1302(QObject *arg1) - { - emit QCameraLocksControl::destroyed(arg1); - } - // [adaptor impl] bool QCameraLocksControl::event(QEvent *) bool cbs_event_1217_0(QEvent *arg1) { @@ -291,12 +310,6 @@ public: } } - // [emitter impl] void QCameraLocksControl::lockStatusChanged(QCamera::LockType type, QCamera::LockStatus status, QCamera::LockChangeReason reason) - void emitter_QCameraLocksControl_lockStatusChanged_6877(QCamera::LockType type, QCamera::LockStatus status, QCamera::LockChangeReason reason) - { - emit QCameraLocksControl::lockStatusChanged(type, status, reason); - } - // [adaptor impl] void QCameraLocksControl::searchAndLock(QFlags locks) void cbs_searchAndLock_2725_0(QFlags locks) { @@ -480,24 +493,6 @@ static void _set_callback_cbs_customEvent_1217_0 (void *cls, const gsi::Callback } -// emitter void QCameraLocksControl::destroyed(QObject *) - -static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - ((QCameraLocksControl_Adaptor *)cls)->emitter_QCameraLocksControl_destroyed_1302 (arg1); -} - - // void QCameraLocksControl::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -612,30 +607,6 @@ static void _set_callback_cbs_lockStatus_c2029_0 (void *cls, const gsi::Callback } -// emitter void QCameraLocksControl::lockStatusChanged(QCamera::LockType type, QCamera::LockStatus status, QCamera::LockChangeReason reason) - -static void _init_emitter_lockStatusChanged_6877 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("type"); - decl->add_arg::target_type & > (argspec_0); - static gsi::ArgSpecBase argspec_1 ("status"); - decl->add_arg::target_type & > (argspec_1); - static gsi::ArgSpecBase argspec_2 ("reason"); - decl->add_arg::target_type & > (argspec_2); - decl->set_return (); -} - -static void _call_emitter_lockStatusChanged_6877 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); - const qt_gsi::Converter::target_type & arg2 = gsi::arg_reader::target_type & >() (args, heap); - const qt_gsi::Converter::target_type & arg3 = gsi::arg_reader::target_type & >() (args, heap); - ((QCameraLocksControl_Adaptor *)cls)->emitter_QCameraLocksControl_lockStatusChanged_6877 (arg1, arg2, arg3); -} - - // exposed int QCameraLocksControl::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -785,7 +756,6 @@ static gsi::Methods methods_QCameraLocksControl_Adaptor () { methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QCameraLocksControl::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); - methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QCameraLocksControl::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QCameraLocksControl::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("event", "@brief Virtual method bool QCameraLocksControl::event(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0); @@ -795,7 +765,6 @@ static gsi::Methods methods_QCameraLocksControl_Adaptor () { methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QCameraLocksControl::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); methods += new qt_gsi::GenericMethod ("lockStatus", "@brief Virtual method QCamera::LockStatus QCameraLocksControl::lockStatus(QCamera::LockType lock)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_lockStatus_c2029_0, &_call_cbs_lockStatus_c2029_0); methods += new qt_gsi::GenericMethod ("lockStatus", "@hide", true, &_init_cbs_lockStatus_c2029_0, &_call_cbs_lockStatus_c2029_0, &_set_callback_cbs_lockStatus_c2029_0); - methods += new qt_gsi::GenericMethod ("emit_lockStatusChanged", "@brief Emitter for signal void QCameraLocksControl::lockStatusChanged(QCamera::LockType type, QCamera::LockStatus status, QCamera::LockChangeReason reason)\nCall this method to emit this signal.", false, &_init_emitter_lockStatusChanged_6877, &_call_emitter_lockStatusChanged_6877); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QCameraLocksControl::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("searchAndLock", "@brief Virtual method void QCameraLocksControl::searchAndLock(QFlags locks)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_searchAndLock_2725_0, &_call_cbs_searchAndLock_2725_0); methods += new qt_gsi::GenericMethod ("searchAndLock", "@hide", false, &_init_cbs_searchAndLock_2725_0, &_call_cbs_searchAndLock_2725_0, &_set_callback_cbs_searchAndLock_2725_0); diff --git a/src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraViewfinderSettingsControl.cc b/src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraViewfinderSettingsControl.cc index 4fba4b9b1..56ca997f0 100644 --- a/src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraViewfinderSettingsControl.cc +++ b/src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraViewfinderSettingsControl.cc @@ -175,7 +175,6 @@ static gsi::Methods methods_QCameraViewfinderSettingsControl () { methods += new qt_gsi::GenericMethod ("isViewfinderParameterSupported?", "@brief Method bool QCameraViewfinderSettingsControl::isViewfinderParameterSupported(QCameraViewfinderSettingsControl::ViewfinderParameter parameter)\n", true, &_init_f_isViewfinderParameterSupported_c5819, &_call_f_isViewfinderParameterSupported_c5819); methods += new qt_gsi::GenericMethod ("setViewfinderParameter", "@brief Method void QCameraViewfinderSettingsControl::setViewfinderParameter(QCameraViewfinderSettingsControl::ViewfinderParameter parameter, const QVariant &value)\n", false, &_init_f_setViewfinderParameter_7830, &_call_f_setViewfinderParameter_7830); methods += new qt_gsi::GenericMethod ("viewfinderParameter", "@brief Method QVariant QCameraViewfinderSettingsControl::viewfinderParameter(QCameraViewfinderSettingsControl::ViewfinderParameter parameter)\n", true, &_init_f_viewfinderParameter_c5819, &_call_f_viewfinderParameter_c5819); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QCameraViewfinderSettingsControl::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QCameraViewfinderSettingsControl::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QCameraViewfinderSettingsControl::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -224,12 +223,6 @@ public: return QCameraViewfinderSettingsControl::senderSignalIndex(); } - // [emitter impl] void QCameraViewfinderSettingsControl::destroyed(QObject *) - void emitter_QCameraViewfinderSettingsControl_destroyed_1302(QObject *arg1) - { - emit QCameraViewfinderSettingsControl::destroyed(arg1); - } - // [adaptor impl] bool QCameraViewfinderSettingsControl::event(QEvent *) bool cbs_event_1217_0(QEvent *arg1) { @@ -444,24 +437,6 @@ static void _set_callback_cbs_customEvent_1217_0 (void *cls, const gsi::Callback } -// emitter void QCameraViewfinderSettingsControl::destroyed(QObject *) - -static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - ((QCameraViewfinderSettingsControl_Adaptor *)cls)->emitter_QCameraViewfinderSettingsControl_destroyed_1302 (arg1); -} - - // void QCameraViewfinderSettingsControl::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -708,7 +683,6 @@ static gsi::Methods methods_QCameraViewfinderSettingsControl_Adaptor () { methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QCameraViewfinderSettingsControl::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); - methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QCameraViewfinderSettingsControl::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QCameraViewfinderSettingsControl::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("event", "@brief Virtual method bool QCameraViewfinderSettingsControl::event(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0); diff --git a/src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraViewfinderSettingsControl2.cc b/src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraViewfinderSettingsControl2.cc index db69cae03..ec9d5d731 100644 --- a/src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraViewfinderSettingsControl2.cc +++ b/src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraViewfinderSettingsControl2.cc @@ -165,7 +165,6 @@ static gsi::Methods methods_QCameraViewfinderSettingsControl2 () { methods += new qt_gsi::GenericMethod ("setViewfinderSettings|viewfinderSettings=", "@brief Method void QCameraViewfinderSettingsControl2::setViewfinderSettings(const QCameraViewfinderSettings &settings)\n", false, &_init_f_setViewfinderSettings_3871, &_call_f_setViewfinderSettings_3871); methods += new qt_gsi::GenericMethod ("supportedViewfinderSettings", "@brief Method QList QCameraViewfinderSettingsControl2::supportedViewfinderSettings()\n", true, &_init_f_supportedViewfinderSettings_c0, &_call_f_supportedViewfinderSettings_c0); methods += new qt_gsi::GenericMethod (":viewfinderSettings", "@brief Method QCameraViewfinderSettings QCameraViewfinderSettingsControl2::viewfinderSettings()\n", true, &_init_f_viewfinderSettings_c0, &_call_f_viewfinderSettings_c0); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QCameraViewfinderSettingsControl2::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QCameraViewfinderSettingsControl2::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QCameraViewfinderSettingsControl2::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -214,12 +213,6 @@ public: return QCameraViewfinderSettingsControl2::senderSignalIndex(); } - // [emitter impl] void QCameraViewfinderSettingsControl2::destroyed(QObject *) - void emitter_QCameraViewfinderSettingsControl2_destroyed_1302(QObject *arg1) - { - emit QCameraViewfinderSettingsControl2::destroyed(arg1); - } - // [adaptor impl] bool QCameraViewfinderSettingsControl2::event(QEvent *) bool cbs_event_1217_0(QEvent *arg1) { @@ -431,24 +424,6 @@ static void _set_callback_cbs_customEvent_1217_0 (void *cls, const gsi::Callback } -// emitter void QCameraViewfinderSettingsControl2::destroyed(QObject *) - -static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - ((QCameraViewfinderSettingsControl2_Adaptor *)cls)->emitter_QCameraViewfinderSettingsControl2_destroyed_1302 (arg1); -} - - // void QCameraViewfinderSettingsControl2::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -684,7 +659,6 @@ static gsi::Methods methods_QCameraViewfinderSettingsControl2_Adaptor () { methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QCameraViewfinderSettingsControl2::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); - methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QCameraViewfinderSettingsControl2::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QCameraViewfinderSettingsControl2::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("event", "@brief Virtual method bool QCameraViewfinderSettingsControl2::event(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0); diff --git a/src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraZoomControl.cc b/src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraZoomControl.cc index 282cbe56b..537344f4e 100644 --- a/src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraZoomControl.cc +++ b/src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraZoomControl.cc @@ -70,6 +70,26 @@ static void _call_f_currentDigitalZoom_c0 (const qt_gsi::GenericMethod * /*decl* } +// void QCameraZoomControl::currentDigitalZoomChanged(double digitalZoom) + + +static void _init_f_currentDigitalZoomChanged_1071 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("digitalZoom"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_currentDigitalZoomChanged_1071 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + double arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QCameraZoomControl *)cls)->currentDigitalZoomChanged (arg1); +} + + // double QCameraZoomControl::currentOpticalZoom() @@ -85,6 +105,26 @@ static void _call_f_currentOpticalZoom_c0 (const qt_gsi::GenericMethod * /*decl* } +// void QCameraZoomControl::currentOpticalZoomChanged(double opticalZoom) + + +static void _init_f_currentOpticalZoomChanged_1071 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("opticalZoom"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_currentOpticalZoomChanged_1071 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + double arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QCameraZoomControl *)cls)->currentOpticalZoomChanged (arg1); +} + + // double QCameraZoomControl::maximumDigitalZoom() @@ -100,6 +140,26 @@ static void _call_f_maximumDigitalZoom_c0 (const qt_gsi::GenericMethod * /*decl* } +// void QCameraZoomControl::maximumDigitalZoomChanged(double) + + +static void _init_f_maximumDigitalZoomChanged_1071 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("arg1"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_maximumDigitalZoomChanged_1071 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + double arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QCameraZoomControl *)cls)->maximumDigitalZoomChanged (arg1); +} + + // double QCameraZoomControl::maximumOpticalZoom() @@ -115,6 +175,26 @@ static void _call_f_maximumOpticalZoom_c0 (const qt_gsi::GenericMethod * /*decl* } +// void QCameraZoomControl::maximumOpticalZoomChanged(double) + + +static void _init_f_maximumOpticalZoomChanged_1071 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("arg1"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_maximumOpticalZoomChanged_1071 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + double arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QCameraZoomControl *)cls)->maximumOpticalZoomChanged (arg1); +} + + // double QCameraZoomControl::requestedDigitalZoom() @@ -130,6 +210,26 @@ static void _call_f_requestedDigitalZoom_c0 (const qt_gsi::GenericMethod * /*dec } +// void QCameraZoomControl::requestedDigitalZoomChanged(double digitalZoom) + + +static void _init_f_requestedDigitalZoomChanged_1071 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("digitalZoom"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_requestedDigitalZoomChanged_1071 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + double arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QCameraZoomControl *)cls)->requestedDigitalZoomChanged (arg1); +} + + // double QCameraZoomControl::requestedOpticalZoom() @@ -145,6 +245,26 @@ static void _call_f_requestedOpticalZoom_c0 (const qt_gsi::GenericMethod * /*dec } +// void QCameraZoomControl::requestedOpticalZoomChanged(double opticalZoom) + + +static void _init_f_requestedOpticalZoomChanged_1071 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("opticalZoom"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_requestedOpticalZoomChanged_1071 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + double arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QCameraZoomControl *)cls)->requestedOpticalZoomChanged (arg1); +} + + // void QCameraZoomControl::zoomTo(double optical, double digital) @@ -225,19 +345,18 @@ static gsi::Methods methods_QCameraZoomControl () { gsi::Methods methods; methods += new qt_gsi::GenericStaticMethod ("staticMetaObject", "@brief Obtains the static MetaObject for this class.", &_init_smo, &_call_smo); methods += new qt_gsi::GenericMethod ("currentDigitalZoom", "@brief Method double QCameraZoomControl::currentDigitalZoom()\n", true, &_init_f_currentDigitalZoom_c0, &_call_f_currentDigitalZoom_c0); + methods += new qt_gsi::GenericMethod ("currentDigitalZoomChanged", "@brief Method void QCameraZoomControl::currentDigitalZoomChanged(double digitalZoom)\n", false, &_init_f_currentDigitalZoomChanged_1071, &_call_f_currentDigitalZoomChanged_1071); methods += new qt_gsi::GenericMethod ("currentOpticalZoom", "@brief Method double QCameraZoomControl::currentOpticalZoom()\n", true, &_init_f_currentOpticalZoom_c0, &_call_f_currentOpticalZoom_c0); + methods += new qt_gsi::GenericMethod ("currentOpticalZoomChanged", "@brief Method void QCameraZoomControl::currentOpticalZoomChanged(double opticalZoom)\n", false, &_init_f_currentOpticalZoomChanged_1071, &_call_f_currentOpticalZoomChanged_1071); methods += new qt_gsi::GenericMethod ("maximumDigitalZoom", "@brief Method double QCameraZoomControl::maximumDigitalZoom()\n", true, &_init_f_maximumDigitalZoom_c0, &_call_f_maximumDigitalZoom_c0); + methods += new qt_gsi::GenericMethod ("maximumDigitalZoomChanged", "@brief Method void QCameraZoomControl::maximumDigitalZoomChanged(double)\n", false, &_init_f_maximumDigitalZoomChanged_1071, &_call_f_maximumDigitalZoomChanged_1071); methods += new qt_gsi::GenericMethod ("maximumOpticalZoom", "@brief Method double QCameraZoomControl::maximumOpticalZoom()\n", true, &_init_f_maximumOpticalZoom_c0, &_call_f_maximumOpticalZoom_c0); + methods += new qt_gsi::GenericMethod ("maximumOpticalZoomChanged", "@brief Method void QCameraZoomControl::maximumOpticalZoomChanged(double)\n", false, &_init_f_maximumOpticalZoomChanged_1071, &_call_f_maximumOpticalZoomChanged_1071); methods += new qt_gsi::GenericMethod ("requestedDigitalZoom", "@brief Method double QCameraZoomControl::requestedDigitalZoom()\n", true, &_init_f_requestedDigitalZoom_c0, &_call_f_requestedDigitalZoom_c0); + methods += new qt_gsi::GenericMethod ("requestedDigitalZoomChanged", "@brief Method void QCameraZoomControl::requestedDigitalZoomChanged(double digitalZoom)\n", false, &_init_f_requestedDigitalZoomChanged_1071, &_call_f_requestedDigitalZoomChanged_1071); methods += new qt_gsi::GenericMethod ("requestedOpticalZoom", "@brief Method double QCameraZoomControl::requestedOpticalZoom()\n", true, &_init_f_requestedOpticalZoom_c0, &_call_f_requestedOpticalZoom_c0); + methods += new qt_gsi::GenericMethod ("requestedOpticalZoomChanged", "@brief Method void QCameraZoomControl::requestedOpticalZoomChanged(double opticalZoom)\n", false, &_init_f_requestedOpticalZoomChanged_1071, &_call_f_requestedOpticalZoomChanged_1071); methods += new qt_gsi::GenericMethod ("zoomTo", "@brief Method void QCameraZoomControl::zoomTo(double optical, double digital)\n", false, &_init_f_zoomTo_2034, &_call_f_zoomTo_2034); - methods += gsi::qt_signal ("currentDigitalZoomChanged(double)", "currentDigitalZoomChanged", gsi::arg("digitalZoom"), "@brief Signal declaration for QCameraZoomControl::currentDigitalZoomChanged(double digitalZoom)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("currentOpticalZoomChanged(double)", "currentOpticalZoomChanged", gsi::arg("opticalZoom"), "@brief Signal declaration for QCameraZoomControl::currentOpticalZoomChanged(double opticalZoom)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QCameraZoomControl::destroyed(QObject *)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("maximumDigitalZoomChanged(double)", "maximumDigitalZoomChanged", gsi::arg("arg1"), "@brief Signal declaration for QCameraZoomControl::maximumDigitalZoomChanged(double)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("maximumOpticalZoomChanged(double)", "maximumOpticalZoomChanged", gsi::arg("arg1"), "@brief Signal declaration for QCameraZoomControl::maximumOpticalZoomChanged(double)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("requestedDigitalZoomChanged(double)", "requestedDigitalZoomChanged", gsi::arg("digitalZoom"), "@brief Signal declaration for QCameraZoomControl::requestedDigitalZoomChanged(double digitalZoom)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("requestedOpticalZoomChanged(double)", "requestedOpticalZoomChanged", gsi::arg("opticalZoom"), "@brief Signal declaration for QCameraZoomControl::requestedOpticalZoomChanged(double opticalZoom)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QCameraZoomControl::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QCameraZoomControl::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -301,12 +420,6 @@ public: } } - // [emitter impl] void QCameraZoomControl::currentDigitalZoomChanged(double digitalZoom) - void emitter_QCameraZoomControl_currentDigitalZoomChanged_1071(double digitalZoom) - { - emit QCameraZoomControl::currentDigitalZoomChanged(digitalZoom); - } - // [adaptor impl] double QCameraZoomControl::currentOpticalZoom() double cbs_currentOpticalZoom_c0_0() const { @@ -322,18 +435,6 @@ public: } } - // [emitter impl] void QCameraZoomControl::currentOpticalZoomChanged(double opticalZoom) - void emitter_QCameraZoomControl_currentOpticalZoomChanged_1071(double opticalZoom) - { - emit QCameraZoomControl::currentOpticalZoomChanged(opticalZoom); - } - - // [emitter impl] void QCameraZoomControl::destroyed(QObject *) - void emitter_QCameraZoomControl_destroyed_1302(QObject *arg1) - { - emit QCameraZoomControl::destroyed(arg1); - } - // [adaptor impl] bool QCameraZoomControl::event(QEvent *) bool cbs_event_1217_0(QEvent *arg1) { @@ -379,12 +480,6 @@ public: } } - // [emitter impl] void QCameraZoomControl::maximumDigitalZoomChanged(double) - void emitter_QCameraZoomControl_maximumDigitalZoomChanged_1071(double arg1) - { - emit QCameraZoomControl::maximumDigitalZoomChanged(arg1); - } - // [adaptor impl] double QCameraZoomControl::maximumOpticalZoom() double cbs_maximumOpticalZoom_c0_0() const { @@ -400,12 +495,6 @@ public: } } - // [emitter impl] void QCameraZoomControl::maximumOpticalZoomChanged(double) - void emitter_QCameraZoomControl_maximumOpticalZoomChanged_1071(double arg1) - { - emit QCameraZoomControl::maximumOpticalZoomChanged(arg1); - } - // [adaptor impl] double QCameraZoomControl::requestedDigitalZoom() double cbs_requestedDigitalZoom_c0_0() const { @@ -421,12 +510,6 @@ public: } } - // [emitter impl] void QCameraZoomControl::requestedDigitalZoomChanged(double digitalZoom) - void emitter_QCameraZoomControl_requestedDigitalZoomChanged_1071(double digitalZoom) - { - emit QCameraZoomControl::requestedDigitalZoomChanged(digitalZoom); - } - // [adaptor impl] double QCameraZoomControl::requestedOpticalZoom() double cbs_requestedOpticalZoom_c0_0() const { @@ -442,12 +525,6 @@ public: } } - // [emitter impl] void QCameraZoomControl::requestedOpticalZoomChanged(double opticalZoom) - void emitter_QCameraZoomControl_requestedOpticalZoomChanged_1071(double opticalZoom) - { - emit QCameraZoomControl::requestedOpticalZoomChanged(opticalZoom); - } - // [adaptor impl] void QCameraZoomControl::zoomTo(double optical, double digital) void cbs_zoomTo_2034_0(double optical, double digital) { @@ -599,24 +676,6 @@ static void _set_callback_cbs_currentDigitalZoom_c0_0 (void *cls, const gsi::Cal } -// emitter void QCameraZoomControl::currentDigitalZoomChanged(double digitalZoom) - -static void _init_emitter_currentDigitalZoomChanged_1071 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("digitalZoom"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_currentDigitalZoomChanged_1071 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - double arg1 = gsi::arg_reader() (args, heap); - ((QCameraZoomControl_Adaptor *)cls)->emitter_QCameraZoomControl_currentDigitalZoomChanged_1071 (arg1); -} - - // double QCameraZoomControl::currentOpticalZoom() static void _init_cbs_currentOpticalZoom_c0_0 (qt_gsi::GenericMethod *decl) @@ -636,24 +695,6 @@ static void _set_callback_cbs_currentOpticalZoom_c0_0 (void *cls, const gsi::Cal } -// emitter void QCameraZoomControl::currentOpticalZoomChanged(double opticalZoom) - -static void _init_emitter_currentOpticalZoomChanged_1071 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("opticalZoom"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_currentOpticalZoomChanged_1071 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - double arg1 = gsi::arg_reader() (args, heap); - ((QCameraZoomControl_Adaptor *)cls)->emitter_QCameraZoomControl_currentOpticalZoomChanged_1071 (arg1); -} - - // void QCameraZoomControl::customEvent(QEvent *) static void _init_cbs_customEvent_1217_0 (qt_gsi::GenericMethod *decl) @@ -678,24 +719,6 @@ static void _set_callback_cbs_customEvent_1217_0 (void *cls, const gsi::Callback } -// emitter void QCameraZoomControl::destroyed(QObject *) - -static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - ((QCameraZoomControl_Adaptor *)cls)->emitter_QCameraZoomControl_destroyed_1302 (arg1); -} - - // void QCameraZoomControl::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -806,24 +829,6 @@ static void _set_callback_cbs_maximumDigitalZoom_c0_0 (void *cls, const gsi::Cal } -// emitter void QCameraZoomControl::maximumDigitalZoomChanged(double) - -static void _init_emitter_maximumDigitalZoomChanged_1071 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_maximumDigitalZoomChanged_1071 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - double arg1 = gsi::arg_reader() (args, heap); - ((QCameraZoomControl_Adaptor *)cls)->emitter_QCameraZoomControl_maximumDigitalZoomChanged_1071 (arg1); -} - - // double QCameraZoomControl::maximumOpticalZoom() static void _init_cbs_maximumOpticalZoom_c0_0 (qt_gsi::GenericMethod *decl) @@ -843,24 +848,6 @@ static void _set_callback_cbs_maximumOpticalZoom_c0_0 (void *cls, const gsi::Cal } -// emitter void QCameraZoomControl::maximumOpticalZoomChanged(double) - -static void _init_emitter_maximumOpticalZoomChanged_1071 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_maximumOpticalZoomChanged_1071 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - double arg1 = gsi::arg_reader() (args, heap); - ((QCameraZoomControl_Adaptor *)cls)->emitter_QCameraZoomControl_maximumOpticalZoomChanged_1071 (arg1); -} - - // exposed int QCameraZoomControl::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -898,24 +885,6 @@ static void _set_callback_cbs_requestedDigitalZoom_c0_0 (void *cls, const gsi::C } -// emitter void QCameraZoomControl::requestedDigitalZoomChanged(double digitalZoom) - -static void _init_emitter_requestedDigitalZoomChanged_1071 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("digitalZoom"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_requestedDigitalZoomChanged_1071 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - double arg1 = gsi::arg_reader() (args, heap); - ((QCameraZoomControl_Adaptor *)cls)->emitter_QCameraZoomControl_requestedDigitalZoomChanged_1071 (arg1); -} - - // double QCameraZoomControl::requestedOpticalZoom() static void _init_cbs_requestedOpticalZoom_c0_0 (qt_gsi::GenericMethod *decl) @@ -935,24 +904,6 @@ static void _set_callback_cbs_requestedOpticalZoom_c0_0 (void *cls, const gsi::C } -// emitter void QCameraZoomControl::requestedOpticalZoomChanged(double opticalZoom) - -static void _init_emitter_requestedOpticalZoomChanged_1071 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("opticalZoom"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_requestedOpticalZoomChanged_1071 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - double arg1 = gsi::arg_reader() (args, heap); - ((QCameraZoomControl_Adaptor *)cls)->emitter_QCameraZoomControl_requestedOpticalZoomChanged_1071 (arg1); -} - - // exposed QObject *QCameraZoomControl::sender() static void _init_fp_sender_c0 (qt_gsi::GenericMethod *decl) @@ -1044,13 +995,10 @@ static gsi::Methods methods_QCameraZoomControl_Adaptor () { methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("currentDigitalZoom", "@brief Virtual method double QCameraZoomControl::currentDigitalZoom()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_currentDigitalZoom_c0_0, &_call_cbs_currentDigitalZoom_c0_0); methods += new qt_gsi::GenericMethod ("currentDigitalZoom", "@hide", true, &_init_cbs_currentDigitalZoom_c0_0, &_call_cbs_currentDigitalZoom_c0_0, &_set_callback_cbs_currentDigitalZoom_c0_0); - methods += new qt_gsi::GenericMethod ("emit_currentDigitalZoomChanged", "@brief Emitter for signal void QCameraZoomControl::currentDigitalZoomChanged(double digitalZoom)\nCall this method to emit this signal.", false, &_init_emitter_currentDigitalZoomChanged_1071, &_call_emitter_currentDigitalZoomChanged_1071); methods += new qt_gsi::GenericMethod ("currentOpticalZoom", "@brief Virtual method double QCameraZoomControl::currentOpticalZoom()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_currentOpticalZoom_c0_0, &_call_cbs_currentOpticalZoom_c0_0); methods += new qt_gsi::GenericMethod ("currentOpticalZoom", "@hide", true, &_init_cbs_currentOpticalZoom_c0_0, &_call_cbs_currentOpticalZoom_c0_0, &_set_callback_cbs_currentOpticalZoom_c0_0); - methods += new qt_gsi::GenericMethod ("emit_currentOpticalZoomChanged", "@brief Emitter for signal void QCameraZoomControl::currentOpticalZoomChanged(double opticalZoom)\nCall this method to emit this signal.", false, &_init_emitter_currentOpticalZoomChanged_1071, &_call_emitter_currentOpticalZoomChanged_1071); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QCameraZoomControl::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); - methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QCameraZoomControl::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QCameraZoomControl::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("event", "@brief Virtual method bool QCameraZoomControl::event(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0); @@ -1060,17 +1008,13 @@ static gsi::Methods methods_QCameraZoomControl_Adaptor () { methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QCameraZoomControl::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); methods += new qt_gsi::GenericMethod ("maximumDigitalZoom", "@brief Virtual method double QCameraZoomControl::maximumDigitalZoom()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_maximumDigitalZoom_c0_0, &_call_cbs_maximumDigitalZoom_c0_0); methods += new qt_gsi::GenericMethod ("maximumDigitalZoom", "@hide", true, &_init_cbs_maximumDigitalZoom_c0_0, &_call_cbs_maximumDigitalZoom_c0_0, &_set_callback_cbs_maximumDigitalZoom_c0_0); - methods += new qt_gsi::GenericMethod ("emit_maximumDigitalZoomChanged", "@brief Emitter for signal void QCameraZoomControl::maximumDigitalZoomChanged(double)\nCall this method to emit this signal.", false, &_init_emitter_maximumDigitalZoomChanged_1071, &_call_emitter_maximumDigitalZoomChanged_1071); methods += new qt_gsi::GenericMethod ("maximumOpticalZoom", "@brief Virtual method double QCameraZoomControl::maximumOpticalZoom()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_maximumOpticalZoom_c0_0, &_call_cbs_maximumOpticalZoom_c0_0); methods += new qt_gsi::GenericMethod ("maximumOpticalZoom", "@hide", true, &_init_cbs_maximumOpticalZoom_c0_0, &_call_cbs_maximumOpticalZoom_c0_0, &_set_callback_cbs_maximumOpticalZoom_c0_0); - methods += new qt_gsi::GenericMethod ("emit_maximumOpticalZoomChanged", "@brief Emitter for signal void QCameraZoomControl::maximumOpticalZoomChanged(double)\nCall this method to emit this signal.", false, &_init_emitter_maximumOpticalZoomChanged_1071, &_call_emitter_maximumOpticalZoomChanged_1071); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QCameraZoomControl::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("requestedDigitalZoom", "@brief Virtual method double QCameraZoomControl::requestedDigitalZoom()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_requestedDigitalZoom_c0_0, &_call_cbs_requestedDigitalZoom_c0_0); methods += new qt_gsi::GenericMethod ("requestedDigitalZoom", "@hide", true, &_init_cbs_requestedDigitalZoom_c0_0, &_call_cbs_requestedDigitalZoom_c0_0, &_set_callback_cbs_requestedDigitalZoom_c0_0); - methods += new qt_gsi::GenericMethod ("emit_requestedDigitalZoomChanged", "@brief Emitter for signal void QCameraZoomControl::requestedDigitalZoomChanged(double digitalZoom)\nCall this method to emit this signal.", false, &_init_emitter_requestedDigitalZoomChanged_1071, &_call_emitter_requestedDigitalZoomChanged_1071); methods += new qt_gsi::GenericMethod ("requestedOpticalZoom", "@brief Virtual method double QCameraZoomControl::requestedOpticalZoom()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_requestedOpticalZoom_c0_0, &_call_cbs_requestedOpticalZoom_c0_0); methods += new qt_gsi::GenericMethod ("requestedOpticalZoom", "@hide", true, &_init_cbs_requestedOpticalZoom_c0_0, &_call_cbs_requestedOpticalZoom_c0_0, &_set_callback_cbs_requestedOpticalZoom_c0_0); - methods += new qt_gsi::GenericMethod ("emit_requestedOpticalZoomChanged", "@brief Emitter for signal void QCameraZoomControl::requestedOpticalZoomChanged(double opticalZoom)\nCall this method to emit this signal.", false, &_init_emitter_requestedOpticalZoomChanged_1071, &_call_emitter_requestedOpticalZoomChanged_1071); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QCameraZoomControl::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QCameraZoomControl::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); methods += new qt_gsi::GenericMethod ("*timerEvent", "@brief Virtual method void QCameraZoomControl::timerEvent(QTimerEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_timerEvent_1730_0, &_call_cbs_timerEvent_1730_0); diff --git a/src/gsiqt/qt5/QtMultimedia/gsiDeclQGraphicsVideoItem.cc b/src/gsiqt/qt5/QtMultimedia/gsiDeclQGraphicsVideoItem.cc index 49ad88473..b7a7ac763 100644 --- a/src/gsiqt/qt5/QtMultimedia/gsiDeclQGraphicsVideoItem.cc +++ b/src/gsiqt/qt5/QtMultimedia/gsiDeclQGraphicsVideoItem.cc @@ -143,6 +143,26 @@ static void _call_f_nativeSize_c0 (const qt_gsi::GenericMethod * /*decl*/, void } +// void QGraphicsVideoItem::nativeSizeChanged(const QSizeF &size) + + +static void _init_f_nativeSizeChanged_1875 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("size"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_nativeSizeChanged_1875 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QSizeF &arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QGraphicsVideoItem *)cls)->nativeSizeChanged (arg1); +} + + // QPointF QGraphicsVideoItem::offset() @@ -364,26 +384,13 @@ static gsi::Methods methods_QGraphicsVideoItem () { methods += new qt_gsi::GenericMethod ("boundingRect", "@brief Method QRectF QGraphicsVideoItem::boundingRect()\nThis is a reimplementation of QGraphicsItem::boundingRect", true, &_init_f_boundingRect_c0, &_call_f_boundingRect_c0); methods += new qt_gsi::GenericMethod (":mediaObject", "@brief Method QMediaObject *QGraphicsVideoItem::mediaObject()\nThis is a reimplementation of QMediaBindableInterface::mediaObject", true, &_init_f_mediaObject_c0, &_call_f_mediaObject_c0); methods += new qt_gsi::GenericMethod (":nativeSize", "@brief Method QSizeF QGraphicsVideoItem::nativeSize()\n", true, &_init_f_nativeSize_c0, &_call_f_nativeSize_c0); + methods += new qt_gsi::GenericMethod ("nativeSizeChanged", "@brief Method void QGraphicsVideoItem::nativeSizeChanged(const QSizeF &size)\n", false, &_init_f_nativeSizeChanged_1875, &_call_f_nativeSizeChanged_1875); methods += new qt_gsi::GenericMethod (":offset", "@brief Method QPointF QGraphicsVideoItem::offset()\n", true, &_init_f_offset_c0, &_call_f_offset_c0); methods += new qt_gsi::GenericMethod ("paint", "@brief Method void QGraphicsVideoItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)\nThis is a reimplementation of QGraphicsItem::paint", false, &_init_f_paint_6301, &_call_f_paint_6301); methods += new qt_gsi::GenericMethod ("setAspectRatioMode|aspectRatioMode=", "@brief Method void QGraphicsVideoItem::setAspectRatioMode(Qt::AspectRatioMode mode)\n", false, &_init_f_setAspectRatioMode_2257, &_call_f_setAspectRatioMode_2257); methods += new qt_gsi::GenericMethod ("setOffset|offset=", "@brief Method void QGraphicsVideoItem::setOffset(const QPointF &offset)\n", false, &_init_f_setOffset_1986, &_call_f_setOffset_1986); methods += new qt_gsi::GenericMethod ("setSize|size=", "@brief Method void QGraphicsVideoItem::setSize(const QSizeF &size)\n", false, &_init_f_setSize_1875, &_call_f_setSize_1875); methods += new qt_gsi::GenericMethod (":size", "@brief Method QSizeF QGraphicsVideoItem::size()\n", true, &_init_f_size_c0, &_call_f_size_c0); - methods += gsi::qt_signal ("childrenChanged()", "childrenChanged", "@brief Signal declaration for QGraphicsVideoItem::childrenChanged()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QGraphicsVideoItem::destroyed(QObject *)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("enabledChanged()", "enabledChanged", "@brief Signal declaration for QGraphicsVideoItem::enabledChanged()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("heightChanged()", "heightChanged", "@brief Signal declaration for QGraphicsVideoItem::heightChanged()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("nativeSizeChanged(const QSizeF &)", "nativeSizeChanged", gsi::arg("size"), "@brief Signal declaration for QGraphicsVideoItem::nativeSizeChanged(const QSizeF &size)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("opacityChanged()", "opacityChanged", "@brief Signal declaration for QGraphicsVideoItem::opacityChanged()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("parentChanged()", "parentChanged", "@brief Signal declaration for QGraphicsVideoItem::parentChanged()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("rotationChanged()", "rotationChanged", "@brief Signal declaration for QGraphicsVideoItem::rotationChanged()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("scaleChanged()", "scaleChanged", "@brief Signal declaration for QGraphicsVideoItem::scaleChanged()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("visibleChanged()", "visibleChanged", "@brief Signal declaration for QGraphicsVideoItem::visibleChanged()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("widthChanged()", "widthChanged", "@brief Signal declaration for QGraphicsVideoItem::widthChanged()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("xChanged()", "xChanged", "@brief Signal declaration for QGraphicsVideoItem::xChanged()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("yChanged()", "yChanged", "@brief Signal declaration for QGraphicsVideoItem::yChanged()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("zChanged()", "zChanged", "@brief Signal declaration for QGraphicsVideoItem::zChanged()\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QGraphicsVideoItem::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QGraphicsVideoItem::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); methods += new qt_gsi::GenericMethod ("asQGraphicsObject", "@brief Delivers the base class interface QGraphicsObject of QGraphicsVideoItem\nClass QGraphicsVideoItem is derived from multiple base classes. This method delivers the QGraphicsObject base class aspect.", false, &_init_f_QGraphicsVideoItem_as_QGraphicsObject, &_call_f_QGraphicsVideoItem_as_QGraphicsObject); @@ -492,12 +499,6 @@ public: } } - // [emitter impl] void QGraphicsVideoItem::childrenChanged() - void emitter_QGraphicsVideoItem_childrenChanged_0() - { - emit QGraphicsVideoItem::childrenChanged(); - } - // [adaptor impl] bool QGraphicsVideoItem::collidesWithItem(const QGraphicsItem *other, Qt::ItemSelectionMode mode) bool cbs_collidesWithItem_c4977_1(const QGraphicsItem *other, const qt_gsi::Converter::target_type & mode) const { @@ -543,18 +544,6 @@ public: } } - // [emitter impl] void QGraphicsVideoItem::destroyed(QObject *) - void emitter_QGraphicsVideoItem_destroyed_1302(QObject *arg1) - { - emit QGraphicsVideoItem::destroyed(arg1); - } - - // [emitter impl] void QGraphicsVideoItem::enabledChanged() - void emitter_QGraphicsVideoItem_enabledChanged_0() - { - emit QGraphicsVideoItem::enabledChanged(); - } - // [adaptor impl] bool QGraphicsVideoItem::eventFilter(QObject *, QEvent *) bool cbs_eventFilter_2411_0(QObject *arg1, QEvent *arg2) { @@ -570,12 +559,6 @@ public: } } - // [emitter impl] void QGraphicsVideoItem::heightChanged() - void emitter_QGraphicsVideoItem_heightChanged_0() - { - emit QGraphicsVideoItem::heightChanged(); - } - // [adaptor impl] bool QGraphicsVideoItem::isObscuredBy(const QGraphicsItem *item) bool cbs_isObscuredBy_c2614_0(const QGraphicsItem *item) const { @@ -606,18 +589,6 @@ public: } } - // [emitter impl] void QGraphicsVideoItem::nativeSizeChanged(const QSizeF &size) - void emitter_QGraphicsVideoItem_nativeSizeChanged_1875(const QSizeF &size) - { - emit QGraphicsVideoItem::nativeSizeChanged(size); - } - - // [emitter impl] void QGraphicsVideoItem::opacityChanged() - void emitter_QGraphicsVideoItem_opacityChanged_0() - { - emit QGraphicsVideoItem::opacityChanged(); - } - // [adaptor impl] QPainterPath QGraphicsVideoItem::opaqueArea() QPainterPath cbs_opaqueArea_c0_0() const { @@ -648,24 +619,6 @@ public: } } - // [emitter impl] void QGraphicsVideoItem::parentChanged() - void emitter_QGraphicsVideoItem_parentChanged_0() - { - emit QGraphicsVideoItem::parentChanged(); - } - - // [emitter impl] void QGraphicsVideoItem::rotationChanged() - void emitter_QGraphicsVideoItem_rotationChanged_0() - { - emit QGraphicsVideoItem::rotationChanged(); - } - - // [emitter impl] void QGraphicsVideoItem::scaleChanged() - void emitter_QGraphicsVideoItem_scaleChanged_0() - { - emit QGraphicsVideoItem::scaleChanged(); - } - // [adaptor impl] QPainterPath QGraphicsVideoItem::shape() QPainterPath cbs_shape_c0_0() const { @@ -696,36 +649,6 @@ public: } } - // [emitter impl] void QGraphicsVideoItem::visibleChanged() - void emitter_QGraphicsVideoItem_visibleChanged_0() - { - emit QGraphicsVideoItem::visibleChanged(); - } - - // [emitter impl] void QGraphicsVideoItem::widthChanged() - void emitter_QGraphicsVideoItem_widthChanged_0() - { - emit QGraphicsVideoItem::widthChanged(); - } - - // [emitter impl] void QGraphicsVideoItem::xChanged() - void emitter_QGraphicsVideoItem_xChanged_0() - { - emit QGraphicsVideoItem::xChanged(); - } - - // [emitter impl] void QGraphicsVideoItem::yChanged() - void emitter_QGraphicsVideoItem_yChanged_0() - { - emit QGraphicsVideoItem::yChanged(); - } - - // [emitter impl] void QGraphicsVideoItem::zChanged() - void emitter_QGraphicsVideoItem_zChanged_0() - { - emit QGraphicsVideoItem::zChanged(); - } - // [adaptor impl] void QGraphicsVideoItem::childEvent(QChildEvent *) void cbs_childEvent_1701_0(QChildEvent *arg1) { @@ -1338,20 +1261,6 @@ static void _set_callback_cbs_childEvent_1701_0 (void *cls, const gsi::Callback } -// emitter void QGraphicsVideoItem::childrenChanged() - -static void _init_emitter_childrenChanged_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_childrenChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QGraphicsVideoItem_Adaptor *)cls)->emitter_QGraphicsVideoItem_childrenChanged_0 (); -} - - // bool QGraphicsVideoItem::collidesWithItem(const QGraphicsItem *other, Qt::ItemSelectionMode mode) static void _init_cbs_collidesWithItem_c4977_1 (qt_gsi::GenericMethod *decl) @@ -1475,24 +1384,6 @@ static void _set_callback_cbs_customEvent_1217_0 (void *cls, const gsi::Callback } -// emitter void QGraphicsVideoItem::destroyed(QObject *) - -static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - ((QGraphicsVideoItem_Adaptor *)cls)->emitter_QGraphicsVideoItem_destroyed_1302 (arg1); -} - - // void QGraphicsVideoItem::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -1613,20 +1504,6 @@ static void _set_callback_cbs_dropEvent_3315_0 (void *cls, const gsi::Callback & } -// emitter void QGraphicsVideoItem::enabledChanged() - -static void _init_emitter_enabledChanged_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_enabledChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QGraphicsVideoItem_Adaptor *)cls)->emitter_QGraphicsVideoItem_enabledChanged_0 (); -} - - // bool QGraphicsVideoItem::event(QEvent *ev) static void _init_cbs_event_1217_0 (qt_gsi::GenericMethod *decl) @@ -1747,20 +1624,6 @@ static void _set_callback_cbs_focusOutEvent_1729_0 (void *cls, const gsi::Callba } -// emitter void QGraphicsVideoItem::heightChanged() - -static void _init_emitter_heightChanged_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_heightChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QGraphicsVideoItem_Adaptor *)cls)->emitter_QGraphicsVideoItem_heightChanged_0 (); -} - - // void QGraphicsVideoItem::hoverEnterEvent(QGraphicsSceneHoverEvent *event) static void _init_cbs_hoverEnterEvent_3044_0 (qt_gsi::GenericMethod *decl) @@ -2110,38 +1973,6 @@ static void _set_callback_cbs_mouseReleaseEvent_3049_0 (void *cls, const gsi::Ca } -// emitter void QGraphicsVideoItem::nativeSizeChanged(const QSizeF &size) - -static void _init_emitter_nativeSizeChanged_1875 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("size"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_nativeSizeChanged_1875 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const QSizeF &arg1 = gsi::arg_reader() (args, heap); - ((QGraphicsVideoItem_Adaptor *)cls)->emitter_QGraphicsVideoItem_nativeSizeChanged_1875 (arg1); -} - - -// emitter void QGraphicsVideoItem::opacityChanged() - -static void _init_emitter_opacityChanged_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_opacityChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QGraphicsVideoItem_Adaptor *)cls)->emitter_QGraphicsVideoItem_opacityChanged_0 (); -} - - // QPainterPath QGraphicsVideoItem::opaqueArea() static void _init_cbs_opaqueArea_c0_0 (qt_gsi::GenericMethod *decl) @@ -2191,20 +2022,6 @@ static void _set_callback_cbs_paint_6301_1 (void *cls, const gsi::Callback &cb) } -// emitter void QGraphicsVideoItem::parentChanged() - -static void _init_emitter_parentChanged_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_parentChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QGraphicsVideoItem_Adaptor *)cls)->emitter_QGraphicsVideoItem_parentChanged_0 (); -} - - // exposed void QGraphicsVideoItem::prepareGeometryChange() static void _init_fp_prepareGeometryChange_0 (qt_gsi::GenericMethod *decl) @@ -2253,34 +2070,6 @@ static void _call_fp_removeFromIndex_0 (const qt_gsi::GenericMethod * /*decl*/, } -// emitter void QGraphicsVideoItem::rotationChanged() - -static void _init_emitter_rotationChanged_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_rotationChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QGraphicsVideoItem_Adaptor *)cls)->emitter_QGraphicsVideoItem_rotationChanged_0 (); -} - - -// emitter void QGraphicsVideoItem::scaleChanged() - -static void _init_emitter_scaleChanged_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_scaleChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QGraphicsVideoItem_Adaptor *)cls)->emitter_QGraphicsVideoItem_scaleChanged_0 (); -} - - // bool QGraphicsVideoItem::sceneEvent(QEvent *event) static void _init_cbs_sceneEvent_1217_0 (qt_gsi::GenericMethod *decl) @@ -2508,20 +2297,6 @@ static void _call_fp_updateMicroFocus_0 (const qt_gsi::GenericMethod * /*decl*/, } -// emitter void QGraphicsVideoItem::visibleChanged() - -static void _init_emitter_visibleChanged_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_visibleChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QGraphicsVideoItem_Adaptor *)cls)->emitter_QGraphicsVideoItem_visibleChanged_0 (); -} - - // void QGraphicsVideoItem::wheelEvent(QGraphicsSceneWheelEvent *event) static void _init_cbs_wheelEvent_3029_0 (qt_gsi::GenericMethod *decl) @@ -2546,62 +2321,6 @@ static void _set_callback_cbs_wheelEvent_3029_0 (void *cls, const gsi::Callback } -// emitter void QGraphicsVideoItem::widthChanged() - -static void _init_emitter_widthChanged_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_widthChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QGraphicsVideoItem_Adaptor *)cls)->emitter_QGraphicsVideoItem_widthChanged_0 (); -} - - -// emitter void QGraphicsVideoItem::xChanged() - -static void _init_emitter_xChanged_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_xChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QGraphicsVideoItem_Adaptor *)cls)->emitter_QGraphicsVideoItem_xChanged_0 (); -} - - -// emitter void QGraphicsVideoItem::yChanged() - -static void _init_emitter_yChanged_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_yChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QGraphicsVideoItem_Adaptor *)cls)->emitter_QGraphicsVideoItem_yChanged_0 (); -} - - -// emitter void QGraphicsVideoItem::zChanged() - -static void _init_emitter_zChanged_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_zChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QGraphicsVideoItem_Adaptor *)cls)->emitter_QGraphicsVideoItem_zChanged_0 (); -} - - namespace gsi { @@ -2617,7 +2336,6 @@ static gsi::Methods methods_QGraphicsVideoItem_Adaptor () { methods += new qt_gsi::GenericMethod ("boundingRect", "@hide", true, &_init_cbs_boundingRect_c0_0, &_call_cbs_boundingRect_c0_0, &_set_callback_cbs_boundingRect_c0_0); methods += new qt_gsi::GenericMethod ("*childEvent", "@brief Virtual method void QGraphicsVideoItem::childEvent(QChildEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); - methods += new qt_gsi::GenericMethod ("emit_childrenChanged", "@brief Emitter for signal void QGraphicsVideoItem::childrenChanged()\nCall this method to emit this signal.", false, &_init_emitter_childrenChanged_0, &_call_emitter_childrenChanged_0); methods += new qt_gsi::GenericMethod ("collidesWithItem", "@brief Virtual method bool QGraphicsVideoItem::collidesWithItem(const QGraphicsItem *other, Qt::ItemSelectionMode mode)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_collidesWithItem_c4977_1, &_call_cbs_collidesWithItem_c4977_1); methods += new qt_gsi::GenericMethod ("collidesWithItem", "@hide", true, &_init_cbs_collidesWithItem_c4977_1, &_call_cbs_collidesWithItem_c4977_1, &_set_callback_cbs_collidesWithItem_c4977_1); methods += new qt_gsi::GenericMethod ("collidesWithPath", "@brief Virtual method bool QGraphicsVideoItem::collidesWithPath(const QPainterPath &path, Qt::ItemSelectionMode mode)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_collidesWithPath_c4877_1, &_call_cbs_collidesWithPath_c4877_1); @@ -2628,7 +2346,6 @@ static gsi::Methods methods_QGraphicsVideoItem_Adaptor () { methods += new qt_gsi::GenericMethod ("*contextMenuEvent", "@hide", false, &_init_cbs_contextMenuEvent_3674_0, &_call_cbs_contextMenuEvent_3674_0, &_set_callback_cbs_contextMenuEvent_3674_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QGraphicsVideoItem::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); - methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QGraphicsVideoItem::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QGraphicsVideoItem::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*dragEnterEvent", "@brief Virtual method void QGraphicsVideoItem::dragEnterEvent(QGraphicsSceneDragDropEvent *event)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_dragEnterEvent_3315_0, &_call_cbs_dragEnterEvent_3315_0); @@ -2639,7 +2356,6 @@ static gsi::Methods methods_QGraphicsVideoItem_Adaptor () { methods += new qt_gsi::GenericMethod ("*dragMoveEvent", "@hide", false, &_init_cbs_dragMoveEvent_3315_0, &_call_cbs_dragMoveEvent_3315_0, &_set_callback_cbs_dragMoveEvent_3315_0); methods += new qt_gsi::GenericMethod ("*dropEvent", "@brief Virtual method void QGraphicsVideoItem::dropEvent(QGraphicsSceneDragDropEvent *event)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_dropEvent_3315_0, &_call_cbs_dropEvent_3315_0); methods += new qt_gsi::GenericMethod ("*dropEvent", "@hide", false, &_init_cbs_dropEvent_3315_0, &_call_cbs_dropEvent_3315_0, &_set_callback_cbs_dropEvent_3315_0); - methods += new qt_gsi::GenericMethod ("emit_enabledChanged", "@brief Emitter for signal void QGraphicsVideoItem::enabledChanged()\nCall this method to emit this signal.", false, &_init_emitter_enabledChanged_0, &_call_emitter_enabledChanged_0); methods += new qt_gsi::GenericMethod ("*event", "@brief Virtual method bool QGraphicsVideoItem::event(QEvent *ev)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0); methods += new qt_gsi::GenericMethod ("*event", "@hide", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0, &_set_callback_cbs_event_1217_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QGraphicsVideoItem::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); @@ -2650,7 +2366,6 @@ static gsi::Methods methods_QGraphicsVideoItem_Adaptor () { methods += new qt_gsi::GenericMethod ("*focusInEvent", "@hide", false, &_init_cbs_focusInEvent_1729_0, &_call_cbs_focusInEvent_1729_0, &_set_callback_cbs_focusInEvent_1729_0); methods += new qt_gsi::GenericMethod ("*focusOutEvent", "@brief Virtual method void QGraphicsVideoItem::focusOutEvent(QFocusEvent *event)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_focusOutEvent_1729_0, &_call_cbs_focusOutEvent_1729_0); methods += new qt_gsi::GenericMethod ("*focusOutEvent", "@hide", false, &_init_cbs_focusOutEvent_1729_0, &_call_cbs_focusOutEvent_1729_0, &_set_callback_cbs_focusOutEvent_1729_0); - methods += new qt_gsi::GenericMethod ("emit_heightChanged", "@brief Emitter for signal void QGraphicsVideoItem::heightChanged()\nCall this method to emit this signal.", false, &_init_emitter_heightChanged_0, &_call_emitter_heightChanged_0); methods += new qt_gsi::GenericMethod ("*hoverEnterEvent", "@brief Virtual method void QGraphicsVideoItem::hoverEnterEvent(QGraphicsSceneHoverEvent *event)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_hoverEnterEvent_3044_0, &_call_cbs_hoverEnterEvent_3044_0); methods += new qt_gsi::GenericMethod ("*hoverEnterEvent", "@hide", false, &_init_cbs_hoverEnterEvent_3044_0, &_call_cbs_hoverEnterEvent_3044_0, &_set_callback_cbs_hoverEnterEvent_3044_0); methods += new qt_gsi::GenericMethod ("*hoverLeaveEvent", "@brief Virtual method void QGraphicsVideoItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_hoverLeaveEvent_3044_0, &_call_cbs_hoverLeaveEvent_3044_0); @@ -2680,18 +2395,13 @@ static gsi::Methods methods_QGraphicsVideoItem_Adaptor () { methods += new qt_gsi::GenericMethod ("*mousePressEvent", "@hide", false, &_init_cbs_mousePressEvent_3049_0, &_call_cbs_mousePressEvent_3049_0, &_set_callback_cbs_mousePressEvent_3049_0); methods += new qt_gsi::GenericMethod ("*mouseReleaseEvent", "@brief Virtual method void QGraphicsVideoItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_mouseReleaseEvent_3049_0, &_call_cbs_mouseReleaseEvent_3049_0); methods += new qt_gsi::GenericMethod ("*mouseReleaseEvent", "@hide", false, &_init_cbs_mouseReleaseEvent_3049_0, &_call_cbs_mouseReleaseEvent_3049_0, &_set_callback_cbs_mouseReleaseEvent_3049_0); - methods += new qt_gsi::GenericMethod ("emit_nativeSizeChanged", "@brief Emitter for signal void QGraphicsVideoItem::nativeSizeChanged(const QSizeF &size)\nCall this method to emit this signal.", false, &_init_emitter_nativeSizeChanged_1875, &_call_emitter_nativeSizeChanged_1875); - methods += new qt_gsi::GenericMethod ("emit_opacityChanged", "@brief Emitter for signal void QGraphicsVideoItem::opacityChanged()\nCall this method to emit this signal.", false, &_init_emitter_opacityChanged_0, &_call_emitter_opacityChanged_0); methods += new qt_gsi::GenericMethod ("opaqueArea", "@brief Virtual method QPainterPath QGraphicsVideoItem::opaqueArea()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_opaqueArea_c0_0, &_call_cbs_opaqueArea_c0_0); methods += new qt_gsi::GenericMethod ("opaqueArea", "@hide", true, &_init_cbs_opaqueArea_c0_0, &_call_cbs_opaqueArea_c0_0, &_set_callback_cbs_opaqueArea_c0_0); methods += new qt_gsi::GenericMethod ("paint", "@brief Virtual method void QGraphicsVideoItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_paint_6301_1, &_call_cbs_paint_6301_1); methods += new qt_gsi::GenericMethod ("paint", "@hide", false, &_init_cbs_paint_6301_1, &_call_cbs_paint_6301_1, &_set_callback_cbs_paint_6301_1); - methods += new qt_gsi::GenericMethod ("emit_parentChanged", "@brief Emitter for signal void QGraphicsVideoItem::parentChanged()\nCall this method to emit this signal.", false, &_init_emitter_parentChanged_0, &_call_emitter_parentChanged_0); methods += new qt_gsi::GenericMethod ("*prepareGeometryChange", "@brief Method void QGraphicsVideoItem::prepareGeometryChange()\nThis method is protected and can only be called from inside a derived class.", false, &_init_fp_prepareGeometryChange_0, &_call_fp_prepareGeometryChange_0); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QGraphicsVideoItem::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*removeFromIndex", "@brief Method void QGraphicsVideoItem::removeFromIndex()\nThis method is protected and can only be called from inside a derived class.", false, &_init_fp_removeFromIndex_0, &_call_fp_removeFromIndex_0); - methods += new qt_gsi::GenericMethod ("emit_rotationChanged", "@brief Emitter for signal void QGraphicsVideoItem::rotationChanged()\nCall this method to emit this signal.", false, &_init_emitter_rotationChanged_0, &_call_emitter_rotationChanged_0); - methods += new qt_gsi::GenericMethod ("emit_scaleChanged", "@brief Emitter for signal void QGraphicsVideoItem::scaleChanged()\nCall this method to emit this signal.", false, &_init_emitter_scaleChanged_0, &_call_emitter_scaleChanged_0); methods += new qt_gsi::GenericMethod ("*sceneEvent", "@brief Virtual method bool QGraphicsVideoItem::sceneEvent(QEvent *event)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_sceneEvent_1217_0, &_call_cbs_sceneEvent_1217_0); methods += new qt_gsi::GenericMethod ("*sceneEvent", "@hide", false, &_init_cbs_sceneEvent_1217_0, &_call_cbs_sceneEvent_1217_0, &_set_callback_cbs_sceneEvent_1217_0); methods += new qt_gsi::GenericMethod ("*sceneEventFilter", "@brief Virtual method bool QGraphicsVideoItem::sceneEventFilter(QGraphicsItem *watched, QEvent *event)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_sceneEventFilter_3028_0, &_call_cbs_sceneEventFilter_3028_0); @@ -2711,13 +2421,8 @@ static gsi::Methods methods_QGraphicsVideoItem_Adaptor () { methods += new qt_gsi::GenericMethod ("type", "@brief Virtual method int QGraphicsVideoItem::type()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_type_c0_0, &_call_cbs_type_c0_0); methods += new qt_gsi::GenericMethod ("type", "@hide", true, &_init_cbs_type_c0_0, &_call_cbs_type_c0_0, &_set_callback_cbs_type_c0_0); methods += new qt_gsi::GenericMethod ("*updateMicroFocus", "@brief Method void QGraphicsVideoItem::updateMicroFocus()\nThis method is protected and can only be called from inside a derived class.", false, &_init_fp_updateMicroFocus_0, &_call_fp_updateMicroFocus_0); - methods += new qt_gsi::GenericMethod ("emit_visibleChanged", "@brief Emitter for signal void QGraphicsVideoItem::visibleChanged()\nCall this method to emit this signal.", false, &_init_emitter_visibleChanged_0, &_call_emitter_visibleChanged_0); methods += new qt_gsi::GenericMethod ("*wheelEvent", "@brief Virtual method void QGraphicsVideoItem::wheelEvent(QGraphicsSceneWheelEvent *event)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_wheelEvent_3029_0, &_call_cbs_wheelEvent_3029_0); methods += new qt_gsi::GenericMethod ("*wheelEvent", "@hide", false, &_init_cbs_wheelEvent_3029_0, &_call_cbs_wheelEvent_3029_0, &_set_callback_cbs_wheelEvent_3029_0); - methods += new qt_gsi::GenericMethod ("emit_widthChanged", "@brief Emitter for signal void QGraphicsVideoItem::widthChanged()\nCall this method to emit this signal.", false, &_init_emitter_widthChanged_0, &_call_emitter_widthChanged_0); - methods += new qt_gsi::GenericMethod ("emit_xChanged", "@brief Emitter for signal void QGraphicsVideoItem::xChanged()\nCall this method to emit this signal.", false, &_init_emitter_xChanged_0, &_call_emitter_xChanged_0); - methods += new qt_gsi::GenericMethod ("emit_yChanged", "@brief Emitter for signal void QGraphicsVideoItem::yChanged()\nCall this method to emit this signal.", false, &_init_emitter_yChanged_0, &_call_emitter_yChanged_0); - methods += new qt_gsi::GenericMethod ("emit_zChanged", "@brief Emitter for signal void QGraphicsVideoItem::zChanged()\nCall this method to emit this signal.", false, &_init_emitter_zChanged_0, &_call_emitter_zChanged_0); return methods; } diff --git a/src/gsiqt/qt5/QtMultimedia/gsiDeclQImageEncoderControl.cc b/src/gsiqt/qt5/QtMultimedia/gsiDeclQImageEncoderControl.cc index 9ce12d8d9..fc08640f2 100644 --- a/src/gsiqt/qt5/QtMultimedia/gsiDeclQImageEncoderControl.cc +++ b/src/gsiqt/qt5/QtMultimedia/gsiDeclQImageEncoderControl.cc @@ -209,7 +209,6 @@ static gsi::Methods methods_QImageEncoderControl () { methods += new qt_gsi::GenericMethod ("setImageSettings|imageSettings=", "@brief Method void QImageEncoderControl::setImageSettings(const QImageEncoderSettings &settings)\n", false, &_init_f_setImageSettings_3430, &_call_f_setImageSettings_3430); methods += new qt_gsi::GenericMethod ("supportedImageCodecs", "@brief Method QStringList QImageEncoderControl::supportedImageCodecs()\n", true, &_init_f_supportedImageCodecs_c0, &_call_f_supportedImageCodecs_c0); methods += new qt_gsi::GenericMethod ("supportedResolutions", "@brief Method QList QImageEncoderControl::supportedResolutions(const QImageEncoderSettings &settings, bool *continuous)\n", true, &_init_f_supportedResolutions_c4372, &_call_f_supportedResolutions_c4372); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QImageEncoderControl::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QImageEncoderControl::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QImageEncoderControl::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -258,12 +257,6 @@ public: return QImageEncoderControl::senderSignalIndex(); } - // [emitter impl] void QImageEncoderControl::destroyed(QObject *) - void emitter_QImageEncoderControl_destroyed_1302(QObject *arg1) - { - emit QImageEncoderControl::destroyed(arg1); - } - // [adaptor impl] bool QImageEncoderControl::event(QEvent *) bool cbs_event_1217_0(QEvent *arg1) { @@ -510,24 +503,6 @@ static void _set_callback_cbs_customEvent_1217_0 (void *cls, const gsi::Callback } -// emitter void QImageEncoderControl::destroyed(QObject *) - -static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - ((QImageEncoderControl_Adaptor *)cls)->emitter_QImageEncoderControl_destroyed_1302 (arg1); -} - - // void QImageEncoderControl::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -812,7 +787,6 @@ static gsi::Methods methods_QImageEncoderControl_Adaptor () { methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QImageEncoderControl::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); - methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QImageEncoderControl::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QImageEncoderControl::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("event", "@brief Virtual method bool QImageEncoderControl::event(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0); diff --git a/src/gsiqt/qt5/QtMultimedia/gsiDeclQMediaAudioProbeControl.cc b/src/gsiqt/qt5/QtMultimedia/gsiDeclQMediaAudioProbeControl.cc index 90e2959ea..746b9733a 100644 --- a/src/gsiqt/qt5/QtMultimedia/gsiDeclQMediaAudioProbeControl.cc +++ b/src/gsiqt/qt5/QtMultimedia/gsiDeclQMediaAudioProbeControl.cc @@ -56,6 +56,42 @@ static void _call_smo (const qt_gsi::GenericStaticMethod *, gsi::SerialArgs &, g } +// void QMediaAudioProbeControl::audioBufferProbed(const QAudioBuffer &buffer) + + +static void _init_f_audioBufferProbed_2494 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("buffer"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_audioBufferProbed_2494 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QAudioBuffer &arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaAudioProbeControl *)cls)->audioBufferProbed (arg1); +} + + +// void QMediaAudioProbeControl::flush() + + +static void _init_f_flush_0 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_f_flush_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaAudioProbeControl *)cls)->flush (); +} + + // static QString QMediaAudioProbeControl::tr(const char *s, const char *c, int n) @@ -112,9 +148,8 @@ namespace gsi static gsi::Methods methods_QMediaAudioProbeControl () { gsi::Methods methods; methods += new qt_gsi::GenericStaticMethod ("staticMetaObject", "@brief Obtains the static MetaObject for this class.", &_init_smo, &_call_smo); - methods += gsi::qt_signal ("audioBufferProbed(const QAudioBuffer &)", "audioBufferProbed", gsi::arg("buffer"), "@brief Signal declaration for QMediaAudioProbeControl::audioBufferProbed(const QAudioBuffer &buffer)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QMediaAudioProbeControl::destroyed(QObject *)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("flush()", "flush", "@brief Signal declaration for QMediaAudioProbeControl::flush()\nYou can bind a procedure to this signal."); + methods += new qt_gsi::GenericMethod ("audioBufferProbed", "@brief Method void QMediaAudioProbeControl::audioBufferProbed(const QAudioBuffer &buffer)\n", false, &_init_f_audioBufferProbed_2494, &_call_f_audioBufferProbed_2494); + methods += new qt_gsi::GenericMethod ("flush", "@brief Method void QMediaAudioProbeControl::flush()\n", false, &_init_f_flush_0, &_call_f_flush_0); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QMediaAudioProbeControl::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QMediaAudioProbeControl::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -157,18 +192,6 @@ public: return QMediaAudioProbeControl::senderSignalIndex(); } - // [emitter impl] void QMediaAudioProbeControl::audioBufferProbed(const QAudioBuffer &buffer) - void emitter_QMediaAudioProbeControl_audioBufferProbed_2494(const QAudioBuffer &buffer) - { - emit QMediaAudioProbeControl::audioBufferProbed(buffer); - } - - // [emitter impl] void QMediaAudioProbeControl::destroyed(QObject *) - void emitter_QMediaAudioProbeControl_destroyed_1302(QObject *arg1) - { - emit QMediaAudioProbeControl::destroyed(arg1); - } - // [adaptor impl] bool QMediaAudioProbeControl::event(QEvent *) bool cbs_event_1217_0(QEvent *arg1) { @@ -199,12 +222,6 @@ public: } } - // [emitter impl] void QMediaAudioProbeControl::flush() - void emitter_QMediaAudioProbeControl_flush_0() - { - emit QMediaAudioProbeControl::flush(); - } - // [adaptor impl] void QMediaAudioProbeControl::childEvent(QChildEvent *) void cbs_childEvent_1701_0(QChildEvent *arg1) { @@ -275,24 +292,6 @@ public: QMediaAudioProbeControl_Adaptor::~QMediaAudioProbeControl_Adaptor() { } -// emitter void QMediaAudioProbeControl::audioBufferProbed(const QAudioBuffer &buffer) - -static void _init_emitter_audioBufferProbed_2494 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("buffer"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_audioBufferProbed_2494 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const QAudioBuffer &arg1 = gsi::arg_reader() (args, heap); - ((QMediaAudioProbeControl_Adaptor *)cls)->emitter_QMediaAudioProbeControl_audioBufferProbed_2494 (arg1); -} - - // void QMediaAudioProbeControl::childEvent(QChildEvent *) static void _init_cbs_childEvent_1701_0 (qt_gsi::GenericMethod *decl) @@ -341,24 +340,6 @@ static void _set_callback_cbs_customEvent_1217_0 (void *cls, const gsi::Callback } -// emitter void QMediaAudioProbeControl::destroyed(QObject *) - -static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - ((QMediaAudioProbeControl_Adaptor *)cls)->emitter_QMediaAudioProbeControl_destroyed_1302 (arg1); -} - - // void QMediaAudioProbeControl::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -432,20 +413,6 @@ static void _set_callback_cbs_eventFilter_2411_0 (void *cls, const gsi::Callback } -// emitter void QMediaAudioProbeControl::flush() - -static void _init_emitter_flush_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_flush_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QMediaAudioProbeControl_Adaptor *)cls)->emitter_QMediaAudioProbeControl_flush_0 (); -} - - // exposed bool QMediaAudioProbeControl::isSignalConnected(const QMetaMethod &signal) static void _init_fp_isSignalConnected_c2394 (qt_gsi::GenericMethod *decl) @@ -541,19 +508,16 @@ gsi::Class &qtdecl_QMediaAudioProbeControl (); static gsi::Methods methods_QMediaAudioProbeControl_Adaptor () { gsi::Methods methods; - methods += new qt_gsi::GenericMethod ("emit_audioBufferProbed", "@brief Emitter for signal void QMediaAudioProbeControl::audioBufferProbed(const QAudioBuffer &buffer)\nCall this method to emit this signal.", false, &_init_emitter_audioBufferProbed_2494, &_call_emitter_audioBufferProbed_2494); methods += new qt_gsi::GenericMethod ("*childEvent", "@brief Virtual method void QMediaAudioProbeControl::childEvent(QChildEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QMediaAudioProbeControl::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); - methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QMediaAudioProbeControl::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QMediaAudioProbeControl::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("event", "@brief Virtual method bool QMediaAudioProbeControl::event(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0); methods += new qt_gsi::GenericMethod ("event", "@hide", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0, &_set_callback_cbs_event_1217_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QMediaAudioProbeControl::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); - methods += new qt_gsi::GenericMethod ("emit_flush", "@brief Emitter for signal void QMediaAudioProbeControl::flush()\nCall this method to emit this signal.", false, &_init_emitter_flush_0, &_call_emitter_flush_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QMediaAudioProbeControl::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QMediaAudioProbeControl::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QMediaAudioProbeControl::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); diff --git a/src/gsiqt/qt5/QtMultimedia/gsiDeclQMediaAvailabilityControl.cc b/src/gsiqt/qt5/QtMultimedia/gsiDeclQMediaAvailabilityControl.cc index 67007879c..bafe07965 100644 --- a/src/gsiqt/qt5/QtMultimedia/gsiDeclQMediaAvailabilityControl.cc +++ b/src/gsiqt/qt5/QtMultimedia/gsiDeclQMediaAvailabilityControl.cc @@ -70,6 +70,26 @@ static void _call_f_availability_c0 (const qt_gsi::GenericMethod * /*decl*/, voi } +// void QMediaAvailabilityControl::availabilityChanged(QMultimedia::AvailabilityStatus availability) + + +static void _init_f_availabilityChanged_3555 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("availability"); + decl->add_arg::target_type & > (argspec_0); + decl->set_return (); +} + +static void _call_f_availabilityChanged_3555 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaAvailabilityControl *)cls)->availabilityChanged (qt_gsi::QtToCppAdaptor(arg1).cref()); +} + + // static QString QMediaAvailabilityControl::tr(const char *s, const char *c, int n) @@ -127,8 +147,7 @@ static gsi::Methods methods_QMediaAvailabilityControl () { gsi::Methods methods; methods += new qt_gsi::GenericStaticMethod ("staticMetaObject", "@brief Obtains the static MetaObject for this class.", &_init_smo, &_call_smo); methods += new qt_gsi::GenericMethod ("availability", "@brief Method QMultimedia::AvailabilityStatus QMediaAvailabilityControl::availability()\n", true, &_init_f_availability_c0, &_call_f_availability_c0); - methods += gsi::qt_signal::target_type & > ("availabilityChanged(QMultimedia::AvailabilityStatus)", "availabilityChanged", gsi::arg("availability"), "@brief Signal declaration for QMediaAvailabilityControl::availabilityChanged(QMultimedia::AvailabilityStatus availability)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QMediaAvailabilityControl::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += new qt_gsi::GenericMethod ("availabilityChanged", "@brief Method void QMediaAvailabilityControl::availabilityChanged(QMultimedia::AvailabilityStatus availability)\n", false, &_init_f_availabilityChanged_3555, &_call_f_availabilityChanged_3555); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QMediaAvailabilityControl::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QMediaAvailabilityControl::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -192,18 +211,6 @@ public: } } - // [emitter impl] void QMediaAvailabilityControl::availabilityChanged(QMultimedia::AvailabilityStatus availability) - void emitter_QMediaAvailabilityControl_availabilityChanged_3555(QMultimedia::AvailabilityStatus availability) - { - emit QMediaAvailabilityControl::availabilityChanged(availability); - } - - // [emitter impl] void QMediaAvailabilityControl::destroyed(QObject *) - void emitter_QMediaAvailabilityControl_destroyed_1302(QObject *arg1) - { - emit QMediaAvailabilityControl::destroyed(arg1); - } - // [adaptor impl] bool QMediaAvailabilityControl::event(QEvent *) bool cbs_event_1217_0(QEvent *arg1) { @@ -338,24 +345,6 @@ static void _set_callback_cbs_availability_c0_0 (void *cls, const gsi::Callback } -// emitter void QMediaAvailabilityControl::availabilityChanged(QMultimedia::AvailabilityStatus availability) - -static void _init_emitter_availabilityChanged_3555 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("availability"); - decl->add_arg::target_type & > (argspec_0); - decl->set_return (); -} - -static void _call_emitter_availabilityChanged_3555 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); - ((QMediaAvailabilityControl_Adaptor *)cls)->emitter_QMediaAvailabilityControl_availabilityChanged_3555 (arg1); -} - - // void QMediaAvailabilityControl::childEvent(QChildEvent *) static void _init_cbs_childEvent_1701_0 (qt_gsi::GenericMethod *decl) @@ -404,24 +393,6 @@ static void _set_callback_cbs_customEvent_1217_0 (void *cls, const gsi::Callback } -// emitter void QMediaAvailabilityControl::destroyed(QObject *) - -static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - ((QMediaAvailabilityControl_Adaptor *)cls)->emitter_QMediaAvailabilityControl_destroyed_1302 (arg1); -} - - // void QMediaAvailabilityControl::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -593,12 +564,10 @@ static gsi::Methods methods_QMediaAvailabilityControl_Adaptor () { methods += new qt_gsi::GenericStaticMethod ("new", "@brief Constructor QMediaAvailabilityControl::QMediaAvailabilityControl()\nThis method creates an object of class QMediaAvailabilityControl.", &_init_ctor_QMediaAvailabilityControl_Adaptor_0, &_call_ctor_QMediaAvailabilityControl_Adaptor_0); methods += new qt_gsi::GenericMethod ("availability", "@brief Virtual method QMultimedia::AvailabilityStatus QMediaAvailabilityControl::availability()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_availability_c0_0, &_call_cbs_availability_c0_0); methods += new qt_gsi::GenericMethod ("availability", "@hide", true, &_init_cbs_availability_c0_0, &_call_cbs_availability_c0_0, &_set_callback_cbs_availability_c0_0); - methods += new qt_gsi::GenericMethod ("emit_availabilityChanged", "@brief Emitter for signal void QMediaAvailabilityControl::availabilityChanged(QMultimedia::AvailabilityStatus availability)\nCall this method to emit this signal.", false, &_init_emitter_availabilityChanged_3555, &_call_emitter_availabilityChanged_3555); methods += new qt_gsi::GenericMethod ("*childEvent", "@brief Virtual method void QMediaAvailabilityControl::childEvent(QChildEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QMediaAvailabilityControl::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); - methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QMediaAvailabilityControl::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QMediaAvailabilityControl::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("event", "@brief Virtual method bool QMediaAvailabilityControl::event(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0); diff --git a/src/gsiqt/qt5/QtMultimedia/gsiDeclQMediaContainerControl.cc b/src/gsiqt/qt5/QtMultimedia/gsiDeclQMediaContainerControl.cc index cdf6ec148..6e8062953 100644 --- a/src/gsiqt/qt5/QtMultimedia/gsiDeclQMediaContainerControl.cc +++ b/src/gsiqt/qt5/QtMultimedia/gsiDeclQMediaContainerControl.cc @@ -184,7 +184,6 @@ static gsi::Methods methods_QMediaContainerControl () { methods += new qt_gsi::GenericMethod (":containerFormat", "@brief Method QString QMediaContainerControl::containerFormat()\n", true, &_init_f_containerFormat_c0, &_call_f_containerFormat_c0); methods += new qt_gsi::GenericMethod ("setContainerFormat|containerFormat=", "@brief Method void QMediaContainerControl::setContainerFormat(const QString &format)\n", false, &_init_f_setContainerFormat_2025, &_call_f_setContainerFormat_2025); methods += new qt_gsi::GenericMethod ("supportedContainers", "@brief Method QStringList QMediaContainerControl::supportedContainers()\n", true, &_init_f_supportedContainers_c0, &_call_f_supportedContainers_c0); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QMediaContainerControl::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QMediaContainerControl::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QMediaContainerControl::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -264,12 +263,6 @@ public: } } - // [emitter impl] void QMediaContainerControl::destroyed(QObject *) - void emitter_QMediaContainerControl_destroyed_1302(QObject *arg1) - { - emit QMediaContainerControl::destroyed(arg1); - } - // [adaptor impl] bool QMediaContainerControl::event(QEvent *) bool cbs_event_1217_0(QEvent *arg1) { @@ -509,24 +502,6 @@ static void _set_callback_cbs_customEvent_1217_0 (void *cls, const gsi::Callback } -// emitter void QMediaContainerControl::destroyed(QObject *) - -static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - ((QMediaContainerControl_Adaptor *)cls)->emitter_QMediaContainerControl_destroyed_1302 (arg1); -} - - // void QMediaContainerControl::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -747,7 +722,6 @@ static gsi::Methods methods_QMediaContainerControl_Adaptor () { methods += new qt_gsi::GenericMethod ("containerFormat", "@hide", true, &_init_cbs_containerFormat_c0_0, &_call_cbs_containerFormat_c0_0, &_set_callback_cbs_containerFormat_c0_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QMediaContainerControl::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); - methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QMediaContainerControl::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QMediaContainerControl::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("event", "@brief Virtual method bool QMediaContainerControl::event(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0); diff --git a/src/gsiqt/qt5/QtMultimedia/gsiDeclQMediaControl.cc b/src/gsiqt/qt5/QtMultimedia/gsiDeclQMediaControl.cc index 83e664308..10d1e483c 100644 --- a/src/gsiqt/qt5/QtMultimedia/gsiDeclQMediaControl.cc +++ b/src/gsiqt/qt5/QtMultimedia/gsiDeclQMediaControl.cc @@ -111,7 +111,6 @@ namespace gsi static gsi::Methods methods_QMediaControl () { gsi::Methods methods; methods += new qt_gsi::GenericStaticMethod ("staticMetaObject", "@brief Obtains the static MetaObject for this class.", &_init_smo, &_call_smo); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QMediaControl::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QMediaControl::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QMediaControl::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -154,12 +153,6 @@ public: return QMediaControl::senderSignalIndex(); } - // [emitter impl] void QMediaControl::destroyed(QObject *) - void emitter_QMediaControl_destroyed_1302(QObject *arg1) - { - emit QMediaControl::destroyed(arg1); - } - // [adaptor impl] bool QMediaControl::event(QEvent *) bool cbs_event_1217_0(QEvent *arg1) { @@ -308,24 +301,6 @@ static void _set_callback_cbs_customEvent_1217_0 (void *cls, const gsi::Callback } -// emitter void QMediaControl::destroyed(QObject *) - -static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - ((QMediaControl_Adaptor *)cls)->emitter_QMediaControl_destroyed_1302 (arg1); -} - - // void QMediaControl::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -498,7 +473,6 @@ static gsi::Methods methods_QMediaControl_Adaptor () { methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QMediaControl::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); - methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QMediaControl::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QMediaControl::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("event", "@brief Virtual method bool QMediaControl::event(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0); diff --git a/src/gsiqt/qt5/QtMultimedia/gsiDeclQMediaGaplessPlaybackControl.cc b/src/gsiqt/qt5/QtMultimedia/gsiDeclQMediaGaplessPlaybackControl.cc index 9087c9692..2e3ea7d7b 100644 --- a/src/gsiqt/qt5/QtMultimedia/gsiDeclQMediaGaplessPlaybackControl.cc +++ b/src/gsiqt/qt5/QtMultimedia/gsiDeclQMediaGaplessPlaybackControl.cc @@ -56,6 +56,22 @@ static void _call_smo (const qt_gsi::GenericStaticMethod *, gsi::SerialArgs &, g } +// void QMediaGaplessPlaybackControl::advancedToNextMedia() + + +static void _init_f_advancedToNextMedia_0 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_f_advancedToNextMedia_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaGaplessPlaybackControl *)cls)->advancedToNextMedia (); +} + + // double QMediaGaplessPlaybackControl::crossfadeTime() @@ -71,6 +87,26 @@ static void _call_f_crossfadeTime_c0 (const qt_gsi::GenericMethod * /*decl*/, vo } +// void QMediaGaplessPlaybackControl::crossfadeTimeChanged(double crossfadeTime) + + +static void _init_f_crossfadeTimeChanged_1071 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("crossfadeTime"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_crossfadeTimeChanged_1071 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + double arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaGaplessPlaybackControl *)cls)->crossfadeTimeChanged (arg1); +} + + // bool QMediaGaplessPlaybackControl::isCrossfadeSupported() @@ -101,6 +137,26 @@ static void _call_f_nextMedia_c0 (const qt_gsi::GenericMethod * /*decl*/, void * } +// void QMediaGaplessPlaybackControl::nextMediaChanged(const QMediaContent &media) + + +static void _init_f_nextMediaChanged_2605 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("media"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_nextMediaChanged_2605 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QMediaContent &arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaGaplessPlaybackControl *)cls)->nextMediaChanged (arg1); +} + + // void QMediaGaplessPlaybackControl::setCrossfadeTime(double crossfadeTime) @@ -197,15 +253,14 @@ namespace gsi static gsi::Methods methods_QMediaGaplessPlaybackControl () { gsi::Methods methods; methods += new qt_gsi::GenericStaticMethod ("staticMetaObject", "@brief Obtains the static MetaObject for this class.", &_init_smo, &_call_smo); + methods += new qt_gsi::GenericMethod ("advancedToNextMedia", "@brief Method void QMediaGaplessPlaybackControl::advancedToNextMedia()\n", false, &_init_f_advancedToNextMedia_0, &_call_f_advancedToNextMedia_0); methods += new qt_gsi::GenericMethod (":crossfadeTime", "@brief Method double QMediaGaplessPlaybackControl::crossfadeTime()\n", true, &_init_f_crossfadeTime_c0, &_call_f_crossfadeTime_c0); + methods += new qt_gsi::GenericMethod ("crossfadeTimeChanged", "@brief Method void QMediaGaplessPlaybackControl::crossfadeTimeChanged(double crossfadeTime)\n", false, &_init_f_crossfadeTimeChanged_1071, &_call_f_crossfadeTimeChanged_1071); methods += new qt_gsi::GenericMethod ("isCrossfadeSupported?", "@brief Method bool QMediaGaplessPlaybackControl::isCrossfadeSupported()\n", true, &_init_f_isCrossfadeSupported_c0, &_call_f_isCrossfadeSupported_c0); methods += new qt_gsi::GenericMethod (":nextMedia", "@brief Method QMediaContent QMediaGaplessPlaybackControl::nextMedia()\n", true, &_init_f_nextMedia_c0, &_call_f_nextMedia_c0); + methods += new qt_gsi::GenericMethod ("nextMediaChanged", "@brief Method void QMediaGaplessPlaybackControl::nextMediaChanged(const QMediaContent &media)\n", false, &_init_f_nextMediaChanged_2605, &_call_f_nextMediaChanged_2605); methods += new qt_gsi::GenericMethod ("setCrossfadeTime|crossfadeTime=", "@brief Method void QMediaGaplessPlaybackControl::setCrossfadeTime(double crossfadeTime)\n", false, &_init_f_setCrossfadeTime_1071, &_call_f_setCrossfadeTime_1071); methods += new qt_gsi::GenericMethod ("setNextMedia|nextMedia=", "@brief Method void QMediaGaplessPlaybackControl::setNextMedia(const QMediaContent &media)\n", false, &_init_f_setNextMedia_2605, &_call_f_setNextMedia_2605); - methods += gsi::qt_signal ("advancedToNextMedia()", "advancedToNextMedia", "@brief Signal declaration for QMediaGaplessPlaybackControl::advancedToNextMedia()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("crossfadeTimeChanged(double)", "crossfadeTimeChanged", gsi::arg("crossfadeTime"), "@brief Signal declaration for QMediaGaplessPlaybackControl::crossfadeTimeChanged(double crossfadeTime)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QMediaGaplessPlaybackControl::destroyed(QObject *)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("nextMediaChanged(const QMediaContent &)", "nextMediaChanged", gsi::arg("media"), "@brief Signal declaration for QMediaGaplessPlaybackControl::nextMediaChanged(const QMediaContent &media)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QMediaGaplessPlaybackControl::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QMediaGaplessPlaybackControl::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -254,12 +309,6 @@ public: return QMediaGaplessPlaybackControl::senderSignalIndex(); } - // [emitter impl] void QMediaGaplessPlaybackControl::advancedToNextMedia() - void emitter_QMediaGaplessPlaybackControl_advancedToNextMedia_0() - { - emit QMediaGaplessPlaybackControl::advancedToNextMedia(); - } - // [adaptor impl] double QMediaGaplessPlaybackControl::crossfadeTime() double cbs_crossfadeTime_c0_0() const { @@ -275,18 +324,6 @@ public: } } - // [emitter impl] void QMediaGaplessPlaybackControl::crossfadeTimeChanged(double crossfadeTime) - void emitter_QMediaGaplessPlaybackControl_crossfadeTimeChanged_1071(double crossfadeTime) - { - emit QMediaGaplessPlaybackControl::crossfadeTimeChanged(crossfadeTime); - } - - // [emitter impl] void QMediaGaplessPlaybackControl::destroyed(QObject *) - void emitter_QMediaGaplessPlaybackControl_destroyed_1302(QObject *arg1) - { - emit QMediaGaplessPlaybackControl::destroyed(arg1); - } - // [adaptor impl] bool QMediaGaplessPlaybackControl::event(QEvent *) bool cbs_event_1217_0(QEvent *arg1) { @@ -347,12 +384,6 @@ public: } } - // [emitter impl] void QMediaGaplessPlaybackControl::nextMediaChanged(const QMediaContent &media) - void emitter_QMediaGaplessPlaybackControl_nextMediaChanged_2605(const QMediaContent &media) - { - emit QMediaGaplessPlaybackControl::nextMediaChanged(media); - } - // [adaptor impl] void QMediaGaplessPlaybackControl::setCrossfadeTime(double crossfadeTime) void cbs_setCrossfadeTime_1071_0(double crossfadeTime) { @@ -474,20 +505,6 @@ static void _call_ctor_QMediaGaplessPlaybackControl_Adaptor_0 (const qt_gsi::Gen } -// emitter void QMediaGaplessPlaybackControl::advancedToNextMedia() - -static void _init_emitter_advancedToNextMedia_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_advancedToNextMedia_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QMediaGaplessPlaybackControl_Adaptor *)cls)->emitter_QMediaGaplessPlaybackControl_advancedToNextMedia_0 (); -} - - // void QMediaGaplessPlaybackControl::childEvent(QChildEvent *) static void _init_cbs_childEvent_1701_0 (qt_gsi::GenericMethod *decl) @@ -531,24 +548,6 @@ static void _set_callback_cbs_crossfadeTime_c0_0 (void *cls, const gsi::Callback } -// emitter void QMediaGaplessPlaybackControl::crossfadeTimeChanged(double crossfadeTime) - -static void _init_emitter_crossfadeTimeChanged_1071 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("crossfadeTime"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_crossfadeTimeChanged_1071 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - double arg1 = gsi::arg_reader() (args, heap); - ((QMediaGaplessPlaybackControl_Adaptor *)cls)->emitter_QMediaGaplessPlaybackControl_crossfadeTimeChanged_1071 (arg1); -} - - // void QMediaGaplessPlaybackControl::customEvent(QEvent *) static void _init_cbs_customEvent_1217_0 (qt_gsi::GenericMethod *decl) @@ -573,24 +572,6 @@ static void _set_callback_cbs_customEvent_1217_0 (void *cls, const gsi::Callback } -// emitter void QMediaGaplessPlaybackControl::destroyed(QObject *) - -static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - ((QMediaGaplessPlaybackControl_Adaptor *)cls)->emitter_QMediaGaplessPlaybackControl_destroyed_1302 (arg1); -} - - // void QMediaGaplessPlaybackControl::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -720,24 +701,6 @@ static void _set_callback_cbs_nextMedia_c0_0 (void *cls, const gsi::Callback &cb } -// emitter void QMediaGaplessPlaybackControl::nextMediaChanged(const QMediaContent &media) - -static void _init_emitter_nextMediaChanged_2605 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("media"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_nextMediaChanged_2605 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const QMediaContent &arg1 = gsi::arg_reader() (args, heap); - ((QMediaGaplessPlaybackControl_Adaptor *)cls)->emitter_QMediaGaplessPlaybackControl_nextMediaChanged_2605 (arg1); -} - - // exposed int QMediaGaplessPlaybackControl::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -864,15 +827,12 @@ gsi::Class &qtdecl_QMediaGaplessPlaybackControl () static gsi::Methods methods_QMediaGaplessPlaybackControl_Adaptor () { gsi::Methods methods; methods += new qt_gsi::GenericStaticMethod ("new", "@brief Constructor QMediaGaplessPlaybackControl::QMediaGaplessPlaybackControl()\nThis method creates an object of class QMediaGaplessPlaybackControl.", &_init_ctor_QMediaGaplessPlaybackControl_Adaptor_0, &_call_ctor_QMediaGaplessPlaybackControl_Adaptor_0); - methods += new qt_gsi::GenericMethod ("emit_advancedToNextMedia", "@brief Emitter for signal void QMediaGaplessPlaybackControl::advancedToNextMedia()\nCall this method to emit this signal.", false, &_init_emitter_advancedToNextMedia_0, &_call_emitter_advancedToNextMedia_0); methods += new qt_gsi::GenericMethod ("*childEvent", "@brief Virtual method void QMediaGaplessPlaybackControl::childEvent(QChildEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("crossfadeTime", "@brief Virtual method double QMediaGaplessPlaybackControl::crossfadeTime()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_crossfadeTime_c0_0, &_call_cbs_crossfadeTime_c0_0); methods += new qt_gsi::GenericMethod ("crossfadeTime", "@hide", true, &_init_cbs_crossfadeTime_c0_0, &_call_cbs_crossfadeTime_c0_0, &_set_callback_cbs_crossfadeTime_c0_0); - methods += new qt_gsi::GenericMethod ("emit_crossfadeTimeChanged", "@brief Emitter for signal void QMediaGaplessPlaybackControl::crossfadeTimeChanged(double crossfadeTime)\nCall this method to emit this signal.", false, &_init_emitter_crossfadeTimeChanged_1071, &_call_emitter_crossfadeTimeChanged_1071); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QMediaGaplessPlaybackControl::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); - methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QMediaGaplessPlaybackControl::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QMediaGaplessPlaybackControl::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("event", "@brief Virtual method bool QMediaGaplessPlaybackControl::event(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0); @@ -884,7 +844,6 @@ static gsi::Methods methods_QMediaGaplessPlaybackControl_Adaptor () { methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QMediaGaplessPlaybackControl::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); methods += new qt_gsi::GenericMethod ("nextMedia", "@brief Virtual method QMediaContent QMediaGaplessPlaybackControl::nextMedia()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_nextMedia_c0_0, &_call_cbs_nextMedia_c0_0); methods += new qt_gsi::GenericMethod ("nextMedia", "@hide", true, &_init_cbs_nextMedia_c0_0, &_call_cbs_nextMedia_c0_0, &_set_callback_cbs_nextMedia_c0_0); - methods += new qt_gsi::GenericMethod ("emit_nextMediaChanged", "@brief Emitter for signal void QMediaGaplessPlaybackControl::nextMediaChanged(const QMediaContent &media)\nCall this method to emit this signal.", false, &_init_emitter_nextMediaChanged_2605, &_call_emitter_nextMediaChanged_2605); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QMediaGaplessPlaybackControl::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QMediaGaplessPlaybackControl::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QMediaGaplessPlaybackControl::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); diff --git a/src/gsiqt/qt5/QtMultimedia/gsiDeclQMediaNetworkAccessControl.cc b/src/gsiqt/qt5/QtMultimedia/gsiDeclQMediaNetworkAccessControl.cc index 9a8768214..5e75bdd42 100644 --- a/src/gsiqt/qt5/QtMultimedia/gsiDeclQMediaNetworkAccessControl.cc +++ b/src/gsiqt/qt5/QtMultimedia/gsiDeclQMediaNetworkAccessControl.cc @@ -56,6 +56,26 @@ static void _call_smo (const qt_gsi::GenericStaticMethod *, gsi::SerialArgs &, g } +// void QMediaNetworkAccessControl::configurationChanged(const QNetworkConfiguration &configuration) + + +static void _init_f_configurationChanged_3508 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("configuration"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_configurationChanged_3508 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QNetworkConfiguration &arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaNetworkAccessControl *)cls)->configurationChanged (arg1); +} + + // QNetworkConfiguration QMediaNetworkAccessControl::currentConfiguration() @@ -147,10 +167,9 @@ namespace gsi static gsi::Methods methods_QMediaNetworkAccessControl () { gsi::Methods methods; methods += new qt_gsi::GenericStaticMethod ("staticMetaObject", "@brief Obtains the static MetaObject for this class.", &_init_smo, &_call_smo); + methods += new qt_gsi::GenericMethod ("configurationChanged", "@brief Method void QMediaNetworkAccessControl::configurationChanged(const QNetworkConfiguration &configuration)\n", false, &_init_f_configurationChanged_3508, &_call_f_configurationChanged_3508); methods += new qt_gsi::GenericMethod ("currentConfiguration", "@brief Method QNetworkConfiguration QMediaNetworkAccessControl::currentConfiguration()\n", true, &_init_f_currentConfiguration_c0, &_call_f_currentConfiguration_c0); methods += new qt_gsi::GenericMethod ("setConfigurations", "@brief Method void QMediaNetworkAccessControl::setConfigurations(const QList &configuration)\n", false, &_init_f_setConfigurations_4123, &_call_f_setConfigurations_4123); - methods += gsi::qt_signal ("configurationChanged(const QNetworkConfiguration &)", "configurationChanged", gsi::arg("configuration"), "@brief Signal declaration for QMediaNetworkAccessControl::configurationChanged(const QNetworkConfiguration &configuration)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QMediaNetworkAccessControl::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QMediaNetworkAccessControl::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QMediaNetworkAccessControl::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -199,12 +218,6 @@ public: return QMediaNetworkAccessControl::senderSignalIndex(); } - // [emitter impl] void QMediaNetworkAccessControl::configurationChanged(const QNetworkConfiguration &configuration) - void emitter_QMediaNetworkAccessControl_configurationChanged_3508(const QNetworkConfiguration &configuration) - { - emit QMediaNetworkAccessControl::configurationChanged(configuration); - } - // [adaptor impl] QNetworkConfiguration QMediaNetworkAccessControl::currentConfiguration() QNetworkConfiguration cbs_currentConfiguration_c0_0() const { @@ -220,12 +233,6 @@ public: } } - // [emitter impl] void QMediaNetworkAccessControl::destroyed(QObject *) - void emitter_QMediaNetworkAccessControl_destroyed_1302(QObject *arg1) - { - emit QMediaNetworkAccessControl::destroyed(arg1); - } - // [adaptor impl] bool QMediaNetworkAccessControl::event(QEvent *) bool cbs_event_1217_0(QEvent *arg1) { @@ -382,24 +389,6 @@ static void _set_callback_cbs_childEvent_1701_0 (void *cls, const gsi::Callback } -// emitter void QMediaNetworkAccessControl::configurationChanged(const QNetworkConfiguration &configuration) - -static void _init_emitter_configurationChanged_3508 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("configuration"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_configurationChanged_3508 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const QNetworkConfiguration &arg1 = gsi::arg_reader() (args, heap); - ((QMediaNetworkAccessControl_Adaptor *)cls)->emitter_QMediaNetworkAccessControl_configurationChanged_3508 (arg1); -} - - // QNetworkConfiguration QMediaNetworkAccessControl::currentConfiguration() static void _init_cbs_currentConfiguration_c0_0 (qt_gsi::GenericMethod *decl) @@ -443,24 +432,6 @@ static void _set_callback_cbs_customEvent_1217_0 (void *cls, const gsi::Callback } -// emitter void QMediaNetworkAccessControl::destroyed(QObject *) - -static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - ((QMediaNetworkAccessControl_Adaptor *)cls)->emitter_QMediaNetworkAccessControl_destroyed_1302 (arg1); -} - - // void QMediaNetworkAccessControl::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -656,12 +627,10 @@ static gsi::Methods methods_QMediaNetworkAccessControl_Adaptor () { methods += new qt_gsi::GenericStaticMethod ("new", "@brief Constructor QMediaNetworkAccessControl::QMediaNetworkAccessControl()\nThis method creates an object of class QMediaNetworkAccessControl.", &_init_ctor_QMediaNetworkAccessControl_Adaptor_0, &_call_ctor_QMediaNetworkAccessControl_Adaptor_0); methods += new qt_gsi::GenericMethod ("*childEvent", "@brief Virtual method void QMediaNetworkAccessControl::childEvent(QChildEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); - methods += new qt_gsi::GenericMethod ("emit_configurationChanged", "@brief Emitter for signal void QMediaNetworkAccessControl::configurationChanged(const QNetworkConfiguration &configuration)\nCall this method to emit this signal.", false, &_init_emitter_configurationChanged_3508, &_call_emitter_configurationChanged_3508); methods += new qt_gsi::GenericMethod ("currentConfiguration", "@brief Virtual method QNetworkConfiguration QMediaNetworkAccessControl::currentConfiguration()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_currentConfiguration_c0_0, &_call_cbs_currentConfiguration_c0_0); methods += new qt_gsi::GenericMethod ("currentConfiguration", "@hide", true, &_init_cbs_currentConfiguration_c0_0, &_call_cbs_currentConfiguration_c0_0, &_set_callback_cbs_currentConfiguration_c0_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QMediaNetworkAccessControl::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); - methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QMediaNetworkAccessControl::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QMediaNetworkAccessControl::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("event", "@brief Virtual method bool QMediaNetworkAccessControl::event(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0); diff --git a/src/gsiqt/qt5/QtMultimedia/gsiDeclQMediaObject.cc b/src/gsiqt/qt5/QtMultimedia/gsiDeclQMediaObject.cc index 222919476..eeecea070 100644 --- a/src/gsiqt/qt5/QtMultimedia/gsiDeclQMediaObject.cc +++ b/src/gsiqt/qt5/QtMultimedia/gsiDeclQMediaObject.cc @@ -71,6 +71,46 @@ static void _call_f_availability_c0 (const qt_gsi::GenericMethod * /*decl*/, voi } +// void QMediaObject::availabilityChanged(bool available) + + +static void _init_f_availabilityChanged_864 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("available"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_availabilityChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + bool arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaObject *)cls)->availabilityChanged (arg1); +} + + +// void QMediaObject::availabilityChanged(QMultimedia::AvailabilityStatus availability) + + +static void _init_f_availabilityChanged_3555 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("availability"); + decl->add_arg::target_type & > (argspec_0); + decl->set_return (); +} + +static void _call_f_availabilityChanged_3555 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaObject *)cls)->availabilityChanged (qt_gsi::QtToCppAdaptor(arg1).cref()); +} + + // QStringList QMediaObject::availableMetaData() @@ -154,6 +194,65 @@ static void _call_f_metaData_c2025 (const qt_gsi::GenericMethod * /*decl*/, void } +// void QMediaObject::metaDataAvailableChanged(bool available) + + +static void _init_f_metaDataAvailableChanged_864 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("available"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_metaDataAvailableChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + bool arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaObject *)cls)->metaDataAvailableChanged (arg1); +} + + +// void QMediaObject::metaDataChanged() + + +static void _init_f_metaDataChanged_0 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_f_metaDataChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaObject *)cls)->metaDataChanged (); +} + + +// void QMediaObject::metaDataChanged(const QString &key, const QVariant &value) + + +static void _init_f_metaDataChanged_4036 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("key"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("value"); + decl->add_arg (argspec_1); + decl->set_return (); +} + +static void _call_f_metaDataChanged_4036 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + const QVariant &arg2 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaObject *)cls)->metaDataChanged (arg1, arg2); +} + + // int QMediaObject::notifyInterval() @@ -169,6 +268,26 @@ static void _call_f_notifyInterval_c0 (const qt_gsi::GenericMethod * /*decl*/, v } +// void QMediaObject::notifyIntervalChanged(int milliSeconds) + + +static void _init_f_notifyIntervalChanged_767 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("milliSeconds"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_notifyIntervalChanged_767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + int arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaObject *)cls)->notifyIntervalChanged (arg1); +} + + // QMediaService *QMediaObject::service() @@ -281,22 +400,21 @@ static gsi::Methods methods_QMediaObject () { gsi::Methods methods; methods += new qt_gsi::GenericStaticMethod ("staticMetaObject", "@brief Obtains the static MetaObject for this class.", &_init_smo, &_call_smo); methods += new qt_gsi::GenericMethod ("availability", "@brief Method QMultimedia::AvailabilityStatus QMediaObject::availability()\n", true, &_init_f_availability_c0, &_call_f_availability_c0); + methods += new qt_gsi::GenericMethod ("availabilityChanged_bool", "@brief Method void QMediaObject::availabilityChanged(bool available)\n", false, &_init_f_availabilityChanged_864, &_call_f_availabilityChanged_864); + methods += new qt_gsi::GenericMethod ("availabilityChanged_status", "@brief Method void QMediaObject::availabilityChanged(QMultimedia::AvailabilityStatus availability)\n", false, &_init_f_availabilityChanged_3555, &_call_f_availabilityChanged_3555); methods += new qt_gsi::GenericMethod ("availableMetaData", "@brief Method QStringList QMediaObject::availableMetaData()\n", true, &_init_f_availableMetaData_c0, &_call_f_availableMetaData_c0); methods += new qt_gsi::GenericMethod ("bind", "@brief Method bool QMediaObject::bind(QObject *)\n", false, &_init_f_bind_1302, &_call_f_bind_1302); methods += new qt_gsi::GenericMethod ("isAvailable?", "@brief Method bool QMediaObject::isAvailable()\n", true, &_init_f_isAvailable_c0, &_call_f_isAvailable_c0); methods += new qt_gsi::GenericMethod ("isMetaDataAvailable?", "@brief Method bool QMediaObject::isMetaDataAvailable()\n", true, &_init_f_isMetaDataAvailable_c0, &_call_f_isMetaDataAvailable_c0); methods += new qt_gsi::GenericMethod ("metaData", "@brief Method QVariant QMediaObject::metaData(const QString &key)\n", true, &_init_f_metaData_c2025, &_call_f_metaData_c2025); + methods += new qt_gsi::GenericMethod ("metaDataAvailableChanged", "@brief Method void QMediaObject::metaDataAvailableChanged(bool available)\n", false, &_init_f_metaDataAvailableChanged_864, &_call_f_metaDataAvailableChanged_864); + methods += new qt_gsi::GenericMethod ("metaDataChanged", "@brief Method void QMediaObject::metaDataChanged()\n", false, &_init_f_metaDataChanged_0, &_call_f_metaDataChanged_0); + methods += new qt_gsi::GenericMethod ("metaDataChanged_kv", "@brief Method void QMediaObject::metaDataChanged(const QString &key, const QVariant &value)\n", false, &_init_f_metaDataChanged_4036, &_call_f_metaDataChanged_4036); methods += new qt_gsi::GenericMethod (":notifyInterval", "@brief Method int QMediaObject::notifyInterval()\n", true, &_init_f_notifyInterval_c0, &_call_f_notifyInterval_c0); + methods += new qt_gsi::GenericMethod ("notifyIntervalChanged", "@brief Method void QMediaObject::notifyIntervalChanged(int milliSeconds)\n", false, &_init_f_notifyIntervalChanged_767, &_call_f_notifyIntervalChanged_767); methods += new qt_gsi::GenericMethod ("service", "@brief Method QMediaService *QMediaObject::service()\n", true, &_init_f_service_c0, &_call_f_service_c0); methods += new qt_gsi::GenericMethod ("setNotifyInterval|notifyInterval=", "@brief Method void QMediaObject::setNotifyInterval(int milliSeconds)\n", false, &_init_f_setNotifyInterval_767, &_call_f_setNotifyInterval_767); methods += new qt_gsi::GenericMethod ("unbind", "@brief Method void QMediaObject::unbind(QObject *)\n", false, &_init_f_unbind_1302, &_call_f_unbind_1302); - methods += gsi::qt_signal ("availabilityChanged(bool)", "availabilityChanged_bool", gsi::arg("available"), "@brief Signal declaration for QMediaObject::availabilityChanged(bool available)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal::target_type & > ("availabilityChanged(QMultimedia::AvailabilityStatus)", "availabilityChanged_status", gsi::arg("availability"), "@brief Signal declaration for QMediaObject::availabilityChanged(QMultimedia::AvailabilityStatus availability)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QMediaObject::destroyed(QObject *)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("metaDataAvailableChanged(bool)", "metaDataAvailableChanged", gsi::arg("available"), "@brief Signal declaration for QMediaObject::metaDataAvailableChanged(bool available)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("metaDataChanged()", "metaDataChanged", "@brief Signal declaration for QMediaObject::metaDataChanged()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("metaDataChanged(const QString &, const QVariant &)", "metaDataChanged_kv", gsi::arg("key"), gsi::arg("value"), "@brief Signal declaration for QMediaObject::metaDataChanged(const QString &key, const QVariant &value)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("notifyIntervalChanged(int)", "notifyIntervalChanged", gsi::arg("milliSeconds"), "@brief Signal declaration for QMediaObject::notifyIntervalChanged(int milliSeconds)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QMediaObject::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QMediaObject::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -364,18 +482,6 @@ public: } } - // [emitter impl] void QMediaObject::availabilityChanged(bool available) - void emitter_QMediaObject_availabilityChanged_864(bool available) - { - emit QMediaObject::availabilityChanged(available); - } - - // [emitter impl] void QMediaObject::availabilityChanged(QMultimedia::AvailabilityStatus availability) - void emitter_QMediaObject_availabilityChanged_3555(QMultimedia::AvailabilityStatus availability) - { - emit QMediaObject::availabilityChanged(availability); - } - // [adaptor impl] bool QMediaObject::bind(QObject *) bool cbs_bind_1302_0(QObject *arg1) { @@ -391,12 +497,6 @@ public: } } - // [emitter impl] void QMediaObject::destroyed(QObject *) - void emitter_QMediaObject_destroyed_1302(QObject *arg1) - { - emit QMediaObject::destroyed(arg1); - } - // [adaptor impl] bool QMediaObject::event(QEvent *) bool cbs_event_1217_0(QEvent *arg1) { @@ -442,30 +542,6 @@ public: } } - // [emitter impl] void QMediaObject::metaDataAvailableChanged(bool available) - void emitter_QMediaObject_metaDataAvailableChanged_864(bool available) - { - emit QMediaObject::metaDataAvailableChanged(available); - } - - // [emitter impl] void QMediaObject::metaDataChanged() - void emitter_QMediaObject_metaDataChanged_0() - { - emit QMediaObject::metaDataChanged(); - } - - // [emitter impl] void QMediaObject::metaDataChanged(const QString &key, const QVariant &value) - void emitter_QMediaObject_metaDataChanged_4036(const QString &key, const QVariant &value) - { - emit QMediaObject::metaDataChanged(key, value); - } - - // [emitter impl] void QMediaObject::notifyIntervalChanged(int milliSeconds) - void emitter_QMediaObject_notifyIntervalChanged_767(int milliSeconds) - { - emit QMediaObject::notifyIntervalChanged(milliSeconds); - } - // [adaptor impl] QMediaService *QMediaObject::service() QMediaService * cbs_service_c0_0() const { @@ -609,42 +685,6 @@ static void _set_callback_cbs_availability_c0_0 (void *cls, const gsi::Callback } -// emitter void QMediaObject::availabilityChanged(bool available) - -static void _init_emitter_availabilityChanged_864 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("available"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_availabilityChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - bool arg1 = gsi::arg_reader() (args, heap); - ((QMediaObject_Adaptor *)cls)->emitter_QMediaObject_availabilityChanged_864 (arg1); -} - - -// emitter void QMediaObject::availabilityChanged(QMultimedia::AvailabilityStatus availability) - -static void _init_emitter_availabilityChanged_3555 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("availability"); - decl->add_arg::target_type & > (argspec_0); - decl->set_return (); -} - -static void _call_emitter_availabilityChanged_3555 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); - ((QMediaObject_Adaptor *)cls)->emitter_QMediaObject_availabilityChanged_3555 (arg1); -} - - // bool QMediaObject::bind(QObject *) static void _init_cbs_bind_1302_0 (qt_gsi::GenericMethod *decl) @@ -716,24 +756,6 @@ static void _set_callback_cbs_customEvent_1217_0 (void *cls, const gsi::Callback } -// emitter void QMediaObject::destroyed(QObject *) - -static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - ((QMediaObject_Adaptor *)cls)->emitter_QMediaObject_destroyed_1302 (arg1); -} - - // void QMediaObject::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -844,77 +866,6 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } -// emitter void QMediaObject::metaDataAvailableChanged(bool available) - -static void _init_emitter_metaDataAvailableChanged_864 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("available"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_metaDataAvailableChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - bool arg1 = gsi::arg_reader() (args, heap); - ((QMediaObject_Adaptor *)cls)->emitter_QMediaObject_metaDataAvailableChanged_864 (arg1); -} - - -// emitter void QMediaObject::metaDataChanged() - -static void _init_emitter_metaDataChanged_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_metaDataChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QMediaObject_Adaptor *)cls)->emitter_QMediaObject_metaDataChanged_0 (); -} - - -// emitter void QMediaObject::metaDataChanged(const QString &key, const QVariant &value) - -static void _init_emitter_metaDataChanged_4036 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("key"); - decl->add_arg (argspec_0); - static gsi::ArgSpecBase argspec_1 ("value"); - decl->add_arg (argspec_1); - decl->set_return (); -} - -static void _call_emitter_metaDataChanged_4036 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const QString &arg1 = gsi::arg_reader() (args, heap); - const QVariant &arg2 = gsi::arg_reader() (args, heap); - ((QMediaObject_Adaptor *)cls)->emitter_QMediaObject_metaDataChanged_4036 (arg1, arg2); -} - - -// emitter void QMediaObject::notifyIntervalChanged(int milliSeconds) - -static void _init_emitter_notifyIntervalChanged_767 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("milliSeconds"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_notifyIntervalChanged_767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - int arg1 = gsi::arg_reader() (args, heap); - ((QMediaObject_Adaptor *)cls)->emitter_QMediaObject_notifyIntervalChanged_767 (arg1); -} - - // exposed int QMediaObject::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -1057,15 +1008,12 @@ static gsi::Methods methods_QMediaObject_Adaptor () { methods += new qt_gsi::GenericMethod ("*addPropertyWatch", "@brief Method void QMediaObject::addPropertyWatch(QByteArray const &name)\nThis method is protected and can only be called from inside a derived class.", false, &_init_fp_addPropertyWatch_2309, &_call_fp_addPropertyWatch_2309); methods += new qt_gsi::GenericMethod ("availability", "@brief Virtual method QMultimedia::AvailabilityStatus QMediaObject::availability()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_availability_c0_0, &_call_cbs_availability_c0_0); methods += new qt_gsi::GenericMethod ("availability", "@hide", true, &_init_cbs_availability_c0_0, &_call_cbs_availability_c0_0, &_set_callback_cbs_availability_c0_0); - methods += new qt_gsi::GenericMethod ("emit_availabilityChanged_bool", "@brief Emitter for signal void QMediaObject::availabilityChanged(bool available)\nCall this method to emit this signal.", false, &_init_emitter_availabilityChanged_864, &_call_emitter_availabilityChanged_864); - methods += new qt_gsi::GenericMethod ("emit_availabilityChanged_status", "@brief Emitter for signal void QMediaObject::availabilityChanged(QMultimedia::AvailabilityStatus availability)\nCall this method to emit this signal.", false, &_init_emitter_availabilityChanged_3555, &_call_emitter_availabilityChanged_3555); methods += new qt_gsi::GenericMethod ("bind", "@brief Virtual method bool QMediaObject::bind(QObject *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_bind_1302_0, &_call_cbs_bind_1302_0); methods += new qt_gsi::GenericMethod ("bind", "@hide", false, &_init_cbs_bind_1302_0, &_call_cbs_bind_1302_0, &_set_callback_cbs_bind_1302_0); methods += new qt_gsi::GenericMethod ("*childEvent", "@brief Virtual method void QMediaObject::childEvent(QChildEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QMediaObject::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); - methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QMediaObject::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QMediaObject::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("event", "@brief Virtual method bool QMediaObject::event(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0); @@ -1075,10 +1023,6 @@ static gsi::Methods methods_QMediaObject_Adaptor () { methods += new qt_gsi::GenericMethod ("isAvailable", "@brief Virtual method bool QMediaObject::isAvailable()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_isAvailable_c0_0, &_call_cbs_isAvailable_c0_0); methods += new qt_gsi::GenericMethod ("isAvailable", "@hide", true, &_init_cbs_isAvailable_c0_0, &_call_cbs_isAvailable_c0_0, &_set_callback_cbs_isAvailable_c0_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QMediaObject::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); - methods += new qt_gsi::GenericMethod ("emit_metaDataAvailableChanged", "@brief Emitter for signal void QMediaObject::metaDataAvailableChanged(bool available)\nCall this method to emit this signal.", false, &_init_emitter_metaDataAvailableChanged_864, &_call_emitter_metaDataAvailableChanged_864); - methods += new qt_gsi::GenericMethod ("emit_metaDataChanged", "@brief Emitter for signal void QMediaObject::metaDataChanged()\nCall this method to emit this signal.", false, &_init_emitter_metaDataChanged_0, &_call_emitter_metaDataChanged_0); - methods += new qt_gsi::GenericMethod ("emit_metaDataChanged_kv", "@brief Emitter for signal void QMediaObject::metaDataChanged(const QString &key, const QVariant &value)\nCall this method to emit this signal.", false, &_init_emitter_metaDataChanged_4036, &_call_emitter_metaDataChanged_4036); - methods += new qt_gsi::GenericMethod ("emit_notifyIntervalChanged", "@brief Emitter for signal void QMediaObject::notifyIntervalChanged(int milliSeconds)\nCall this method to emit this signal.", false, &_init_emitter_notifyIntervalChanged_767, &_call_emitter_notifyIntervalChanged_767); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QMediaObject::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*removePropertyWatch", "@brief Method void QMediaObject::removePropertyWatch(QByteArray const &name)\nThis method is protected and can only be called from inside a derived class.", false, &_init_fp_removePropertyWatch_2309, &_call_fp_removePropertyWatch_2309); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QMediaObject::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); diff --git a/src/gsiqt/qt5/QtMultimedia/gsiDeclQMediaPlayer.cc b/src/gsiqt/qt5/QtMultimedia/gsiDeclQMediaPlayer.cc index 973338da1..c5214aff6 100644 --- a/src/gsiqt/qt5/QtMultimedia/gsiDeclQMediaPlayer.cc +++ b/src/gsiqt/qt5/QtMultimedia/gsiDeclQMediaPlayer.cc @@ -53,6 +53,26 @@ static void _call_smo (const qt_gsi::GenericStaticMethod *, gsi::SerialArgs &, g } +// void QMediaPlayer::audioAvailableChanged(bool available) + + +static void _init_f_audioAvailableChanged_864 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("available"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_audioAvailableChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + bool arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaPlayer *)cls)->audioAvailableChanged (arg1); +} + + // QMultimedia::AvailabilityStatus QMediaPlayer::availability() @@ -102,6 +122,26 @@ static void _call_f_bufferStatus_c0 (const qt_gsi::GenericMethod * /*decl*/, voi } +// void QMediaPlayer::bufferStatusChanged(int percentFilled) + + +static void _init_f_bufferStatusChanged_767 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("percentFilled"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_bufferStatusChanged_767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + int arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaPlayer *)cls)->bufferStatusChanged (arg1); +} + + // QMediaContent QMediaPlayer::currentMedia() @@ -117,6 +157,26 @@ static void _call_f_currentMedia_c0 (const qt_gsi::GenericMethod * /*decl*/, voi } +// void QMediaPlayer::currentMediaChanged(const QMediaContent &media) + + +static void _init_f_currentMediaChanged_2605 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("media"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_currentMediaChanged_2605 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QMediaContent &arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaPlayer *)cls)->currentMediaChanged (arg1); +} + + // QNetworkConfiguration QMediaPlayer::currentNetworkConfiguration() @@ -147,6 +207,26 @@ static void _call_f_duration_c0 (const qt_gsi::GenericMethod * /*decl*/, void *c } +// void QMediaPlayer::durationChanged(qint64 duration) + + +static void _init_f_durationChanged_986 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("duration"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_durationChanged_986 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + qint64 arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaPlayer *)cls)->durationChanged (arg1); +} + + // QMediaPlayer::Error QMediaPlayer::error() @@ -162,6 +242,26 @@ static void _call_f_error_c0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, } +// void QMediaPlayer::error(QMediaPlayer::Error error) + + +static void _init_f_error_2256 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("error"); + decl->add_arg::target_type & > (argspec_0); + decl->set_return (); +} + +static void _call_f_error_2256 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaPlayer *)cls)->error (qt_gsi::QtToCppAdaptor(arg1).cref()); +} + + // QString QMediaPlayer::errorString() @@ -252,6 +352,26 @@ static void _call_f_media_c0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, } +// void QMediaPlayer::mediaChanged(const QMediaContent &media) + + +static void _init_f_mediaChanged_2605 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("media"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_mediaChanged_2605 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QMediaContent &arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaPlayer *)cls)->mediaChanged (arg1); +} + + // QMediaPlayer::MediaStatus QMediaPlayer::mediaStatus() @@ -267,6 +387,26 @@ static void _call_f_mediaStatus_c0 (const qt_gsi::GenericMethod * /*decl*/, void } +// void QMediaPlayer::mediaStatusChanged(QMediaPlayer::MediaStatus status) + + +static void _init_f_mediaStatusChanged_2858 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("status"); + decl->add_arg::target_type & > (argspec_0); + decl->set_return (); +} + +static void _call_f_mediaStatusChanged_2858 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaPlayer *)cls)->mediaStatusChanged (qt_gsi::QtToCppAdaptor(arg1).cref()); +} + + // const QIODevice *QMediaPlayer::mediaStream() @@ -282,6 +422,46 @@ static void _call_f_mediaStream_c0 (const qt_gsi::GenericMethod * /*decl*/, void } +// void QMediaPlayer::mutedChanged(bool muted) + + +static void _init_f_mutedChanged_864 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("muted"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_mutedChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + bool arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaPlayer *)cls)->mutedChanged (arg1); +} + + +// void QMediaPlayer::networkConfigurationChanged(const QNetworkConfiguration &configuration) + + +static void _init_f_networkConfigurationChanged_3508 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("configuration"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_networkConfigurationChanged_3508 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QNetworkConfiguration &arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaPlayer *)cls)->networkConfigurationChanged (arg1); +} + + // void QMediaPlayer::pause() @@ -329,6 +509,26 @@ static void _call_f_playbackRate_c0 (const qt_gsi::GenericMethod * /*decl*/, voi } +// void QMediaPlayer::playbackRateChanged(double rate) + + +static void _init_f_playbackRateChanged_1071 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("rate"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_playbackRateChanged_1071 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + double arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaPlayer *)cls)->playbackRateChanged (arg1); +} + + // QMediaPlaylist *QMediaPlayer::playlist() @@ -359,6 +559,46 @@ static void _call_f_position_c0 (const qt_gsi::GenericMethod * /*decl*/, void *c } +// void QMediaPlayer::positionChanged(qint64 position) + + +static void _init_f_positionChanged_986 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("position"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_positionChanged_986 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + qint64 arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaPlayer *)cls)->positionChanged (arg1); +} + + +// void QMediaPlayer::seekableChanged(bool seekable) + + +static void _init_f_seekableChanged_864 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("seekable"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_seekableChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + bool arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaPlayer *)cls)->seekableChanged (arg1); +} + + // void QMediaPlayer::setMedia(const QMediaContent &media, QIODevice *stream) @@ -577,6 +817,26 @@ static void _call_f_state_c0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, } +// void QMediaPlayer::stateChanged(QMediaPlayer::State newState) + + +static void _init_f_stateChanged_2247 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("newState"); + decl->add_arg::target_type & > (argspec_0); + decl->set_return (); +} + +static void _call_f_stateChanged_2247 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaPlayer *)cls)->stateChanged (qt_gsi::QtToCppAdaptor(arg1).cref()); +} + + // void QMediaPlayer::stop() @@ -613,6 +873,26 @@ static void _call_f_unbind_1302 (const qt_gsi::GenericMethod * /*decl*/, void *c } +// void QMediaPlayer::videoAvailableChanged(bool videoAvailable) + + +static void _init_f_videoAvailableChanged_864 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("videoAvailable"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_videoAvailableChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + bool arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaPlayer *)cls)->videoAvailableChanged (arg1); +} + + // int QMediaPlayer::volume() @@ -628,6 +908,26 @@ static void _call_f_volume_c0 (const qt_gsi::GenericMethod * /*decl*/, void *cls } +// void QMediaPlayer::volumeChanged(int volume) + + +static void _init_f_volumeChanged_767 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("volume"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_volumeChanged_767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + int arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaPlayer *)cls)->volumeChanged (arg1); +} + + // static QMultimedia::SupportEstimate QMediaPlayer::hasSupport(const QString &mimeType, const QStringList &codecs, QFlags flags) @@ -728,26 +1028,38 @@ namespace gsi static gsi::Methods methods_QMediaPlayer () { gsi::Methods methods; methods += new qt_gsi::GenericStaticMethod ("staticMetaObject", "@brief Obtains the static MetaObject for this class.", &_init_smo, &_call_smo); + methods += new qt_gsi::GenericMethod ("audioAvailableChanged", "@brief Method void QMediaPlayer::audioAvailableChanged(bool available)\n", false, &_init_f_audioAvailableChanged_864, &_call_f_audioAvailableChanged_864); methods += new qt_gsi::GenericMethod ("availability", "@brief Method QMultimedia::AvailabilityStatus QMediaPlayer::availability()\nThis is a reimplementation of QMediaObject::availability", true, &_init_f_availability_c0, &_call_f_availability_c0); methods += new qt_gsi::GenericMethod ("bind", "@brief Method bool QMediaPlayer::bind(QObject *)\nThis is a reimplementation of QMediaObject::bind", false, &_init_f_bind_1302, &_call_f_bind_1302); methods += new qt_gsi::GenericMethod (":bufferStatus", "@brief Method int QMediaPlayer::bufferStatus()\n", true, &_init_f_bufferStatus_c0, &_call_f_bufferStatus_c0); + methods += new qt_gsi::GenericMethod ("bufferStatusChanged", "@brief Method void QMediaPlayer::bufferStatusChanged(int percentFilled)\n", false, &_init_f_bufferStatusChanged_767, &_call_f_bufferStatusChanged_767); methods += new qt_gsi::GenericMethod (":currentMedia", "@brief Method QMediaContent QMediaPlayer::currentMedia()\n", true, &_init_f_currentMedia_c0, &_call_f_currentMedia_c0); + methods += new qt_gsi::GenericMethod ("currentMediaChanged", "@brief Method void QMediaPlayer::currentMediaChanged(const QMediaContent &media)\n", false, &_init_f_currentMediaChanged_2605, &_call_f_currentMediaChanged_2605); methods += new qt_gsi::GenericMethod ("currentNetworkConfiguration", "@brief Method QNetworkConfiguration QMediaPlayer::currentNetworkConfiguration()\n", true, &_init_f_currentNetworkConfiguration_c0, &_call_f_currentNetworkConfiguration_c0); methods += new qt_gsi::GenericMethod (":duration", "@brief Method qint64 QMediaPlayer::duration()\n", true, &_init_f_duration_c0, &_call_f_duration_c0); + methods += new qt_gsi::GenericMethod ("durationChanged", "@brief Method void QMediaPlayer::durationChanged(qint64 duration)\n", false, &_init_f_durationChanged_986, &_call_f_durationChanged_986); methods += new qt_gsi::GenericMethod (":error", "@brief Method QMediaPlayer::Error QMediaPlayer::error()\n", true, &_init_f_error_c0, &_call_f_error_c0); + methods += new qt_gsi::GenericMethod ("error_sig", "@brief Method void QMediaPlayer::error(QMediaPlayer::Error error)\n", false, &_init_f_error_2256, &_call_f_error_2256); methods += new qt_gsi::GenericMethod ("errorString", "@brief Method QString QMediaPlayer::errorString()\n", true, &_init_f_errorString_c0, &_call_f_errorString_c0); methods += new qt_gsi::GenericMethod ("isAudioAvailable?|:audioAvailable", "@brief Method bool QMediaPlayer::isAudioAvailable()\n", true, &_init_f_isAudioAvailable_c0, &_call_f_isAudioAvailable_c0); methods += new qt_gsi::GenericMethod ("isMuted?|:muted", "@brief Method bool QMediaPlayer::isMuted()\n", true, &_init_f_isMuted_c0, &_call_f_isMuted_c0); methods += new qt_gsi::GenericMethod ("isSeekable?|:seekable", "@brief Method bool QMediaPlayer::isSeekable()\n", true, &_init_f_isSeekable_c0, &_call_f_isSeekable_c0); methods += new qt_gsi::GenericMethod ("isVideoAvailable?|:videoAvailable", "@brief Method bool QMediaPlayer::isVideoAvailable()\n", true, &_init_f_isVideoAvailable_c0, &_call_f_isVideoAvailable_c0); methods += new qt_gsi::GenericMethod (":media", "@brief Method QMediaContent QMediaPlayer::media()\n", true, &_init_f_media_c0, &_call_f_media_c0); + methods += new qt_gsi::GenericMethod ("mediaChanged", "@brief Method void QMediaPlayer::mediaChanged(const QMediaContent &media)\n", false, &_init_f_mediaChanged_2605, &_call_f_mediaChanged_2605); methods += new qt_gsi::GenericMethod (":mediaStatus", "@brief Method QMediaPlayer::MediaStatus QMediaPlayer::mediaStatus()\n", true, &_init_f_mediaStatus_c0, &_call_f_mediaStatus_c0); + methods += new qt_gsi::GenericMethod ("mediaStatusChanged", "@brief Method void QMediaPlayer::mediaStatusChanged(QMediaPlayer::MediaStatus status)\n", false, &_init_f_mediaStatusChanged_2858, &_call_f_mediaStatusChanged_2858); methods += new qt_gsi::GenericMethod ("mediaStream", "@brief Method const QIODevice *QMediaPlayer::mediaStream()\n", true, &_init_f_mediaStream_c0, &_call_f_mediaStream_c0); + methods += new qt_gsi::GenericMethod ("mutedChanged", "@brief Method void QMediaPlayer::mutedChanged(bool muted)\n", false, &_init_f_mutedChanged_864, &_call_f_mutedChanged_864); + methods += new qt_gsi::GenericMethod ("networkConfigurationChanged", "@brief Method void QMediaPlayer::networkConfigurationChanged(const QNetworkConfiguration &configuration)\n", false, &_init_f_networkConfigurationChanged_3508, &_call_f_networkConfigurationChanged_3508); methods += new qt_gsi::GenericMethod ("pause", "@brief Method void QMediaPlayer::pause()\n", false, &_init_f_pause_0, &_call_f_pause_0); methods += new qt_gsi::GenericMethod ("play", "@brief Method void QMediaPlayer::play()\n", false, &_init_f_play_0, &_call_f_play_0); methods += new qt_gsi::GenericMethod (":playbackRate", "@brief Method double QMediaPlayer::playbackRate()\n", true, &_init_f_playbackRate_c0, &_call_f_playbackRate_c0); + methods += new qt_gsi::GenericMethod ("playbackRateChanged", "@brief Method void QMediaPlayer::playbackRateChanged(double rate)\n", false, &_init_f_playbackRateChanged_1071, &_call_f_playbackRateChanged_1071); methods += new qt_gsi::GenericMethod (":playlist", "@brief Method QMediaPlaylist *QMediaPlayer::playlist()\n", true, &_init_f_playlist_c0, &_call_f_playlist_c0); methods += new qt_gsi::GenericMethod (":position", "@brief Method qint64 QMediaPlayer::position()\n", true, &_init_f_position_c0, &_call_f_position_c0); + methods += new qt_gsi::GenericMethod ("positionChanged", "@brief Method void QMediaPlayer::positionChanged(qint64 position)\n", false, &_init_f_positionChanged_986, &_call_f_positionChanged_986); + methods += new qt_gsi::GenericMethod ("seekableChanged", "@brief Method void QMediaPlayer::seekableChanged(bool seekable)\n", false, &_init_f_seekableChanged_864, &_call_f_seekableChanged_864); methods += new qt_gsi::GenericMethod ("setMedia", "@brief Method void QMediaPlayer::setMedia(const QMediaContent &media, QIODevice *stream)\n", false, &_init_f_setMedia_3944, &_call_f_setMedia_3944); methods += new qt_gsi::GenericMethod ("setMuted|muted=", "@brief Method void QMediaPlayer::setMuted(bool muted)\n", false, &_init_f_setMuted_864, &_call_f_setMuted_864); methods += new qt_gsi::GenericMethod ("setNetworkConfigurations", "@brief Method void QMediaPlayer::setNetworkConfigurations(const QList &configurations)\n", false, &_init_f_setNetworkConfigurations_4123, &_call_f_setNetworkConfigurations_4123); @@ -759,31 +1071,12 @@ static gsi::Methods methods_QMediaPlayer () { methods += new qt_gsi::GenericMethod ("setVideoOutput", "@brief Method void QMediaPlayer::setVideoOutput(QAbstractVideoSurface *surface)\n", false, &_init_f_setVideoOutput_2739, &_call_f_setVideoOutput_2739); methods += new qt_gsi::GenericMethod ("setVolume|volume=", "@brief Method void QMediaPlayer::setVolume(int volume)\n", false, &_init_f_setVolume_767, &_call_f_setVolume_767); methods += new qt_gsi::GenericMethod (":state", "@brief Method QMediaPlayer::State QMediaPlayer::state()\n", true, &_init_f_state_c0, &_call_f_state_c0); + methods += new qt_gsi::GenericMethod ("stateChanged", "@brief Method void QMediaPlayer::stateChanged(QMediaPlayer::State newState)\n", false, &_init_f_stateChanged_2247, &_call_f_stateChanged_2247); methods += new qt_gsi::GenericMethod ("stop", "@brief Method void QMediaPlayer::stop()\n", false, &_init_f_stop_0, &_call_f_stop_0); methods += new qt_gsi::GenericMethod ("unbind", "@brief Method void QMediaPlayer::unbind(QObject *)\nThis is a reimplementation of QMediaObject::unbind", false, &_init_f_unbind_1302, &_call_f_unbind_1302); + methods += new qt_gsi::GenericMethod ("videoAvailableChanged", "@brief Method void QMediaPlayer::videoAvailableChanged(bool videoAvailable)\n", false, &_init_f_videoAvailableChanged_864, &_call_f_videoAvailableChanged_864); methods += new qt_gsi::GenericMethod (":volume", "@brief Method int QMediaPlayer::volume()\n", true, &_init_f_volume_c0, &_call_f_volume_c0); - methods += gsi::qt_signal ("audioAvailableChanged(bool)", "audioAvailableChanged", gsi::arg("available"), "@brief Signal declaration for QMediaPlayer::audioAvailableChanged(bool available)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("availabilityChanged(bool)", "availabilityChanged_bool", gsi::arg("available"), "@brief Signal declaration for QMediaPlayer::availabilityChanged(bool available)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal::target_type & > ("availabilityChanged(QMultimedia::AvailabilityStatus)", "availabilityChanged_status", gsi::arg("availability"), "@brief Signal declaration for QMediaPlayer::availabilityChanged(QMultimedia::AvailabilityStatus availability)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("bufferStatusChanged(int)", "bufferStatusChanged", gsi::arg("percentFilled"), "@brief Signal declaration for QMediaPlayer::bufferStatusChanged(int percentFilled)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("currentMediaChanged(const QMediaContent &)", "currentMediaChanged", gsi::arg("media"), "@brief Signal declaration for QMediaPlayer::currentMediaChanged(const QMediaContent &media)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QMediaPlayer::destroyed(QObject *)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("durationChanged(qint64)", "durationChanged", gsi::arg("duration"), "@brief Signal declaration for QMediaPlayer::durationChanged(qint64 duration)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal::target_type & > ("error(QMediaPlayer::Error)", "error_sig", gsi::arg("error"), "@brief Signal declaration for QMediaPlayer::error(QMediaPlayer::Error error)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("mediaChanged(const QMediaContent &)", "mediaChanged", gsi::arg("media"), "@brief Signal declaration for QMediaPlayer::mediaChanged(const QMediaContent &media)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal::target_type & > ("mediaStatusChanged(QMediaPlayer::MediaStatus)", "mediaStatusChanged", gsi::arg("status"), "@brief Signal declaration for QMediaPlayer::mediaStatusChanged(QMediaPlayer::MediaStatus status)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("metaDataAvailableChanged(bool)", "metaDataAvailableChanged", gsi::arg("available"), "@brief Signal declaration for QMediaPlayer::metaDataAvailableChanged(bool available)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("metaDataChanged()", "metaDataChanged", "@brief Signal declaration for QMediaPlayer::metaDataChanged()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("metaDataChanged(const QString &, const QVariant &)", "metaDataChanged_kv", gsi::arg("key"), gsi::arg("value"), "@brief Signal declaration for QMediaPlayer::metaDataChanged(const QString &key, const QVariant &value)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("mutedChanged(bool)", "mutedChanged", gsi::arg("muted"), "@brief Signal declaration for QMediaPlayer::mutedChanged(bool muted)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("networkConfigurationChanged(const QNetworkConfiguration &)", "networkConfigurationChanged", gsi::arg("configuration"), "@brief Signal declaration for QMediaPlayer::networkConfigurationChanged(const QNetworkConfiguration &configuration)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("notifyIntervalChanged(int)", "notifyIntervalChanged", gsi::arg("milliSeconds"), "@brief Signal declaration for QMediaPlayer::notifyIntervalChanged(int milliSeconds)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("playbackRateChanged(double)", "playbackRateChanged", gsi::arg("rate"), "@brief Signal declaration for QMediaPlayer::playbackRateChanged(double rate)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("positionChanged(qint64)", "positionChanged", gsi::arg("position"), "@brief Signal declaration for QMediaPlayer::positionChanged(qint64 position)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("seekableChanged(bool)", "seekableChanged", gsi::arg("seekable"), "@brief Signal declaration for QMediaPlayer::seekableChanged(bool seekable)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal::target_type & > ("stateChanged(QMediaPlayer::State)", "stateChanged", gsi::arg("newState"), "@brief Signal declaration for QMediaPlayer::stateChanged(QMediaPlayer::State newState)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("videoAvailableChanged(bool)", "videoAvailableChanged", gsi::arg("videoAvailable"), "@brief Signal declaration for QMediaPlayer::videoAvailableChanged(bool videoAvailable)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("volumeChanged(int)", "volumeChanged", gsi::arg("volume"), "@brief Signal declaration for QMediaPlayer::volumeChanged(int volume)\nYou can bind a procedure to this signal."); + methods += new qt_gsi::GenericMethod ("volumeChanged", "@brief Method void QMediaPlayer::volumeChanged(int volume)\n", false, &_init_f_volumeChanged_767, &_call_f_volumeChanged_767); methods += new qt_gsi::GenericStaticMethod ("hasSupport", "@brief Static method QMultimedia::SupportEstimate QMediaPlayer::hasSupport(const QString &mimeType, const QStringList &codecs, QFlags flags)\nThis method is static and can be called without an instance.", &_init_f_hasSupport_7054, &_call_f_hasSupport_7054); methods += new qt_gsi::GenericStaticMethod ("supportedMimeTypes", "@brief Static method QStringList QMediaPlayer::supportedMimeTypes(QFlags flags)\nThis method is static and can be called without an instance.", &_init_f_supportedMimeTypes_2808, &_call_f_supportedMimeTypes_2808); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QMediaPlayer::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); @@ -856,12 +1149,6 @@ public: return QMediaPlayer::senderSignalIndex(); } - // [emitter impl] void QMediaPlayer::audioAvailableChanged(bool available) - void emitter_QMediaPlayer_audioAvailableChanged_864(bool available) - { - emit QMediaPlayer::audioAvailableChanged(available); - } - // [adaptor impl] QMultimedia::AvailabilityStatus QMediaPlayer::availability() qt_gsi::Converter::target_type cbs_availability_c0_0() const { @@ -877,18 +1164,6 @@ public: } } - // [emitter impl] void QMediaPlayer::availabilityChanged(bool available) - void emitter_QMediaPlayer_availabilityChanged_864(bool available) - { - emit QMediaPlayer::availabilityChanged(available); - } - - // [emitter impl] void QMediaPlayer::availabilityChanged(QMultimedia::AvailabilityStatus availability) - void emitter_QMediaPlayer_availabilityChanged_3555(QMultimedia::AvailabilityStatus availability) - { - emit QMediaPlayer::availabilityChanged(availability); - } - // [adaptor impl] bool QMediaPlayer::bind(QObject *) bool cbs_bind_1302_0(QObject *arg1) { @@ -904,36 +1179,6 @@ public: } } - // [emitter impl] void QMediaPlayer::bufferStatusChanged(int percentFilled) - void emitter_QMediaPlayer_bufferStatusChanged_767(int percentFilled) - { - emit QMediaPlayer::bufferStatusChanged(percentFilled); - } - - // [emitter impl] void QMediaPlayer::currentMediaChanged(const QMediaContent &media) - void emitter_QMediaPlayer_currentMediaChanged_2605(const QMediaContent &media) - { - emit QMediaPlayer::currentMediaChanged(media); - } - - // [emitter impl] void QMediaPlayer::destroyed(QObject *) - void emitter_QMediaPlayer_destroyed_1302(QObject *arg1) - { - emit QMediaPlayer::destroyed(arg1); - } - - // [emitter impl] void QMediaPlayer::durationChanged(qint64 duration) - void emitter_QMediaPlayer_durationChanged_986(qint64 duration) - { - emit QMediaPlayer::durationChanged(duration); - } - - // [emitter impl] void QMediaPlayer::error(QMediaPlayer::Error error) - void emitter_QMediaPlayer_error_2256(QMediaPlayer::Error _error) - { - emit QMediaPlayer::error(_error); - } - // [adaptor impl] bool QMediaPlayer::event(QEvent *) bool cbs_event_1217_0(QEvent *arg1) { @@ -979,72 +1224,6 @@ public: } } - // [emitter impl] void QMediaPlayer::mediaChanged(const QMediaContent &media) - void emitter_QMediaPlayer_mediaChanged_2605(const QMediaContent &media) - { - emit QMediaPlayer::mediaChanged(media); - } - - // [emitter impl] void QMediaPlayer::mediaStatusChanged(QMediaPlayer::MediaStatus status) - void emitter_QMediaPlayer_mediaStatusChanged_2858(QMediaPlayer::MediaStatus status) - { - emit QMediaPlayer::mediaStatusChanged(status); - } - - // [emitter impl] void QMediaPlayer::metaDataAvailableChanged(bool available) - void emitter_QMediaPlayer_metaDataAvailableChanged_864(bool available) - { - emit QMediaPlayer::metaDataAvailableChanged(available); - } - - // [emitter impl] void QMediaPlayer::metaDataChanged() - void emitter_QMediaPlayer_metaDataChanged_0() - { - emit QMediaPlayer::metaDataChanged(); - } - - // [emitter impl] void QMediaPlayer::metaDataChanged(const QString &key, const QVariant &value) - void emitter_QMediaPlayer_metaDataChanged_4036(const QString &key, const QVariant &value) - { - emit QMediaPlayer::metaDataChanged(key, value); - } - - // [emitter impl] void QMediaPlayer::mutedChanged(bool muted) - void emitter_QMediaPlayer_mutedChanged_864(bool muted) - { - emit QMediaPlayer::mutedChanged(muted); - } - - // [emitter impl] void QMediaPlayer::networkConfigurationChanged(const QNetworkConfiguration &configuration) - void emitter_QMediaPlayer_networkConfigurationChanged_3508(const QNetworkConfiguration &configuration) - { - emit QMediaPlayer::networkConfigurationChanged(configuration); - } - - // [emitter impl] void QMediaPlayer::notifyIntervalChanged(int milliSeconds) - void emitter_QMediaPlayer_notifyIntervalChanged_767(int milliSeconds) - { - emit QMediaPlayer::notifyIntervalChanged(milliSeconds); - } - - // [emitter impl] void QMediaPlayer::playbackRateChanged(double rate) - void emitter_QMediaPlayer_playbackRateChanged_1071(double rate) - { - emit QMediaPlayer::playbackRateChanged(rate); - } - - // [emitter impl] void QMediaPlayer::positionChanged(qint64 position) - void emitter_QMediaPlayer_positionChanged_986(qint64 position) - { - emit QMediaPlayer::positionChanged(position); - } - - // [emitter impl] void QMediaPlayer::seekableChanged(bool seekable) - void emitter_QMediaPlayer_seekableChanged_864(bool seekable) - { - emit QMediaPlayer::seekableChanged(seekable); - } - // [adaptor impl] QMediaService *QMediaPlayer::service() QMediaService * cbs_service_c0_0() const { @@ -1060,12 +1239,6 @@ public: } } - // [emitter impl] void QMediaPlayer::stateChanged(QMediaPlayer::State newState) - void emitter_QMediaPlayer_stateChanged_2247(QMediaPlayer::State newState) - { - emit QMediaPlayer::stateChanged(newState); - } - // [adaptor impl] void QMediaPlayer::unbind(QObject *) void cbs_unbind_1302_0(QObject *arg1) { @@ -1081,18 +1254,6 @@ public: } } - // [emitter impl] void QMediaPlayer::videoAvailableChanged(bool videoAvailable) - void emitter_QMediaPlayer_videoAvailableChanged_864(bool videoAvailable) - { - emit QMediaPlayer::videoAvailableChanged(videoAvailable); - } - - // [emitter impl] void QMediaPlayer::volumeChanged(int volume) - void emitter_QMediaPlayer_volumeChanged_767(int volume) - { - emit QMediaPlayer::volumeChanged(volume); - } - // [adaptor impl] void QMediaPlayer::childEvent(QChildEvent *) void cbs_childEvent_1701_0(QChildEvent *arg1) { @@ -1208,24 +1369,6 @@ static void _call_fp_addPropertyWatch_2309 (const qt_gsi::GenericMethod * /*decl } -// emitter void QMediaPlayer::audioAvailableChanged(bool available) - -static void _init_emitter_audioAvailableChanged_864 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("available"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_audioAvailableChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - bool arg1 = gsi::arg_reader() (args, heap); - ((QMediaPlayer_Adaptor *)cls)->emitter_QMediaPlayer_audioAvailableChanged_864 (arg1); -} - - // QMultimedia::AvailabilityStatus QMediaPlayer::availability() static void _init_cbs_availability_c0_0 (qt_gsi::GenericMethod *decl) @@ -1245,42 +1388,6 @@ static void _set_callback_cbs_availability_c0_0 (void *cls, const gsi::Callback } -// emitter void QMediaPlayer::availabilityChanged(bool available) - -static void _init_emitter_availabilityChanged_864 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("available"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_availabilityChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - bool arg1 = gsi::arg_reader() (args, heap); - ((QMediaPlayer_Adaptor *)cls)->emitter_QMediaPlayer_availabilityChanged_864 (arg1); -} - - -// emitter void QMediaPlayer::availabilityChanged(QMultimedia::AvailabilityStatus availability) - -static void _init_emitter_availabilityChanged_3555 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("availability"); - decl->add_arg::target_type & > (argspec_0); - decl->set_return (); -} - -static void _call_emitter_availabilityChanged_3555 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); - ((QMediaPlayer_Adaptor *)cls)->emitter_QMediaPlayer_availabilityChanged_3555 (arg1); -} - - // bool QMediaPlayer::bind(QObject *) static void _init_cbs_bind_1302_0 (qt_gsi::GenericMethod *decl) @@ -1304,24 +1411,6 @@ static void _set_callback_cbs_bind_1302_0 (void *cls, const gsi::Callback &cb) } -// emitter void QMediaPlayer::bufferStatusChanged(int percentFilled) - -static void _init_emitter_bufferStatusChanged_767 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("percentFilled"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_bufferStatusChanged_767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - int arg1 = gsi::arg_reader() (args, heap); - ((QMediaPlayer_Adaptor *)cls)->emitter_QMediaPlayer_bufferStatusChanged_767 (arg1); -} - - // void QMediaPlayer::childEvent(QChildEvent *) static void _init_cbs_childEvent_1701_0 (qt_gsi::GenericMethod *decl) @@ -1346,24 +1435,6 @@ static void _set_callback_cbs_childEvent_1701_0 (void *cls, const gsi::Callback } -// emitter void QMediaPlayer::currentMediaChanged(const QMediaContent &media) - -static void _init_emitter_currentMediaChanged_2605 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("media"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_currentMediaChanged_2605 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const QMediaContent &arg1 = gsi::arg_reader() (args, heap); - ((QMediaPlayer_Adaptor *)cls)->emitter_QMediaPlayer_currentMediaChanged_2605 (arg1); -} - - // void QMediaPlayer::customEvent(QEvent *) static void _init_cbs_customEvent_1217_0 (qt_gsi::GenericMethod *decl) @@ -1388,24 +1459,6 @@ static void _set_callback_cbs_customEvent_1217_0 (void *cls, const gsi::Callback } -// emitter void QMediaPlayer::destroyed(QObject *) - -static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - ((QMediaPlayer_Adaptor *)cls)->emitter_QMediaPlayer_destroyed_1302 (arg1); -} - - // void QMediaPlayer::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -1430,42 +1483,6 @@ static void _set_callback_cbs_disconnectNotify_2394_0 (void *cls, const gsi::Cal } -// emitter void QMediaPlayer::durationChanged(qint64 duration) - -static void _init_emitter_durationChanged_986 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("duration"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_durationChanged_986 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - qint64 arg1 = gsi::arg_reader() (args, heap); - ((QMediaPlayer_Adaptor *)cls)->emitter_QMediaPlayer_durationChanged_986 (arg1); -} - - -// emitter void QMediaPlayer::error(QMediaPlayer::Error error) - -static void _init_emitter_error_2256 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("error"); - decl->add_arg::target_type & > (argspec_0); - decl->set_return (); -} - -static void _call_emitter_error_2256 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); - ((QMediaPlayer_Adaptor *)cls)->emitter_QMediaPlayer_error_2256 (arg1); -} - - // bool QMediaPlayer::event(QEvent *) static void _init_cbs_event_1217_0 (qt_gsi::GenericMethod *decl) @@ -1552,185 +1569,6 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } -// emitter void QMediaPlayer::mediaChanged(const QMediaContent &media) - -static void _init_emitter_mediaChanged_2605 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("media"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_mediaChanged_2605 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const QMediaContent &arg1 = gsi::arg_reader() (args, heap); - ((QMediaPlayer_Adaptor *)cls)->emitter_QMediaPlayer_mediaChanged_2605 (arg1); -} - - -// emitter void QMediaPlayer::mediaStatusChanged(QMediaPlayer::MediaStatus status) - -static void _init_emitter_mediaStatusChanged_2858 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("status"); - decl->add_arg::target_type & > (argspec_0); - decl->set_return (); -} - -static void _call_emitter_mediaStatusChanged_2858 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); - ((QMediaPlayer_Adaptor *)cls)->emitter_QMediaPlayer_mediaStatusChanged_2858 (arg1); -} - - -// emitter void QMediaPlayer::metaDataAvailableChanged(bool available) - -static void _init_emitter_metaDataAvailableChanged_864 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("available"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_metaDataAvailableChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - bool arg1 = gsi::arg_reader() (args, heap); - ((QMediaPlayer_Adaptor *)cls)->emitter_QMediaPlayer_metaDataAvailableChanged_864 (arg1); -} - - -// emitter void QMediaPlayer::metaDataChanged() - -static void _init_emitter_metaDataChanged_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_metaDataChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QMediaPlayer_Adaptor *)cls)->emitter_QMediaPlayer_metaDataChanged_0 (); -} - - -// emitter void QMediaPlayer::metaDataChanged(const QString &key, const QVariant &value) - -static void _init_emitter_metaDataChanged_4036 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("key"); - decl->add_arg (argspec_0); - static gsi::ArgSpecBase argspec_1 ("value"); - decl->add_arg (argspec_1); - decl->set_return (); -} - -static void _call_emitter_metaDataChanged_4036 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const QString &arg1 = gsi::arg_reader() (args, heap); - const QVariant &arg2 = gsi::arg_reader() (args, heap); - ((QMediaPlayer_Adaptor *)cls)->emitter_QMediaPlayer_metaDataChanged_4036 (arg1, arg2); -} - - -// emitter void QMediaPlayer::mutedChanged(bool muted) - -static void _init_emitter_mutedChanged_864 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("muted"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_mutedChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - bool arg1 = gsi::arg_reader() (args, heap); - ((QMediaPlayer_Adaptor *)cls)->emitter_QMediaPlayer_mutedChanged_864 (arg1); -} - - -// emitter void QMediaPlayer::networkConfigurationChanged(const QNetworkConfiguration &configuration) - -static void _init_emitter_networkConfigurationChanged_3508 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("configuration"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_networkConfigurationChanged_3508 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const QNetworkConfiguration &arg1 = gsi::arg_reader() (args, heap); - ((QMediaPlayer_Adaptor *)cls)->emitter_QMediaPlayer_networkConfigurationChanged_3508 (arg1); -} - - -// emitter void QMediaPlayer::notifyIntervalChanged(int milliSeconds) - -static void _init_emitter_notifyIntervalChanged_767 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("milliSeconds"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_notifyIntervalChanged_767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - int arg1 = gsi::arg_reader() (args, heap); - ((QMediaPlayer_Adaptor *)cls)->emitter_QMediaPlayer_notifyIntervalChanged_767 (arg1); -} - - -// emitter void QMediaPlayer::playbackRateChanged(double rate) - -static void _init_emitter_playbackRateChanged_1071 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("rate"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_playbackRateChanged_1071 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - double arg1 = gsi::arg_reader() (args, heap); - ((QMediaPlayer_Adaptor *)cls)->emitter_QMediaPlayer_playbackRateChanged_1071 (arg1); -} - - -// emitter void QMediaPlayer::positionChanged(qint64 position) - -static void _init_emitter_positionChanged_986 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("position"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_positionChanged_986 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - qint64 arg1 = gsi::arg_reader() (args, heap); - ((QMediaPlayer_Adaptor *)cls)->emitter_QMediaPlayer_positionChanged_986 (arg1); -} - - // exposed int QMediaPlayer::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -1768,24 +1606,6 @@ static void _call_fp_removePropertyWatch_2309 (const qt_gsi::GenericMethod * /*d } -// emitter void QMediaPlayer::seekableChanged(bool seekable) - -static void _init_emitter_seekableChanged_864 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("seekable"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_seekableChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - bool arg1 = gsi::arg_reader() (args, heap); - ((QMediaPlayer_Adaptor *)cls)->emitter_QMediaPlayer_seekableChanged_864 (arg1); -} - - // exposed QObject *QMediaPlayer::sender() static void _init_fp_sender_c0 (qt_gsi::GenericMethod *decl) @@ -1833,24 +1653,6 @@ static void _set_callback_cbs_service_c0_0 (void *cls, const gsi::Callback &cb) } -// emitter void QMediaPlayer::stateChanged(QMediaPlayer::State newState) - -static void _init_emitter_stateChanged_2247 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("newState"); - decl->add_arg::target_type & > (argspec_0); - decl->set_return (); -} - -static void _call_emitter_stateChanged_2247 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); - ((QMediaPlayer_Adaptor *)cls)->emitter_QMediaPlayer_stateChanged_2247 (arg1); -} - - // void QMediaPlayer::timerEvent(QTimerEvent *) static void _init_cbs_timerEvent_1730_0 (qt_gsi::GenericMethod *decl) @@ -1899,42 +1701,6 @@ static void _set_callback_cbs_unbind_1302_0 (void *cls, const gsi::Callback &cb) } -// emitter void QMediaPlayer::videoAvailableChanged(bool videoAvailable) - -static void _init_emitter_videoAvailableChanged_864 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("videoAvailable"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_videoAvailableChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - bool arg1 = gsi::arg_reader() (args, heap); - ((QMediaPlayer_Adaptor *)cls)->emitter_QMediaPlayer_videoAvailableChanged_864 (arg1); -} - - -// emitter void QMediaPlayer::volumeChanged(int volume) - -static void _init_emitter_volumeChanged_767 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("volume"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_volumeChanged_767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - int arg1 = gsi::arg_reader() (args, heap); - ((QMediaPlayer_Adaptor *)cls)->emitter_QMediaPlayer_volumeChanged_767 (arg1); -} - - namespace gsi { @@ -1944,24 +1710,16 @@ static gsi::Methods methods_QMediaPlayer_Adaptor () { gsi::Methods methods; methods += new qt_gsi::GenericStaticMethod ("new", "@brief Constructor QMediaPlayer::QMediaPlayer(QObject *parent, QFlags flags)\nThis method creates an object of class QMediaPlayer.", &_init_ctor_QMediaPlayer_Adaptor_4002, &_call_ctor_QMediaPlayer_Adaptor_4002); methods += new qt_gsi::GenericMethod ("*addPropertyWatch", "@brief Method void QMediaPlayer::addPropertyWatch(QByteArray const &name)\nThis method is protected and can only be called from inside a derived class.", false, &_init_fp_addPropertyWatch_2309, &_call_fp_addPropertyWatch_2309); - methods += new qt_gsi::GenericMethod ("emit_audioAvailableChanged", "@brief Emitter for signal void QMediaPlayer::audioAvailableChanged(bool available)\nCall this method to emit this signal.", false, &_init_emitter_audioAvailableChanged_864, &_call_emitter_audioAvailableChanged_864); methods += new qt_gsi::GenericMethod ("availability", "@brief Virtual method QMultimedia::AvailabilityStatus QMediaPlayer::availability()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_availability_c0_0, &_call_cbs_availability_c0_0); methods += new qt_gsi::GenericMethod ("availability", "@hide", true, &_init_cbs_availability_c0_0, &_call_cbs_availability_c0_0, &_set_callback_cbs_availability_c0_0); - methods += new qt_gsi::GenericMethod ("emit_availabilityChanged_bool", "@brief Emitter for signal void QMediaPlayer::availabilityChanged(bool available)\nCall this method to emit this signal.", false, &_init_emitter_availabilityChanged_864, &_call_emitter_availabilityChanged_864); - methods += new qt_gsi::GenericMethod ("emit_availabilityChanged_status", "@brief Emitter for signal void QMediaPlayer::availabilityChanged(QMultimedia::AvailabilityStatus availability)\nCall this method to emit this signal.", false, &_init_emitter_availabilityChanged_3555, &_call_emitter_availabilityChanged_3555); methods += new qt_gsi::GenericMethod ("bind", "@brief Virtual method bool QMediaPlayer::bind(QObject *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_bind_1302_0, &_call_cbs_bind_1302_0); methods += new qt_gsi::GenericMethod ("bind", "@hide", false, &_init_cbs_bind_1302_0, &_call_cbs_bind_1302_0, &_set_callback_cbs_bind_1302_0); - methods += new qt_gsi::GenericMethod ("emit_bufferStatusChanged", "@brief Emitter for signal void QMediaPlayer::bufferStatusChanged(int percentFilled)\nCall this method to emit this signal.", false, &_init_emitter_bufferStatusChanged_767, &_call_emitter_bufferStatusChanged_767); methods += new qt_gsi::GenericMethod ("*childEvent", "@brief Virtual method void QMediaPlayer::childEvent(QChildEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); - methods += new qt_gsi::GenericMethod ("emit_currentMediaChanged", "@brief Emitter for signal void QMediaPlayer::currentMediaChanged(const QMediaContent &media)\nCall this method to emit this signal.", false, &_init_emitter_currentMediaChanged_2605, &_call_emitter_currentMediaChanged_2605); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QMediaPlayer::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); - methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QMediaPlayer::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QMediaPlayer::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); - methods += new qt_gsi::GenericMethod ("emit_durationChanged", "@brief Emitter for signal void QMediaPlayer::durationChanged(qint64 duration)\nCall this method to emit this signal.", false, &_init_emitter_durationChanged_986, &_call_emitter_durationChanged_986); - methods += new qt_gsi::GenericMethod ("emit_error_sig", "@brief Emitter for signal void QMediaPlayer::error(QMediaPlayer::Error error)\nCall this method to emit this signal.", false, &_init_emitter_error_2256, &_call_emitter_error_2256); methods += new qt_gsi::GenericMethod ("event", "@brief Virtual method bool QMediaPlayer::event(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0); methods += new qt_gsi::GenericMethod ("event", "@hide", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0, &_set_callback_cbs_event_1217_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QMediaPlayer::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); @@ -1969,30 +1727,16 @@ static gsi::Methods methods_QMediaPlayer_Adaptor () { methods += new qt_gsi::GenericMethod ("isAvailable", "@brief Virtual method bool QMediaPlayer::isAvailable()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_isAvailable_c0_0, &_call_cbs_isAvailable_c0_0); methods += new qt_gsi::GenericMethod ("isAvailable", "@hide", true, &_init_cbs_isAvailable_c0_0, &_call_cbs_isAvailable_c0_0, &_set_callback_cbs_isAvailable_c0_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QMediaPlayer::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); - methods += new qt_gsi::GenericMethod ("emit_mediaChanged", "@brief Emitter for signal void QMediaPlayer::mediaChanged(const QMediaContent &media)\nCall this method to emit this signal.", false, &_init_emitter_mediaChanged_2605, &_call_emitter_mediaChanged_2605); - methods += new qt_gsi::GenericMethod ("emit_mediaStatusChanged", "@brief Emitter for signal void QMediaPlayer::mediaStatusChanged(QMediaPlayer::MediaStatus status)\nCall this method to emit this signal.", false, &_init_emitter_mediaStatusChanged_2858, &_call_emitter_mediaStatusChanged_2858); - methods += new qt_gsi::GenericMethod ("emit_metaDataAvailableChanged", "@brief Emitter for signal void QMediaPlayer::metaDataAvailableChanged(bool available)\nCall this method to emit this signal.", false, &_init_emitter_metaDataAvailableChanged_864, &_call_emitter_metaDataAvailableChanged_864); - methods += new qt_gsi::GenericMethod ("emit_metaDataChanged", "@brief Emitter for signal void QMediaPlayer::metaDataChanged()\nCall this method to emit this signal.", false, &_init_emitter_metaDataChanged_0, &_call_emitter_metaDataChanged_0); - methods += new qt_gsi::GenericMethod ("emit_metaDataChanged_kv", "@brief Emitter for signal void QMediaPlayer::metaDataChanged(const QString &key, const QVariant &value)\nCall this method to emit this signal.", false, &_init_emitter_metaDataChanged_4036, &_call_emitter_metaDataChanged_4036); - methods += new qt_gsi::GenericMethod ("emit_mutedChanged", "@brief Emitter for signal void QMediaPlayer::mutedChanged(bool muted)\nCall this method to emit this signal.", false, &_init_emitter_mutedChanged_864, &_call_emitter_mutedChanged_864); - methods += new qt_gsi::GenericMethod ("emit_networkConfigurationChanged", "@brief Emitter for signal void QMediaPlayer::networkConfigurationChanged(const QNetworkConfiguration &configuration)\nCall this method to emit this signal.", false, &_init_emitter_networkConfigurationChanged_3508, &_call_emitter_networkConfigurationChanged_3508); - methods += new qt_gsi::GenericMethod ("emit_notifyIntervalChanged", "@brief Emitter for signal void QMediaPlayer::notifyIntervalChanged(int milliSeconds)\nCall this method to emit this signal.", false, &_init_emitter_notifyIntervalChanged_767, &_call_emitter_notifyIntervalChanged_767); - methods += new qt_gsi::GenericMethod ("emit_playbackRateChanged", "@brief Emitter for signal void QMediaPlayer::playbackRateChanged(double rate)\nCall this method to emit this signal.", false, &_init_emitter_playbackRateChanged_1071, &_call_emitter_playbackRateChanged_1071); - methods += new qt_gsi::GenericMethod ("emit_positionChanged", "@brief Emitter for signal void QMediaPlayer::positionChanged(qint64 position)\nCall this method to emit this signal.", false, &_init_emitter_positionChanged_986, &_call_emitter_positionChanged_986); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QMediaPlayer::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*removePropertyWatch", "@brief Method void QMediaPlayer::removePropertyWatch(QByteArray const &name)\nThis method is protected and can only be called from inside a derived class.", false, &_init_fp_removePropertyWatch_2309, &_call_fp_removePropertyWatch_2309); - methods += new qt_gsi::GenericMethod ("emit_seekableChanged", "@brief Emitter for signal void QMediaPlayer::seekableChanged(bool seekable)\nCall this method to emit this signal.", false, &_init_emitter_seekableChanged_864, &_call_emitter_seekableChanged_864); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QMediaPlayer::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QMediaPlayer::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); methods += new qt_gsi::GenericMethod ("service", "@brief Virtual method QMediaService *QMediaPlayer::service()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_service_c0_0, &_call_cbs_service_c0_0); methods += new qt_gsi::GenericMethod ("service", "@hide", true, &_init_cbs_service_c0_0, &_call_cbs_service_c0_0, &_set_callback_cbs_service_c0_0); - methods += new qt_gsi::GenericMethod ("emit_stateChanged", "@brief Emitter for signal void QMediaPlayer::stateChanged(QMediaPlayer::State newState)\nCall this method to emit this signal.", false, &_init_emitter_stateChanged_2247, &_call_emitter_stateChanged_2247); methods += new qt_gsi::GenericMethod ("*timerEvent", "@brief Virtual method void QMediaPlayer::timerEvent(QTimerEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_timerEvent_1730_0, &_call_cbs_timerEvent_1730_0); methods += new qt_gsi::GenericMethod ("*timerEvent", "@hide", false, &_init_cbs_timerEvent_1730_0, &_call_cbs_timerEvent_1730_0, &_set_callback_cbs_timerEvent_1730_0); methods += new qt_gsi::GenericMethod ("unbind", "@brief Virtual method void QMediaPlayer::unbind(QObject *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_unbind_1302_0, &_call_cbs_unbind_1302_0); methods += new qt_gsi::GenericMethod ("unbind", "@hide", false, &_init_cbs_unbind_1302_0, &_call_cbs_unbind_1302_0, &_set_callback_cbs_unbind_1302_0); - methods += new qt_gsi::GenericMethod ("emit_videoAvailableChanged", "@brief Emitter for signal void QMediaPlayer::videoAvailableChanged(bool videoAvailable)\nCall this method to emit this signal.", false, &_init_emitter_videoAvailableChanged_864, &_call_emitter_videoAvailableChanged_864); - methods += new qt_gsi::GenericMethod ("emit_volumeChanged", "@brief Emitter for signal void QMediaPlayer::volumeChanged(int volume)\nCall this method to emit this signal.", false, &_init_emitter_volumeChanged_767, &_call_emitter_volumeChanged_767); return methods; } diff --git a/src/gsiqt/qt5/QtMultimedia/gsiDeclQMediaPlayerControl.cc b/src/gsiqt/qt5/QtMultimedia/gsiDeclQMediaPlayerControl.cc index 41f206ea3..634c0e8ef 100644 --- a/src/gsiqt/qt5/QtMultimedia/gsiDeclQMediaPlayerControl.cc +++ b/src/gsiqt/qt5/QtMultimedia/gsiDeclQMediaPlayerControl.cc @@ -58,6 +58,26 @@ static void _call_smo (const qt_gsi::GenericStaticMethod *, gsi::SerialArgs &, g } +// void QMediaPlayerControl::audioAvailableChanged(bool audioAvailable) + + +static void _init_f_audioAvailableChanged_864 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("audioAvailable"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_audioAvailableChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + bool arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaPlayerControl *)cls)->audioAvailableChanged (arg1); +} + + // QMediaTimeRange QMediaPlayerControl::availablePlaybackRanges() @@ -73,6 +93,26 @@ static void _call_f_availablePlaybackRanges_c0 (const qt_gsi::GenericMethod * /* } +// void QMediaPlayerControl::availablePlaybackRangesChanged(const QMediaTimeRange &) + + +static void _init_f_availablePlaybackRangesChanged_2766 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("arg1"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_availablePlaybackRangesChanged_2766 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QMediaTimeRange &arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaPlayerControl *)cls)->availablePlaybackRangesChanged (arg1); +} + + // int QMediaPlayerControl::bufferStatus() @@ -88,6 +128,26 @@ static void _call_f_bufferStatus_c0 (const qt_gsi::GenericMethod * /*decl*/, voi } +// void QMediaPlayerControl::bufferStatusChanged(int percentFilled) + + +static void _init_f_bufferStatusChanged_767 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("percentFilled"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_bufferStatusChanged_767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + int arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaPlayerControl *)cls)->bufferStatusChanged (arg1); +} + + // qint64 QMediaPlayerControl::duration() @@ -103,6 +163,49 @@ static void _call_f_duration_c0 (const qt_gsi::GenericMethod * /*decl*/, void *c } +// void QMediaPlayerControl::durationChanged(qint64 duration) + + +static void _init_f_durationChanged_986 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("duration"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_durationChanged_986 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + qint64 arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaPlayerControl *)cls)->durationChanged (arg1); +} + + +// void QMediaPlayerControl::error(int error, const QString &errorString) + + +static void _init_f_error_2684 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("error"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("errorString"); + decl->add_arg (argspec_1); + decl->set_return (); +} + +static void _call_f_error_2684 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + int arg1 = gsi::arg_reader() (args, heap); + const QString &arg2 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaPlayerControl *)cls)->error (arg1, arg2); +} + + // bool QMediaPlayerControl::isAudioAvailable() @@ -178,6 +281,26 @@ static void _call_f_media_c0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, } +// void QMediaPlayerControl::mediaChanged(const QMediaContent &content) + + +static void _init_f_mediaChanged_2605 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("content"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_mediaChanged_2605 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QMediaContent &arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaPlayerControl *)cls)->mediaChanged (arg1); +} + + // QMediaPlayer::MediaStatus QMediaPlayerControl::mediaStatus() @@ -193,6 +316,26 @@ static void _call_f_mediaStatus_c0 (const qt_gsi::GenericMethod * /*decl*/, void } +// void QMediaPlayerControl::mediaStatusChanged(QMediaPlayer::MediaStatus status) + + +static void _init_f_mediaStatusChanged_2858 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("status"); + decl->add_arg::target_type & > (argspec_0); + decl->set_return (); +} + +static void _call_f_mediaStatusChanged_2858 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaPlayerControl *)cls)->mediaStatusChanged (qt_gsi::QtToCppAdaptor(arg1).cref()); +} + + // const QIODevice *QMediaPlayerControl::mediaStream() @@ -208,6 +351,26 @@ static void _call_f_mediaStream_c0 (const qt_gsi::GenericMethod * /*decl*/, void } +// void QMediaPlayerControl::mutedChanged(bool muted) + + +static void _init_f_mutedChanged_864 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("muted"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_mutedChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + bool arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaPlayerControl *)cls)->mutedChanged (arg1); +} + + // void QMediaPlayerControl::pause() @@ -255,6 +418,26 @@ static void _call_f_playbackRate_c0 (const qt_gsi::GenericMethod * /*decl*/, voi } +// void QMediaPlayerControl::playbackRateChanged(double rate) + + +static void _init_f_playbackRateChanged_1071 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("rate"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_playbackRateChanged_1071 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + double arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaPlayerControl *)cls)->playbackRateChanged (arg1); +} + + // qint64 QMediaPlayerControl::position() @@ -270,6 +453,46 @@ static void _call_f_position_c0 (const qt_gsi::GenericMethod * /*decl*/, void *c } +// void QMediaPlayerControl::positionChanged(qint64 position) + + +static void _init_f_positionChanged_986 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("position"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_positionChanged_986 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + qint64 arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaPlayerControl *)cls)->positionChanged (arg1); +} + + +// void QMediaPlayerControl::seekableChanged(bool) + + +static void _init_f_seekableChanged_864 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("arg1"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_seekableChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + bool arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaPlayerControl *)cls)->seekableChanged (arg1); +} + + // void QMediaPlayerControl::setMedia(const QMediaContent &media, QIODevice *stream) @@ -388,6 +611,26 @@ static void _call_f_state_c0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, } +// void QMediaPlayerControl::stateChanged(QMediaPlayer::State newState) + + +static void _init_f_stateChanged_2247 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("newState"); + decl->add_arg::target_type & > (argspec_0); + decl->set_return (); +} + +static void _call_f_stateChanged_2247 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaPlayerControl *)cls)->stateChanged (qt_gsi::QtToCppAdaptor(arg1).cref()); +} + + // void QMediaPlayerControl::stop() @@ -404,6 +647,26 @@ static void _call_f_stop_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, g } +// void QMediaPlayerControl::videoAvailableChanged(bool videoAvailable) + + +static void _init_f_videoAvailableChanged_864 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("videoAvailable"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_videoAvailableChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + bool arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaPlayerControl *)cls)->videoAvailableChanged (arg1); +} + + // int QMediaPlayerControl::volume() @@ -419,6 +682,26 @@ static void _call_f_volume_c0 (const qt_gsi::GenericMethod * /*decl*/, void *cls } +// void QMediaPlayerControl::volumeChanged(int volume) + + +static void _init_f_volumeChanged_767 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("volume"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_volumeChanged_767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + int arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaPlayerControl *)cls)->volumeChanged (arg1); +} + + // static QString QMediaPlayerControl::tr(const char *s, const char *c, int n) @@ -475,43 +758,42 @@ namespace gsi static gsi::Methods methods_QMediaPlayerControl () { gsi::Methods methods; methods += new qt_gsi::GenericStaticMethod ("staticMetaObject", "@brief Obtains the static MetaObject for this class.", &_init_smo, &_call_smo); + methods += new qt_gsi::GenericMethod ("audioAvailableChanged", "@brief Method void QMediaPlayerControl::audioAvailableChanged(bool audioAvailable)\n", false, &_init_f_audioAvailableChanged_864, &_call_f_audioAvailableChanged_864); methods += new qt_gsi::GenericMethod ("availablePlaybackRanges", "@brief Method QMediaTimeRange QMediaPlayerControl::availablePlaybackRanges()\n", true, &_init_f_availablePlaybackRanges_c0, &_call_f_availablePlaybackRanges_c0); + methods += new qt_gsi::GenericMethod ("availablePlaybackRangesChanged", "@brief Method void QMediaPlayerControl::availablePlaybackRangesChanged(const QMediaTimeRange &)\n", false, &_init_f_availablePlaybackRangesChanged_2766, &_call_f_availablePlaybackRangesChanged_2766); methods += new qt_gsi::GenericMethod ("bufferStatus", "@brief Method int QMediaPlayerControl::bufferStatus()\n", true, &_init_f_bufferStatus_c0, &_call_f_bufferStatus_c0); + methods += new qt_gsi::GenericMethod ("bufferStatusChanged", "@brief Method void QMediaPlayerControl::bufferStatusChanged(int percentFilled)\n", false, &_init_f_bufferStatusChanged_767, &_call_f_bufferStatusChanged_767); methods += new qt_gsi::GenericMethod ("duration", "@brief Method qint64 QMediaPlayerControl::duration()\n", true, &_init_f_duration_c0, &_call_f_duration_c0); + methods += new qt_gsi::GenericMethod ("durationChanged", "@brief Method void QMediaPlayerControl::durationChanged(qint64 duration)\n", false, &_init_f_durationChanged_986, &_call_f_durationChanged_986); + methods += new qt_gsi::GenericMethod ("error", "@brief Method void QMediaPlayerControl::error(int error, const QString &errorString)\n", false, &_init_f_error_2684, &_call_f_error_2684); methods += new qt_gsi::GenericMethod ("isAudioAvailable?", "@brief Method bool QMediaPlayerControl::isAudioAvailable()\n", true, &_init_f_isAudioAvailable_c0, &_call_f_isAudioAvailable_c0); methods += new qt_gsi::GenericMethod ("isMuted?|:muted", "@brief Method bool QMediaPlayerControl::isMuted()\n", true, &_init_f_isMuted_c0, &_call_f_isMuted_c0); methods += new qt_gsi::GenericMethod ("isSeekable?", "@brief Method bool QMediaPlayerControl::isSeekable()\n", true, &_init_f_isSeekable_c0, &_call_f_isSeekable_c0); methods += new qt_gsi::GenericMethod ("isVideoAvailable?", "@brief Method bool QMediaPlayerControl::isVideoAvailable()\n", true, &_init_f_isVideoAvailable_c0, &_call_f_isVideoAvailable_c0); methods += new qt_gsi::GenericMethod ("media", "@brief Method QMediaContent QMediaPlayerControl::media()\n", true, &_init_f_media_c0, &_call_f_media_c0); + methods += new qt_gsi::GenericMethod ("mediaChanged", "@brief Method void QMediaPlayerControl::mediaChanged(const QMediaContent &content)\n", false, &_init_f_mediaChanged_2605, &_call_f_mediaChanged_2605); methods += new qt_gsi::GenericMethod ("mediaStatus", "@brief Method QMediaPlayer::MediaStatus QMediaPlayerControl::mediaStatus()\n", true, &_init_f_mediaStatus_c0, &_call_f_mediaStatus_c0); + methods += new qt_gsi::GenericMethod ("mediaStatusChanged", "@brief Method void QMediaPlayerControl::mediaStatusChanged(QMediaPlayer::MediaStatus status)\n", false, &_init_f_mediaStatusChanged_2858, &_call_f_mediaStatusChanged_2858); methods += new qt_gsi::GenericMethod ("mediaStream", "@brief Method const QIODevice *QMediaPlayerControl::mediaStream()\n", true, &_init_f_mediaStream_c0, &_call_f_mediaStream_c0); + methods += new qt_gsi::GenericMethod ("mutedChanged", "@brief Method void QMediaPlayerControl::mutedChanged(bool muted)\n", false, &_init_f_mutedChanged_864, &_call_f_mutedChanged_864); methods += new qt_gsi::GenericMethod ("pause", "@brief Method void QMediaPlayerControl::pause()\n", false, &_init_f_pause_0, &_call_f_pause_0); methods += new qt_gsi::GenericMethod ("play", "@brief Method void QMediaPlayerControl::play()\n", false, &_init_f_play_0, &_call_f_play_0); methods += new qt_gsi::GenericMethod (":playbackRate", "@brief Method double QMediaPlayerControl::playbackRate()\n", true, &_init_f_playbackRate_c0, &_call_f_playbackRate_c0); + methods += new qt_gsi::GenericMethod ("playbackRateChanged", "@brief Method void QMediaPlayerControl::playbackRateChanged(double rate)\n", false, &_init_f_playbackRateChanged_1071, &_call_f_playbackRateChanged_1071); methods += new qt_gsi::GenericMethod (":position", "@brief Method qint64 QMediaPlayerControl::position()\n", true, &_init_f_position_c0, &_call_f_position_c0); + methods += new qt_gsi::GenericMethod ("positionChanged", "@brief Method void QMediaPlayerControl::positionChanged(qint64 position)\n", false, &_init_f_positionChanged_986, &_call_f_positionChanged_986); + methods += new qt_gsi::GenericMethod ("seekableChanged", "@brief Method void QMediaPlayerControl::seekableChanged(bool)\n", false, &_init_f_seekableChanged_864, &_call_f_seekableChanged_864); methods += new qt_gsi::GenericMethod ("setMedia", "@brief Method void QMediaPlayerControl::setMedia(const QMediaContent &media, QIODevice *stream)\n", false, &_init_f_setMedia_3944, &_call_f_setMedia_3944); methods += new qt_gsi::GenericMethod ("setMuted|muted=", "@brief Method void QMediaPlayerControl::setMuted(bool muted)\n", false, &_init_f_setMuted_864, &_call_f_setMuted_864); methods += new qt_gsi::GenericMethod ("setPlaybackRate|playbackRate=", "@brief Method void QMediaPlayerControl::setPlaybackRate(double rate)\n", false, &_init_f_setPlaybackRate_1071, &_call_f_setPlaybackRate_1071); methods += new qt_gsi::GenericMethod ("setPosition|position=", "@brief Method void QMediaPlayerControl::setPosition(qint64 position)\n", false, &_init_f_setPosition_986, &_call_f_setPosition_986); methods += new qt_gsi::GenericMethod ("setVolume|volume=", "@brief Method void QMediaPlayerControl::setVolume(int volume)\n", false, &_init_f_setVolume_767, &_call_f_setVolume_767); methods += new qt_gsi::GenericMethod ("state", "@brief Method QMediaPlayer::State QMediaPlayerControl::state()\n", true, &_init_f_state_c0, &_call_f_state_c0); + methods += new qt_gsi::GenericMethod ("stateChanged", "@brief Method void QMediaPlayerControl::stateChanged(QMediaPlayer::State newState)\n", false, &_init_f_stateChanged_2247, &_call_f_stateChanged_2247); methods += new qt_gsi::GenericMethod ("stop", "@brief Method void QMediaPlayerControl::stop()\n", false, &_init_f_stop_0, &_call_f_stop_0); + methods += new qt_gsi::GenericMethod ("videoAvailableChanged", "@brief Method void QMediaPlayerControl::videoAvailableChanged(bool videoAvailable)\n", false, &_init_f_videoAvailableChanged_864, &_call_f_videoAvailableChanged_864); methods += new qt_gsi::GenericMethod (":volume", "@brief Method int QMediaPlayerControl::volume()\n", true, &_init_f_volume_c0, &_call_f_volume_c0); - methods += gsi::qt_signal ("audioAvailableChanged(bool)", "audioAvailableChanged", gsi::arg("audioAvailable"), "@brief Signal declaration for QMediaPlayerControl::audioAvailableChanged(bool audioAvailable)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("availablePlaybackRangesChanged(const QMediaTimeRange &)", "availablePlaybackRangesChanged", gsi::arg("arg1"), "@brief Signal declaration for QMediaPlayerControl::availablePlaybackRangesChanged(const QMediaTimeRange &)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("bufferStatusChanged(int)", "bufferStatusChanged", gsi::arg("percentFilled"), "@brief Signal declaration for QMediaPlayerControl::bufferStatusChanged(int percentFilled)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QMediaPlayerControl::destroyed(QObject *)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("durationChanged(qint64)", "durationChanged", gsi::arg("duration"), "@brief Signal declaration for QMediaPlayerControl::durationChanged(qint64 duration)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("error(int, const QString &)", "error", gsi::arg("error"), gsi::arg("errorString"), "@brief Signal declaration for QMediaPlayerControl::error(int error, const QString &errorString)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("mediaChanged(const QMediaContent &)", "mediaChanged", gsi::arg("content"), "@brief Signal declaration for QMediaPlayerControl::mediaChanged(const QMediaContent &content)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal::target_type & > ("mediaStatusChanged(QMediaPlayer::MediaStatus)", "mediaStatusChanged", gsi::arg("status"), "@brief Signal declaration for QMediaPlayerControl::mediaStatusChanged(QMediaPlayer::MediaStatus status)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("mutedChanged(bool)", "mutedChanged", gsi::arg("muted"), "@brief Signal declaration for QMediaPlayerControl::mutedChanged(bool muted)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("playbackRateChanged(double)", "playbackRateChanged", gsi::arg("rate"), "@brief Signal declaration for QMediaPlayerControl::playbackRateChanged(double rate)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("positionChanged(qint64)", "positionChanged", gsi::arg("position"), "@brief Signal declaration for QMediaPlayerControl::positionChanged(qint64 position)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("seekableChanged(bool)", "seekableChanged", gsi::arg("arg1"), "@brief Signal declaration for QMediaPlayerControl::seekableChanged(bool)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal::target_type & > ("stateChanged(QMediaPlayer::State)", "stateChanged", gsi::arg("newState"), "@brief Signal declaration for QMediaPlayerControl::stateChanged(QMediaPlayer::State newState)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("videoAvailableChanged(bool)", "videoAvailableChanged", gsi::arg("videoAvailable"), "@brief Signal declaration for QMediaPlayerControl::videoAvailableChanged(bool videoAvailable)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("volumeChanged(int)", "volumeChanged", gsi::arg("volume"), "@brief Signal declaration for QMediaPlayerControl::volumeChanged(int volume)\nYou can bind a procedure to this signal."); + methods += new qt_gsi::GenericMethod ("volumeChanged", "@brief Method void QMediaPlayerControl::volumeChanged(int volume)\n", false, &_init_f_volumeChanged_767, &_call_f_volumeChanged_767); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QMediaPlayerControl::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QMediaPlayerControl::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -560,12 +842,6 @@ public: return QMediaPlayerControl::senderSignalIndex(); } - // [emitter impl] void QMediaPlayerControl::audioAvailableChanged(bool audioAvailable) - void emitter_QMediaPlayerControl_audioAvailableChanged_864(bool audioAvailable) - { - emit QMediaPlayerControl::audioAvailableChanged(audioAvailable); - } - // [adaptor impl] QMediaTimeRange QMediaPlayerControl::availablePlaybackRanges() QMediaTimeRange cbs_availablePlaybackRanges_c0_0() const { @@ -581,12 +857,6 @@ public: } } - // [emitter impl] void QMediaPlayerControl::availablePlaybackRangesChanged(const QMediaTimeRange &) - void emitter_QMediaPlayerControl_availablePlaybackRangesChanged_2766(const QMediaTimeRange &arg1) - { - emit QMediaPlayerControl::availablePlaybackRangesChanged(arg1); - } - // [adaptor impl] int QMediaPlayerControl::bufferStatus() int cbs_bufferStatus_c0_0() const { @@ -602,18 +872,6 @@ public: } } - // [emitter impl] void QMediaPlayerControl::bufferStatusChanged(int percentFilled) - void emitter_QMediaPlayerControl_bufferStatusChanged_767(int percentFilled) - { - emit QMediaPlayerControl::bufferStatusChanged(percentFilled); - } - - // [emitter impl] void QMediaPlayerControl::destroyed(QObject *) - void emitter_QMediaPlayerControl_destroyed_1302(QObject *arg1) - { - emit QMediaPlayerControl::destroyed(arg1); - } - // [adaptor impl] qint64 QMediaPlayerControl::duration() qint64 cbs_duration_c0_0() const { @@ -629,18 +887,6 @@ public: } } - // [emitter impl] void QMediaPlayerControl::durationChanged(qint64 duration) - void emitter_QMediaPlayerControl_durationChanged_986(qint64 duration) - { - emit QMediaPlayerControl::durationChanged(duration); - } - - // [emitter impl] void QMediaPlayerControl::error(int error, const QString &errorString) - void emitter_QMediaPlayerControl_error_2684(int _error, const QString &errorString) - { - emit QMediaPlayerControl::error(_error, errorString); - } - // [adaptor impl] bool QMediaPlayerControl::event(QEvent *) bool cbs_event_1217_0(QEvent *arg1) { @@ -746,12 +992,6 @@ public: } } - // [emitter impl] void QMediaPlayerControl::mediaChanged(const QMediaContent &content) - void emitter_QMediaPlayerControl_mediaChanged_2605(const QMediaContent &content) - { - emit QMediaPlayerControl::mediaChanged(content); - } - // [adaptor impl] QMediaPlayer::MediaStatus QMediaPlayerControl::mediaStatus() qt_gsi::Converter::target_type cbs_mediaStatus_c0_0() const { @@ -767,12 +1007,6 @@ public: } } - // [emitter impl] void QMediaPlayerControl::mediaStatusChanged(QMediaPlayer::MediaStatus status) - void emitter_QMediaPlayerControl_mediaStatusChanged_2858(QMediaPlayer::MediaStatus status) - { - emit QMediaPlayerControl::mediaStatusChanged(status); - } - // [adaptor impl] const QIODevice *QMediaPlayerControl::mediaStream() const QIODevice * cbs_mediaStream_c0_0() const { @@ -788,12 +1022,6 @@ public: } } - // [emitter impl] void QMediaPlayerControl::mutedChanged(bool muted) - void emitter_QMediaPlayerControl_mutedChanged_864(bool muted) - { - emit QMediaPlayerControl::mutedChanged(muted); - } - // [adaptor impl] void QMediaPlayerControl::pause() void cbs_pause_0_0() { @@ -839,12 +1067,6 @@ public: } } - // [emitter impl] void QMediaPlayerControl::playbackRateChanged(double rate) - void emitter_QMediaPlayerControl_playbackRateChanged_1071(double rate) - { - emit QMediaPlayerControl::playbackRateChanged(rate); - } - // [adaptor impl] qint64 QMediaPlayerControl::position() qint64 cbs_position_c0_0() const { @@ -860,18 +1082,6 @@ public: } } - // [emitter impl] void QMediaPlayerControl::positionChanged(qint64 position) - void emitter_QMediaPlayerControl_positionChanged_986(qint64 position) - { - emit QMediaPlayerControl::positionChanged(position); - } - - // [emitter impl] void QMediaPlayerControl::seekableChanged(bool) - void emitter_QMediaPlayerControl_seekableChanged_864(bool arg1) - { - emit QMediaPlayerControl::seekableChanged(arg1); - } - // [adaptor impl] void QMediaPlayerControl::setMedia(const QMediaContent &media, QIODevice *stream) void cbs_setMedia_3944_0(const QMediaContent &media, QIODevice *stream) { @@ -968,12 +1178,6 @@ public: } } - // [emitter impl] void QMediaPlayerControl::stateChanged(QMediaPlayer::State newState) - void emitter_QMediaPlayerControl_stateChanged_2247(QMediaPlayer::State newState) - { - emit QMediaPlayerControl::stateChanged(newState); - } - // [adaptor impl] void QMediaPlayerControl::stop() void cbs_stop_0_0() { @@ -989,12 +1193,6 @@ public: } } - // [emitter impl] void QMediaPlayerControl::videoAvailableChanged(bool videoAvailable) - void emitter_QMediaPlayerControl_videoAvailableChanged_864(bool videoAvailable) - { - emit QMediaPlayerControl::videoAvailableChanged(videoAvailable); - } - // [adaptor impl] int QMediaPlayerControl::volume() int cbs_volume_c0_0() const { @@ -1010,12 +1208,6 @@ public: } } - // [emitter impl] void QMediaPlayerControl::volumeChanged(int volume) - void emitter_QMediaPlayerControl_volumeChanged_767(int volume) - { - emit QMediaPlayerControl::volumeChanged(volume); - } - // [adaptor impl] void QMediaPlayerControl::childEvent(QChildEvent *) void cbs_childEvent_1701_0(QChildEvent *arg1) { @@ -1122,24 +1314,6 @@ static void _call_ctor_QMediaPlayerControl_Adaptor_0 (const qt_gsi::GenericStati } -// emitter void QMediaPlayerControl::audioAvailableChanged(bool audioAvailable) - -static void _init_emitter_audioAvailableChanged_864 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("audioAvailable"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_audioAvailableChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - bool arg1 = gsi::arg_reader() (args, heap); - ((QMediaPlayerControl_Adaptor *)cls)->emitter_QMediaPlayerControl_audioAvailableChanged_864 (arg1); -} - - // QMediaTimeRange QMediaPlayerControl::availablePlaybackRanges() static void _init_cbs_availablePlaybackRanges_c0_0 (qt_gsi::GenericMethod *decl) @@ -1159,24 +1333,6 @@ static void _set_callback_cbs_availablePlaybackRanges_c0_0 (void *cls, const gsi } -// emitter void QMediaPlayerControl::availablePlaybackRangesChanged(const QMediaTimeRange &) - -static void _init_emitter_availablePlaybackRangesChanged_2766 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_availablePlaybackRangesChanged_2766 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const QMediaTimeRange &arg1 = gsi::arg_reader() (args, heap); - ((QMediaPlayerControl_Adaptor *)cls)->emitter_QMediaPlayerControl_availablePlaybackRangesChanged_2766 (arg1); -} - - // int QMediaPlayerControl::bufferStatus() static void _init_cbs_bufferStatus_c0_0 (qt_gsi::GenericMethod *decl) @@ -1196,24 +1352,6 @@ static void _set_callback_cbs_bufferStatus_c0_0 (void *cls, const gsi::Callback } -// emitter void QMediaPlayerControl::bufferStatusChanged(int percentFilled) - -static void _init_emitter_bufferStatusChanged_767 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("percentFilled"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_bufferStatusChanged_767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - int arg1 = gsi::arg_reader() (args, heap); - ((QMediaPlayerControl_Adaptor *)cls)->emitter_QMediaPlayerControl_bufferStatusChanged_767 (arg1); -} - - // void QMediaPlayerControl::childEvent(QChildEvent *) static void _init_cbs_childEvent_1701_0 (qt_gsi::GenericMethod *decl) @@ -1262,24 +1400,6 @@ static void _set_callback_cbs_customEvent_1217_0 (void *cls, const gsi::Callback } -// emitter void QMediaPlayerControl::destroyed(QObject *) - -static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - ((QMediaPlayerControl_Adaptor *)cls)->emitter_QMediaPlayerControl_destroyed_1302 (arg1); -} - - // void QMediaPlayerControl::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -1323,45 +1443,6 @@ static void _set_callback_cbs_duration_c0_0 (void *cls, const gsi::Callback &cb) } -// emitter void QMediaPlayerControl::durationChanged(qint64 duration) - -static void _init_emitter_durationChanged_986 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("duration"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_durationChanged_986 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - qint64 arg1 = gsi::arg_reader() (args, heap); - ((QMediaPlayerControl_Adaptor *)cls)->emitter_QMediaPlayerControl_durationChanged_986 (arg1); -} - - -// emitter void QMediaPlayerControl::error(int error, const QString &errorString) - -static void _init_emitter_error_2684 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("error"); - decl->add_arg (argspec_0); - static gsi::ArgSpecBase argspec_1 ("errorString"); - decl->add_arg (argspec_1); - decl->set_return (); -} - -static void _call_emitter_error_2684 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - int arg1 = gsi::arg_reader() (args, heap); - const QString &arg2 = gsi::arg_reader() (args, heap); - ((QMediaPlayerControl_Adaptor *)cls)->emitter_QMediaPlayerControl_error_2684 (arg1, arg2); -} - - // bool QMediaPlayerControl::event(QEvent *) static void _init_cbs_event_1217_0 (qt_gsi::GenericMethod *decl) @@ -1524,24 +1605,6 @@ static void _set_callback_cbs_media_c0_0 (void *cls, const gsi::Callback &cb) } -// emitter void QMediaPlayerControl::mediaChanged(const QMediaContent &content) - -static void _init_emitter_mediaChanged_2605 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("content"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_mediaChanged_2605 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const QMediaContent &arg1 = gsi::arg_reader() (args, heap); - ((QMediaPlayerControl_Adaptor *)cls)->emitter_QMediaPlayerControl_mediaChanged_2605 (arg1); -} - - // QMediaPlayer::MediaStatus QMediaPlayerControl::mediaStatus() static void _init_cbs_mediaStatus_c0_0 (qt_gsi::GenericMethod *decl) @@ -1561,24 +1624,6 @@ static void _set_callback_cbs_mediaStatus_c0_0 (void *cls, const gsi::Callback & } -// emitter void QMediaPlayerControl::mediaStatusChanged(QMediaPlayer::MediaStatus status) - -static void _init_emitter_mediaStatusChanged_2858 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("status"); - decl->add_arg::target_type & > (argspec_0); - decl->set_return (); -} - -static void _call_emitter_mediaStatusChanged_2858 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); - ((QMediaPlayerControl_Adaptor *)cls)->emitter_QMediaPlayerControl_mediaStatusChanged_2858 (arg1); -} - - // const QIODevice *QMediaPlayerControl::mediaStream() static void _init_cbs_mediaStream_c0_0 (qt_gsi::GenericMethod *decl) @@ -1598,24 +1643,6 @@ static void _set_callback_cbs_mediaStream_c0_0 (void *cls, const gsi::Callback & } -// emitter void QMediaPlayerControl::mutedChanged(bool muted) - -static void _init_emitter_mutedChanged_864 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("muted"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_mutedChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - bool arg1 = gsi::arg_reader() (args, heap); - ((QMediaPlayerControl_Adaptor *)cls)->emitter_QMediaPlayerControl_mutedChanged_864 (arg1); -} - - // void QMediaPlayerControl::pause() static void _init_cbs_pause_0_0 (qt_gsi::GenericMethod *decl) @@ -1675,24 +1702,6 @@ static void _set_callback_cbs_playbackRate_c0_0 (void *cls, const gsi::Callback } -// emitter void QMediaPlayerControl::playbackRateChanged(double rate) - -static void _init_emitter_playbackRateChanged_1071 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("rate"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_playbackRateChanged_1071 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - double arg1 = gsi::arg_reader() (args, heap); - ((QMediaPlayerControl_Adaptor *)cls)->emitter_QMediaPlayerControl_playbackRateChanged_1071 (arg1); -} - - // qint64 QMediaPlayerControl::position() static void _init_cbs_position_c0_0 (qt_gsi::GenericMethod *decl) @@ -1712,24 +1721,6 @@ static void _set_callback_cbs_position_c0_0 (void *cls, const gsi::Callback &cb) } -// emitter void QMediaPlayerControl::positionChanged(qint64 position) - -static void _init_emitter_positionChanged_986 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("position"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_positionChanged_986 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - qint64 arg1 = gsi::arg_reader() (args, heap); - ((QMediaPlayerControl_Adaptor *)cls)->emitter_QMediaPlayerControl_positionChanged_986 (arg1); -} - - // exposed int QMediaPlayerControl::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -1748,24 +1739,6 @@ static void _call_fp_receivers_c1731 (const qt_gsi::GenericMethod * /*decl*/, vo } -// emitter void QMediaPlayerControl::seekableChanged(bool) - -static void _init_emitter_seekableChanged_864 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_seekableChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - bool arg1 = gsi::arg_reader() (args, heap); - ((QMediaPlayerControl_Adaptor *)cls)->emitter_QMediaPlayerControl_seekableChanged_864 (arg1); -} - - // exposed QObject *QMediaPlayerControl::sender() static void _init_fp_sender_c0 (qt_gsi::GenericMethod *decl) @@ -1936,24 +1909,6 @@ static void _set_callback_cbs_state_c0_0 (void *cls, const gsi::Callback &cb) } -// emitter void QMediaPlayerControl::stateChanged(QMediaPlayer::State newState) - -static void _init_emitter_stateChanged_2247 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("newState"); - decl->add_arg::target_type & > (argspec_0); - decl->set_return (); -} - -static void _call_emitter_stateChanged_2247 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); - ((QMediaPlayerControl_Adaptor *)cls)->emitter_QMediaPlayerControl_stateChanged_2247 (arg1); -} - - // void QMediaPlayerControl::stop() static void _init_cbs_stop_0_0 (qt_gsi::GenericMethod *decl) @@ -1998,24 +1953,6 @@ static void _set_callback_cbs_timerEvent_1730_0 (void *cls, const gsi::Callback } -// emitter void QMediaPlayerControl::videoAvailableChanged(bool videoAvailable) - -static void _init_emitter_videoAvailableChanged_864 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("videoAvailable"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_videoAvailableChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - bool arg1 = gsi::arg_reader() (args, heap); - ((QMediaPlayerControl_Adaptor *)cls)->emitter_QMediaPlayerControl_videoAvailableChanged_864 (arg1); -} - - // int QMediaPlayerControl::volume() static void _init_cbs_volume_c0_0 (qt_gsi::GenericMethod *decl) @@ -2035,24 +1972,6 @@ static void _set_callback_cbs_volume_c0_0 (void *cls, const gsi::Callback &cb) } -// emitter void QMediaPlayerControl::volumeChanged(int volume) - -static void _init_emitter_volumeChanged_767 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("volume"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_volumeChanged_767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - int arg1 = gsi::arg_reader() (args, heap); - ((QMediaPlayerControl_Adaptor *)cls)->emitter_QMediaPlayerControl_volumeChanged_767 (arg1); -} - - namespace gsi { @@ -2061,24 +1980,18 @@ gsi::Class &qtdecl_QMediaPlayerControl (); static gsi::Methods methods_QMediaPlayerControl_Adaptor () { gsi::Methods methods; methods += new qt_gsi::GenericStaticMethod ("new", "@brief Constructor QMediaPlayerControl::QMediaPlayerControl()\nThis method creates an object of class QMediaPlayerControl.", &_init_ctor_QMediaPlayerControl_Adaptor_0, &_call_ctor_QMediaPlayerControl_Adaptor_0); - methods += new qt_gsi::GenericMethod ("emit_audioAvailableChanged", "@brief Emitter for signal void QMediaPlayerControl::audioAvailableChanged(bool audioAvailable)\nCall this method to emit this signal.", false, &_init_emitter_audioAvailableChanged_864, &_call_emitter_audioAvailableChanged_864); methods += new qt_gsi::GenericMethod ("availablePlaybackRanges", "@brief Virtual method QMediaTimeRange QMediaPlayerControl::availablePlaybackRanges()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_availablePlaybackRanges_c0_0, &_call_cbs_availablePlaybackRanges_c0_0); methods += new qt_gsi::GenericMethod ("availablePlaybackRanges", "@hide", true, &_init_cbs_availablePlaybackRanges_c0_0, &_call_cbs_availablePlaybackRanges_c0_0, &_set_callback_cbs_availablePlaybackRanges_c0_0); - methods += new qt_gsi::GenericMethod ("emit_availablePlaybackRangesChanged", "@brief Emitter for signal void QMediaPlayerControl::availablePlaybackRangesChanged(const QMediaTimeRange &)\nCall this method to emit this signal.", false, &_init_emitter_availablePlaybackRangesChanged_2766, &_call_emitter_availablePlaybackRangesChanged_2766); methods += new qt_gsi::GenericMethod ("bufferStatus", "@brief Virtual method int QMediaPlayerControl::bufferStatus()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_bufferStatus_c0_0, &_call_cbs_bufferStatus_c0_0); methods += new qt_gsi::GenericMethod ("bufferStatus", "@hide", true, &_init_cbs_bufferStatus_c0_0, &_call_cbs_bufferStatus_c0_0, &_set_callback_cbs_bufferStatus_c0_0); - methods += new qt_gsi::GenericMethod ("emit_bufferStatusChanged", "@brief Emitter for signal void QMediaPlayerControl::bufferStatusChanged(int percentFilled)\nCall this method to emit this signal.", false, &_init_emitter_bufferStatusChanged_767, &_call_emitter_bufferStatusChanged_767); methods += new qt_gsi::GenericMethod ("*childEvent", "@brief Virtual method void QMediaPlayerControl::childEvent(QChildEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QMediaPlayerControl::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); - methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QMediaPlayerControl::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QMediaPlayerControl::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("duration", "@brief Virtual method qint64 QMediaPlayerControl::duration()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_duration_c0_0, &_call_cbs_duration_c0_0); methods += new qt_gsi::GenericMethod ("duration", "@hide", true, &_init_cbs_duration_c0_0, &_call_cbs_duration_c0_0, &_set_callback_cbs_duration_c0_0); - methods += new qt_gsi::GenericMethod ("emit_durationChanged", "@brief Emitter for signal void QMediaPlayerControl::durationChanged(qint64 duration)\nCall this method to emit this signal.", false, &_init_emitter_durationChanged_986, &_call_emitter_durationChanged_986); - methods += new qt_gsi::GenericMethod ("emit_error", "@brief Emitter for signal void QMediaPlayerControl::error(int error, const QString &errorString)\nCall this method to emit this signal.", false, &_init_emitter_error_2684, &_call_emitter_error_2684); methods += new qt_gsi::GenericMethod ("event", "@brief Virtual method bool QMediaPlayerControl::event(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0); methods += new qt_gsi::GenericMethod ("event", "@hide", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0, &_set_callback_cbs_event_1217_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QMediaPlayerControl::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); @@ -2094,25 +2007,19 @@ static gsi::Methods methods_QMediaPlayerControl_Adaptor () { methods += new qt_gsi::GenericMethod ("isVideoAvailable", "@hide", true, &_init_cbs_isVideoAvailable_c0_0, &_call_cbs_isVideoAvailable_c0_0, &_set_callback_cbs_isVideoAvailable_c0_0); methods += new qt_gsi::GenericMethod ("media", "@brief Virtual method QMediaContent QMediaPlayerControl::media()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_media_c0_0, &_call_cbs_media_c0_0); methods += new qt_gsi::GenericMethod ("media", "@hide", true, &_init_cbs_media_c0_0, &_call_cbs_media_c0_0, &_set_callback_cbs_media_c0_0); - methods += new qt_gsi::GenericMethod ("emit_mediaChanged", "@brief Emitter for signal void QMediaPlayerControl::mediaChanged(const QMediaContent &content)\nCall this method to emit this signal.", false, &_init_emitter_mediaChanged_2605, &_call_emitter_mediaChanged_2605); methods += new qt_gsi::GenericMethod ("mediaStatus", "@brief Virtual method QMediaPlayer::MediaStatus QMediaPlayerControl::mediaStatus()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_mediaStatus_c0_0, &_call_cbs_mediaStatus_c0_0); methods += new qt_gsi::GenericMethod ("mediaStatus", "@hide", true, &_init_cbs_mediaStatus_c0_0, &_call_cbs_mediaStatus_c0_0, &_set_callback_cbs_mediaStatus_c0_0); - methods += new qt_gsi::GenericMethod ("emit_mediaStatusChanged", "@brief Emitter for signal void QMediaPlayerControl::mediaStatusChanged(QMediaPlayer::MediaStatus status)\nCall this method to emit this signal.", false, &_init_emitter_mediaStatusChanged_2858, &_call_emitter_mediaStatusChanged_2858); methods += new qt_gsi::GenericMethod ("mediaStream", "@brief Virtual method const QIODevice *QMediaPlayerControl::mediaStream()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_mediaStream_c0_0, &_call_cbs_mediaStream_c0_0); methods += new qt_gsi::GenericMethod ("mediaStream", "@hide", true, &_init_cbs_mediaStream_c0_0, &_call_cbs_mediaStream_c0_0, &_set_callback_cbs_mediaStream_c0_0); - methods += new qt_gsi::GenericMethod ("emit_mutedChanged", "@brief Emitter for signal void QMediaPlayerControl::mutedChanged(bool muted)\nCall this method to emit this signal.", false, &_init_emitter_mutedChanged_864, &_call_emitter_mutedChanged_864); methods += new qt_gsi::GenericMethod ("pause", "@brief Virtual method void QMediaPlayerControl::pause()\nThis method can be reimplemented in a derived class.", false, &_init_cbs_pause_0_0, &_call_cbs_pause_0_0); methods += new qt_gsi::GenericMethod ("pause", "@hide", false, &_init_cbs_pause_0_0, &_call_cbs_pause_0_0, &_set_callback_cbs_pause_0_0); methods += new qt_gsi::GenericMethod ("play", "@brief Virtual method void QMediaPlayerControl::play()\nThis method can be reimplemented in a derived class.", false, &_init_cbs_play_0_0, &_call_cbs_play_0_0); methods += new qt_gsi::GenericMethod ("play", "@hide", false, &_init_cbs_play_0_0, &_call_cbs_play_0_0, &_set_callback_cbs_play_0_0); methods += new qt_gsi::GenericMethod ("playbackRate", "@brief Virtual method double QMediaPlayerControl::playbackRate()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_playbackRate_c0_0, &_call_cbs_playbackRate_c0_0); methods += new qt_gsi::GenericMethod ("playbackRate", "@hide", true, &_init_cbs_playbackRate_c0_0, &_call_cbs_playbackRate_c0_0, &_set_callback_cbs_playbackRate_c0_0); - methods += new qt_gsi::GenericMethod ("emit_playbackRateChanged", "@brief Emitter for signal void QMediaPlayerControl::playbackRateChanged(double rate)\nCall this method to emit this signal.", false, &_init_emitter_playbackRateChanged_1071, &_call_emitter_playbackRateChanged_1071); methods += new qt_gsi::GenericMethod ("position", "@brief Virtual method qint64 QMediaPlayerControl::position()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_position_c0_0, &_call_cbs_position_c0_0); methods += new qt_gsi::GenericMethod ("position", "@hide", true, &_init_cbs_position_c0_0, &_call_cbs_position_c0_0, &_set_callback_cbs_position_c0_0); - methods += new qt_gsi::GenericMethod ("emit_positionChanged", "@brief Emitter for signal void QMediaPlayerControl::positionChanged(qint64 position)\nCall this method to emit this signal.", false, &_init_emitter_positionChanged_986, &_call_emitter_positionChanged_986); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QMediaPlayerControl::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); - methods += new qt_gsi::GenericMethod ("emit_seekableChanged", "@brief Emitter for signal void QMediaPlayerControl::seekableChanged(bool)\nCall this method to emit this signal.", false, &_init_emitter_seekableChanged_864, &_call_emitter_seekableChanged_864); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QMediaPlayerControl::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QMediaPlayerControl::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); methods += new qt_gsi::GenericMethod ("setMedia", "@brief Virtual method void QMediaPlayerControl::setMedia(const QMediaContent &media, QIODevice *stream)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_setMedia_3944_0, &_call_cbs_setMedia_3944_0); @@ -2127,15 +2034,12 @@ static gsi::Methods methods_QMediaPlayerControl_Adaptor () { methods += new qt_gsi::GenericMethod ("setVolume", "@hide", false, &_init_cbs_setVolume_767_0, &_call_cbs_setVolume_767_0, &_set_callback_cbs_setVolume_767_0); methods += new qt_gsi::GenericMethod ("state", "@brief Virtual method QMediaPlayer::State QMediaPlayerControl::state()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_state_c0_0, &_call_cbs_state_c0_0); methods += new qt_gsi::GenericMethod ("state", "@hide", true, &_init_cbs_state_c0_0, &_call_cbs_state_c0_0, &_set_callback_cbs_state_c0_0); - methods += new qt_gsi::GenericMethod ("emit_stateChanged", "@brief Emitter for signal void QMediaPlayerControl::stateChanged(QMediaPlayer::State newState)\nCall this method to emit this signal.", false, &_init_emitter_stateChanged_2247, &_call_emitter_stateChanged_2247); methods += new qt_gsi::GenericMethod ("stop", "@brief Virtual method void QMediaPlayerControl::stop()\nThis method can be reimplemented in a derived class.", false, &_init_cbs_stop_0_0, &_call_cbs_stop_0_0); methods += new qt_gsi::GenericMethod ("stop", "@hide", false, &_init_cbs_stop_0_0, &_call_cbs_stop_0_0, &_set_callback_cbs_stop_0_0); methods += new qt_gsi::GenericMethod ("*timerEvent", "@brief Virtual method void QMediaPlayerControl::timerEvent(QTimerEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_timerEvent_1730_0, &_call_cbs_timerEvent_1730_0); methods += new qt_gsi::GenericMethod ("*timerEvent", "@hide", false, &_init_cbs_timerEvent_1730_0, &_call_cbs_timerEvent_1730_0, &_set_callback_cbs_timerEvent_1730_0); - methods += new qt_gsi::GenericMethod ("emit_videoAvailableChanged", "@brief Emitter for signal void QMediaPlayerControl::videoAvailableChanged(bool videoAvailable)\nCall this method to emit this signal.", false, &_init_emitter_videoAvailableChanged_864, &_call_emitter_videoAvailableChanged_864); methods += new qt_gsi::GenericMethod ("volume", "@brief Virtual method int QMediaPlayerControl::volume()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_volume_c0_0, &_call_cbs_volume_c0_0); methods += new qt_gsi::GenericMethod ("volume", "@hide", true, &_init_cbs_volume_c0_0, &_call_cbs_volume_c0_0, &_set_callback_cbs_volume_c0_0); - methods += new qt_gsi::GenericMethod ("emit_volumeChanged", "@brief Emitter for signal void QMediaPlayerControl::volumeChanged(int volume)\nCall this method to emit this signal.", false, &_init_emitter_volumeChanged_767, &_call_emitter_volumeChanged_767); return methods; } diff --git a/src/gsiqt/qt5/QtMultimedia/gsiDeclQMediaPlaylist.cc b/src/gsiqt/qt5/QtMultimedia/gsiDeclQMediaPlaylist.cc index bd4371ba1..7feefcee8 100644 --- a/src/gsiqt/qt5/QtMultimedia/gsiDeclQMediaPlaylist.cc +++ b/src/gsiqt/qt5/QtMultimedia/gsiDeclQMediaPlaylist.cc @@ -128,6 +128,26 @@ static void _call_f_currentIndex_c0 (const qt_gsi::GenericMethod * /*decl*/, voi } +// void QMediaPlaylist::currentIndexChanged(int index) + + +static void _init_f_currentIndexChanged_767 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("index"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_currentIndexChanged_767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + int arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaPlaylist *)cls)->currentIndexChanged (arg1); +} + + // QMediaContent QMediaPlaylist::currentMedia() @@ -143,6 +163,26 @@ static void _call_f_currentMedia_c0 (const qt_gsi::GenericMethod * /*decl*/, voi } +// void QMediaPlaylist::currentMediaChanged(const QMediaContent &) + + +static void _init_f_currentMediaChanged_2605 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("arg1"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_currentMediaChanged_2605 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QMediaContent &arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaPlaylist *)cls)->currentMediaChanged (arg1); +} + + // QMediaPlaylist::Error QMediaPlaylist::error() @@ -316,6 +356,38 @@ static void _call_f_load_3070 (const qt_gsi::GenericMethod * /*decl*/, void *cls } +// void QMediaPlaylist::loadFailed() + + +static void _init_f_loadFailed_0 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_f_loadFailed_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaPlaylist *)cls)->loadFailed (); +} + + +// void QMediaPlaylist::loaded() + + +static void _init_f_loaded_0 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_f_loaded_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaPlaylist *)cls)->loaded (); +} + + // QMediaContent QMediaPlaylist::media(int index) @@ -335,6 +407,75 @@ static void _call_f_media_c767 (const qt_gsi::GenericMethod * /*decl*/, void *cl } +// void QMediaPlaylist::mediaAboutToBeInserted(int start, int end) + + +static void _init_f_mediaAboutToBeInserted_1426 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("start"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("end"); + decl->add_arg (argspec_1); + decl->set_return (); +} + +static void _call_f_mediaAboutToBeInserted_1426 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + int arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaPlaylist *)cls)->mediaAboutToBeInserted (arg1, arg2); +} + + +// void QMediaPlaylist::mediaAboutToBeRemoved(int start, int end) + + +static void _init_f_mediaAboutToBeRemoved_1426 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("start"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("end"); + decl->add_arg (argspec_1); + decl->set_return (); +} + +static void _call_f_mediaAboutToBeRemoved_1426 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + int arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaPlaylist *)cls)->mediaAboutToBeRemoved (arg1, arg2); +} + + +// void QMediaPlaylist::mediaChanged(int start, int end) + + +static void _init_f_mediaChanged_1426 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("start"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("end"); + decl->add_arg (argspec_1); + decl->set_return (); +} + +static void _call_f_mediaChanged_1426 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + int arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaPlaylist *)cls)->mediaChanged (arg1, arg2); +} + + // int QMediaPlaylist::mediaCount() @@ -350,6 +491,29 @@ static void _call_f_mediaCount_c0 (const qt_gsi::GenericMethod * /*decl*/, void } +// void QMediaPlaylist::mediaInserted(int start, int end) + + +static void _init_f_mediaInserted_1426 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("start"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("end"); + decl->add_arg (argspec_1); + decl->set_return (); +} + +static void _call_f_mediaInserted_1426 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + int arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaPlaylist *)cls)->mediaInserted (arg1, arg2); +} + + // QMediaObject *QMediaPlaylist::mediaObject() @@ -365,6 +529,29 @@ static void _call_f_mediaObject_c0 (const qt_gsi::GenericMethod * /*decl*/, void } +// void QMediaPlaylist::mediaRemoved(int start, int end) + + +static void _init_f_mediaRemoved_1426 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("start"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("end"); + decl->add_arg (argspec_1); + decl->set_return (); +} + +static void _call_f_mediaRemoved_1426 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + int arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaPlaylist *)cls)->mediaRemoved (arg1, arg2); +} + + // void QMediaPlaylist::next() @@ -415,6 +602,26 @@ static void _call_f_playbackMode_c0 (const qt_gsi::GenericMethod * /*decl*/, voi } +// void QMediaPlaylist::playbackModeChanged(QMediaPlaylist::PlaybackMode mode) + + +static void _init_f_playbackModeChanged_3159 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("mode"); + decl->add_arg::target_type & > (argspec_0); + decl->set_return (); +} + +static void _call_f_playbackModeChanged_3159 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaPlaylist *)cls)->playbackModeChanged (qt_gsi::QtToCppAdaptor(arg1).cref()); +} + + // void QMediaPlaylist::previous() @@ -696,7 +903,9 @@ static gsi::Methods methods_QMediaPlaylist () { methods += new qt_gsi::GenericMethod ("addMedia", "@brief Method bool QMediaPlaylist::addMedia(const QList &items)\n", false, &_init_f_addMedia_3220, &_call_f_addMedia_3220); methods += new qt_gsi::GenericMethod ("clear", "@brief Method bool QMediaPlaylist::clear()\n", false, &_init_f_clear_0, &_call_f_clear_0); methods += new qt_gsi::GenericMethod (":currentIndex", "@brief Method int QMediaPlaylist::currentIndex()\n", true, &_init_f_currentIndex_c0, &_call_f_currentIndex_c0); + methods += new qt_gsi::GenericMethod ("currentIndexChanged", "@brief Method void QMediaPlaylist::currentIndexChanged(int index)\n", false, &_init_f_currentIndexChanged_767, &_call_f_currentIndexChanged_767); methods += new qt_gsi::GenericMethod (":currentMedia", "@brief Method QMediaContent QMediaPlaylist::currentMedia()\n", true, &_init_f_currentMedia_c0, &_call_f_currentMedia_c0); + methods += new qt_gsi::GenericMethod ("currentMediaChanged", "@brief Method void QMediaPlaylist::currentMediaChanged(const QMediaContent &)\n", false, &_init_f_currentMediaChanged_2605, &_call_f_currentMediaChanged_2605); methods += new qt_gsi::GenericMethod ("error", "@brief Method QMediaPlaylist::Error QMediaPlaylist::error()\n", true, &_init_f_error_c0, &_call_f_error_c0); methods += new qt_gsi::GenericMethod ("errorString", "@brief Method QString QMediaPlaylist::errorString()\n", true, &_init_f_errorString_c0, &_call_f_errorString_c0); methods += new qt_gsi::GenericMethod ("insertMedia", "@brief Method bool QMediaPlaylist::insertMedia(int index, const QMediaContent &content)\n", false, &_init_f_insertMedia_3264, &_call_f_insertMedia_3264); @@ -706,12 +915,20 @@ static gsi::Methods methods_QMediaPlaylist () { methods += new qt_gsi::GenericMethod ("load", "@brief Method void QMediaPlaylist::load(const QNetworkRequest &request, const char *format)\n", false, &_init_f_load_4508, &_call_f_load_4508); methods += new qt_gsi::GenericMethod ("load", "@brief Method void QMediaPlaylist::load(const QUrl &location, const char *format)\n", false, &_init_f_load_3324, &_call_f_load_3324); methods += new qt_gsi::GenericMethod ("load", "@brief Method void QMediaPlaylist::load(QIODevice *device, const char *format)\n", false, &_init_f_load_3070, &_call_f_load_3070); + methods += new qt_gsi::GenericMethod ("loadFailed", "@brief Method void QMediaPlaylist::loadFailed()\n", false, &_init_f_loadFailed_0, &_call_f_loadFailed_0); + methods += new qt_gsi::GenericMethod ("loaded", "@brief Method void QMediaPlaylist::loaded()\n", false, &_init_f_loaded_0, &_call_f_loaded_0); methods += new qt_gsi::GenericMethod ("media", "@brief Method QMediaContent QMediaPlaylist::media(int index)\n", true, &_init_f_media_c767, &_call_f_media_c767); + methods += new qt_gsi::GenericMethod ("mediaAboutToBeInserted", "@brief Method void QMediaPlaylist::mediaAboutToBeInserted(int start, int end)\n", false, &_init_f_mediaAboutToBeInserted_1426, &_call_f_mediaAboutToBeInserted_1426); + methods += new qt_gsi::GenericMethod ("mediaAboutToBeRemoved", "@brief Method void QMediaPlaylist::mediaAboutToBeRemoved(int start, int end)\n", false, &_init_f_mediaAboutToBeRemoved_1426, &_call_f_mediaAboutToBeRemoved_1426); + methods += new qt_gsi::GenericMethod ("mediaChanged", "@brief Method void QMediaPlaylist::mediaChanged(int start, int end)\n", false, &_init_f_mediaChanged_1426, &_call_f_mediaChanged_1426); methods += new qt_gsi::GenericMethod ("mediaCount", "@brief Method int QMediaPlaylist::mediaCount()\n", true, &_init_f_mediaCount_c0, &_call_f_mediaCount_c0); + methods += new qt_gsi::GenericMethod ("mediaInserted", "@brief Method void QMediaPlaylist::mediaInserted(int start, int end)\n", false, &_init_f_mediaInserted_1426, &_call_f_mediaInserted_1426); methods += new qt_gsi::GenericMethod ("mediaObject", "@brief Method QMediaObject *QMediaPlaylist::mediaObject()\nThis is a reimplementation of QMediaBindableInterface::mediaObject", true, &_init_f_mediaObject_c0, &_call_f_mediaObject_c0); + methods += new qt_gsi::GenericMethod ("mediaRemoved", "@brief Method void QMediaPlaylist::mediaRemoved(int start, int end)\n", false, &_init_f_mediaRemoved_1426, &_call_f_mediaRemoved_1426); methods += new qt_gsi::GenericMethod ("next", "@brief Method void QMediaPlaylist::next()\n", false, &_init_f_next_0, &_call_f_next_0); methods += new qt_gsi::GenericMethod ("nextIndex", "@brief Method int QMediaPlaylist::nextIndex(int steps)\n", true, &_init_f_nextIndex_c767, &_call_f_nextIndex_c767); methods += new qt_gsi::GenericMethod (":playbackMode", "@brief Method QMediaPlaylist::PlaybackMode QMediaPlaylist::playbackMode()\n", true, &_init_f_playbackMode_c0, &_call_f_playbackMode_c0); + methods += new qt_gsi::GenericMethod ("playbackModeChanged", "@brief Method void QMediaPlaylist::playbackModeChanged(QMediaPlaylist::PlaybackMode mode)\n", false, &_init_f_playbackModeChanged_3159, &_call_f_playbackModeChanged_3159); methods += new qt_gsi::GenericMethod ("previous", "@brief Method void QMediaPlaylist::previous()\n", false, &_init_f_previous_0, &_call_f_previous_0); methods += new qt_gsi::GenericMethod ("previousIndex", "@brief Method int QMediaPlaylist::previousIndex(int steps)\n", true, &_init_f_previousIndex_c767, &_call_f_previousIndex_c767); methods += new qt_gsi::GenericMethod ("removeMedia", "@brief Method bool QMediaPlaylist::removeMedia(int pos)\n", false, &_init_f_removeMedia_767, &_call_f_removeMedia_767); @@ -721,17 +938,6 @@ static gsi::Methods methods_QMediaPlaylist () { methods += new qt_gsi::GenericMethod ("setCurrentIndex|currentIndex=", "@brief Method void QMediaPlaylist::setCurrentIndex(int index)\n", false, &_init_f_setCurrentIndex_767, &_call_f_setCurrentIndex_767); methods += new qt_gsi::GenericMethod ("setPlaybackMode|playbackMode=", "@brief Method void QMediaPlaylist::setPlaybackMode(QMediaPlaylist::PlaybackMode mode)\n", false, &_init_f_setPlaybackMode_3159, &_call_f_setPlaybackMode_3159); methods += new qt_gsi::GenericMethod ("shuffle", "@brief Method void QMediaPlaylist::shuffle()\n", false, &_init_f_shuffle_0, &_call_f_shuffle_0); - methods += gsi::qt_signal ("currentIndexChanged(int)", "currentIndexChanged", gsi::arg("index"), "@brief Signal declaration for QMediaPlaylist::currentIndexChanged(int index)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("currentMediaChanged(const QMediaContent &)", "currentMediaChanged", gsi::arg("arg1"), "@brief Signal declaration for QMediaPlaylist::currentMediaChanged(const QMediaContent &)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QMediaPlaylist::destroyed(QObject *)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("loadFailed()", "loadFailed", "@brief Signal declaration for QMediaPlaylist::loadFailed()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("loaded()", "loaded", "@brief Signal declaration for QMediaPlaylist::loaded()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("mediaAboutToBeInserted(int, int)", "mediaAboutToBeInserted", gsi::arg("start"), gsi::arg("end"), "@brief Signal declaration for QMediaPlaylist::mediaAboutToBeInserted(int start, int end)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("mediaAboutToBeRemoved(int, int)", "mediaAboutToBeRemoved", gsi::arg("start"), gsi::arg("end"), "@brief Signal declaration for QMediaPlaylist::mediaAboutToBeRemoved(int start, int end)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("mediaChanged(int, int)", "mediaChanged", gsi::arg("start"), gsi::arg("end"), "@brief Signal declaration for QMediaPlaylist::mediaChanged(int start, int end)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("mediaInserted(int, int)", "mediaInserted", gsi::arg("start"), gsi::arg("end"), "@brief Signal declaration for QMediaPlaylist::mediaInserted(int start, int end)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("mediaRemoved(int, int)", "mediaRemoved", gsi::arg("start"), gsi::arg("end"), "@brief Signal declaration for QMediaPlaylist::mediaRemoved(int start, int end)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal::target_type & > ("playbackModeChanged(QMediaPlaylist::PlaybackMode)", "playbackModeChanged", gsi::arg("mode"), "@brief Signal declaration for QMediaPlaylist::playbackModeChanged(QMediaPlaylist::PlaybackMode mode)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QMediaPlaylist::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QMediaPlaylist::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); methods += new qt_gsi::GenericMethod ("asQObject", "@brief Delivers the base class interface QObject of QMediaPlaylist\nClass QMediaPlaylist is derived from multiple base classes. This method delivers the QObject base class aspect.", false, &_init_f_QMediaPlaylist_as_QObject, &_call_f_QMediaPlaylist_as_QObject); @@ -790,24 +996,6 @@ public: return QMediaPlaylist::senderSignalIndex(); } - // [emitter impl] void QMediaPlaylist::currentIndexChanged(int index) - void emitter_QMediaPlaylist_currentIndexChanged_767(int index) - { - emit QMediaPlaylist::currentIndexChanged(index); - } - - // [emitter impl] void QMediaPlaylist::currentMediaChanged(const QMediaContent &) - void emitter_QMediaPlaylist_currentMediaChanged_2605(const QMediaContent &arg1) - { - emit QMediaPlaylist::currentMediaChanged(arg1); - } - - // [emitter impl] void QMediaPlaylist::destroyed(QObject *) - void emitter_QMediaPlaylist_destroyed_1302(QObject *arg1) - { - emit QMediaPlaylist::destroyed(arg1); - } - // [adaptor impl] bool QMediaPlaylist::event(QEvent *) bool cbs_event_1217_0(QEvent *arg1) { @@ -838,42 +1026,6 @@ public: } } - // [emitter impl] void QMediaPlaylist::loadFailed() - void emitter_QMediaPlaylist_loadFailed_0() - { - emit QMediaPlaylist::loadFailed(); - } - - // [emitter impl] void QMediaPlaylist::loaded() - void emitter_QMediaPlaylist_loaded_0() - { - emit QMediaPlaylist::loaded(); - } - - // [emitter impl] void QMediaPlaylist::mediaAboutToBeInserted(int start, int end) - void emitter_QMediaPlaylist_mediaAboutToBeInserted_1426(int start, int end) - { - emit QMediaPlaylist::mediaAboutToBeInserted(start, end); - } - - // [emitter impl] void QMediaPlaylist::mediaAboutToBeRemoved(int start, int end) - void emitter_QMediaPlaylist_mediaAboutToBeRemoved_1426(int start, int end) - { - emit QMediaPlaylist::mediaAboutToBeRemoved(start, end); - } - - // [emitter impl] void QMediaPlaylist::mediaChanged(int start, int end) - void emitter_QMediaPlaylist_mediaChanged_1426(int start, int end) - { - emit QMediaPlaylist::mediaChanged(start, end); - } - - // [emitter impl] void QMediaPlaylist::mediaInserted(int start, int end) - void emitter_QMediaPlaylist_mediaInserted_1426(int start, int end) - { - emit QMediaPlaylist::mediaInserted(start, end); - } - // [adaptor impl] QMediaObject *QMediaPlaylist::mediaObject() QMediaObject * cbs_mediaObject_c0_0() const { @@ -889,18 +1041,6 @@ public: } } - // [emitter impl] void QMediaPlaylist::mediaRemoved(int start, int end) - void emitter_QMediaPlaylist_mediaRemoved_1426(int start, int end) - { - emit QMediaPlaylist::mediaRemoved(start, end); - } - - // [emitter impl] void QMediaPlaylist::playbackModeChanged(QMediaPlaylist::PlaybackMode mode) - void emitter_QMediaPlaylist_playbackModeChanged_3159(QMediaPlaylist::PlaybackMode mode) - { - emit QMediaPlaylist::playbackModeChanged(mode); - } - // [adaptor impl] void QMediaPlaylist::childEvent(QChildEvent *) void cbs_childEvent_1701_0(QChildEvent *arg1) { @@ -1030,42 +1170,6 @@ static void _set_callback_cbs_childEvent_1701_0 (void *cls, const gsi::Callback } -// emitter void QMediaPlaylist::currentIndexChanged(int index) - -static void _init_emitter_currentIndexChanged_767 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("index"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_currentIndexChanged_767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - int arg1 = gsi::arg_reader() (args, heap); - ((QMediaPlaylist_Adaptor *)cls)->emitter_QMediaPlaylist_currentIndexChanged_767 (arg1); -} - - -// emitter void QMediaPlaylist::currentMediaChanged(const QMediaContent &) - -static void _init_emitter_currentMediaChanged_2605 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_currentMediaChanged_2605 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const QMediaContent &arg1 = gsi::arg_reader() (args, heap); - ((QMediaPlaylist_Adaptor *)cls)->emitter_QMediaPlaylist_currentMediaChanged_2605 (arg1); -} - - // void QMediaPlaylist::customEvent(QEvent *) static void _init_cbs_customEvent_1217_0 (qt_gsi::GenericMethod *decl) @@ -1090,24 +1194,6 @@ static void _set_callback_cbs_customEvent_1217_0 (void *cls, const gsi::Callback } -// emitter void QMediaPlaylist::destroyed(QObject *) - -static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - ((QMediaPlaylist_Adaptor *)cls)->emitter_QMediaPlaylist_destroyed_1302 (arg1); -} - - // void QMediaPlaylist::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -1199,118 +1285,6 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } -// emitter void QMediaPlaylist::loadFailed() - -static void _init_emitter_loadFailed_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_loadFailed_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QMediaPlaylist_Adaptor *)cls)->emitter_QMediaPlaylist_loadFailed_0 (); -} - - -// emitter void QMediaPlaylist::loaded() - -static void _init_emitter_loaded_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_loaded_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QMediaPlaylist_Adaptor *)cls)->emitter_QMediaPlaylist_loaded_0 (); -} - - -// emitter void QMediaPlaylist::mediaAboutToBeInserted(int start, int end) - -static void _init_emitter_mediaAboutToBeInserted_1426 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("start"); - decl->add_arg (argspec_0); - static gsi::ArgSpecBase argspec_1 ("end"); - decl->add_arg (argspec_1); - decl->set_return (); -} - -static void _call_emitter_mediaAboutToBeInserted_1426 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - int arg1 = gsi::arg_reader() (args, heap); - int arg2 = gsi::arg_reader() (args, heap); - ((QMediaPlaylist_Adaptor *)cls)->emitter_QMediaPlaylist_mediaAboutToBeInserted_1426 (arg1, arg2); -} - - -// emitter void QMediaPlaylist::mediaAboutToBeRemoved(int start, int end) - -static void _init_emitter_mediaAboutToBeRemoved_1426 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("start"); - decl->add_arg (argspec_0); - static gsi::ArgSpecBase argspec_1 ("end"); - decl->add_arg (argspec_1); - decl->set_return (); -} - -static void _call_emitter_mediaAboutToBeRemoved_1426 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - int arg1 = gsi::arg_reader() (args, heap); - int arg2 = gsi::arg_reader() (args, heap); - ((QMediaPlaylist_Adaptor *)cls)->emitter_QMediaPlaylist_mediaAboutToBeRemoved_1426 (arg1, arg2); -} - - -// emitter void QMediaPlaylist::mediaChanged(int start, int end) - -static void _init_emitter_mediaChanged_1426 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("start"); - decl->add_arg (argspec_0); - static gsi::ArgSpecBase argspec_1 ("end"); - decl->add_arg (argspec_1); - decl->set_return (); -} - -static void _call_emitter_mediaChanged_1426 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - int arg1 = gsi::arg_reader() (args, heap); - int arg2 = gsi::arg_reader() (args, heap); - ((QMediaPlaylist_Adaptor *)cls)->emitter_QMediaPlaylist_mediaChanged_1426 (arg1, arg2); -} - - -// emitter void QMediaPlaylist::mediaInserted(int start, int end) - -static void _init_emitter_mediaInserted_1426 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("start"); - decl->add_arg (argspec_0); - static gsi::ArgSpecBase argspec_1 ("end"); - decl->add_arg (argspec_1); - decl->set_return (); -} - -static void _call_emitter_mediaInserted_1426 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - int arg1 = gsi::arg_reader() (args, heap); - int arg2 = gsi::arg_reader() (args, heap); - ((QMediaPlaylist_Adaptor *)cls)->emitter_QMediaPlaylist_mediaInserted_1426 (arg1, arg2); -} - - // QMediaObject *QMediaPlaylist::mediaObject() static void _init_cbs_mediaObject_c0_0 (qt_gsi::GenericMethod *decl) @@ -1330,45 +1304,6 @@ static void _set_callback_cbs_mediaObject_c0_0 (void *cls, const gsi::Callback & } -// emitter void QMediaPlaylist::mediaRemoved(int start, int end) - -static void _init_emitter_mediaRemoved_1426 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("start"); - decl->add_arg (argspec_0); - static gsi::ArgSpecBase argspec_1 ("end"); - decl->add_arg (argspec_1); - decl->set_return (); -} - -static void _call_emitter_mediaRemoved_1426 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - int arg1 = gsi::arg_reader() (args, heap); - int arg2 = gsi::arg_reader() (args, heap); - ((QMediaPlaylist_Adaptor *)cls)->emitter_QMediaPlaylist_mediaRemoved_1426 (arg1, arg2); -} - - -// emitter void QMediaPlaylist::playbackModeChanged(QMediaPlaylist::PlaybackMode mode) - -static void _init_emitter_playbackModeChanged_3159 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("mode"); - decl->add_arg::target_type & > (argspec_0); - decl->set_return (); -} - -static void _call_emitter_playbackModeChanged_3159 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); - ((QMediaPlaylist_Adaptor *)cls)->emitter_QMediaPlaylist_playbackModeChanged_3159 (arg1); -} - - // exposed int QMediaPlaylist::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -1472,11 +1407,8 @@ static gsi::Methods methods_QMediaPlaylist_Adaptor () { methods += new qt_gsi::GenericStaticMethod ("new", "@brief Constructor QMediaPlaylist::QMediaPlaylist(QObject *parent)\nThis method creates an object of class QMediaPlaylist.", &_init_ctor_QMediaPlaylist_Adaptor_1302, &_call_ctor_QMediaPlaylist_Adaptor_1302); methods += new qt_gsi::GenericMethod ("*childEvent", "@brief Virtual method void QMediaPlaylist::childEvent(QChildEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); - methods += new qt_gsi::GenericMethod ("emit_currentIndexChanged", "@brief Emitter for signal void QMediaPlaylist::currentIndexChanged(int index)\nCall this method to emit this signal.", false, &_init_emitter_currentIndexChanged_767, &_call_emitter_currentIndexChanged_767); - methods += new qt_gsi::GenericMethod ("emit_currentMediaChanged", "@brief Emitter for signal void QMediaPlaylist::currentMediaChanged(const QMediaContent &)\nCall this method to emit this signal.", false, &_init_emitter_currentMediaChanged_2605, &_call_emitter_currentMediaChanged_2605); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QMediaPlaylist::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); - methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QMediaPlaylist::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QMediaPlaylist::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("event", "@brief Virtual method bool QMediaPlaylist::event(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0); @@ -1484,16 +1416,8 @@ static gsi::Methods methods_QMediaPlaylist_Adaptor () { methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QMediaPlaylist::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QMediaPlaylist::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); - methods += new qt_gsi::GenericMethod ("emit_loadFailed", "@brief Emitter for signal void QMediaPlaylist::loadFailed()\nCall this method to emit this signal.", false, &_init_emitter_loadFailed_0, &_call_emitter_loadFailed_0); - methods += new qt_gsi::GenericMethod ("emit_loaded", "@brief Emitter for signal void QMediaPlaylist::loaded()\nCall this method to emit this signal.", false, &_init_emitter_loaded_0, &_call_emitter_loaded_0); - methods += new qt_gsi::GenericMethod ("emit_mediaAboutToBeInserted", "@brief Emitter for signal void QMediaPlaylist::mediaAboutToBeInserted(int start, int end)\nCall this method to emit this signal.", false, &_init_emitter_mediaAboutToBeInserted_1426, &_call_emitter_mediaAboutToBeInserted_1426); - methods += new qt_gsi::GenericMethod ("emit_mediaAboutToBeRemoved", "@brief Emitter for signal void QMediaPlaylist::mediaAboutToBeRemoved(int start, int end)\nCall this method to emit this signal.", false, &_init_emitter_mediaAboutToBeRemoved_1426, &_call_emitter_mediaAboutToBeRemoved_1426); - methods += new qt_gsi::GenericMethod ("emit_mediaChanged", "@brief Emitter for signal void QMediaPlaylist::mediaChanged(int start, int end)\nCall this method to emit this signal.", false, &_init_emitter_mediaChanged_1426, &_call_emitter_mediaChanged_1426); - methods += new qt_gsi::GenericMethod ("emit_mediaInserted", "@brief Emitter for signal void QMediaPlaylist::mediaInserted(int start, int end)\nCall this method to emit this signal.", false, &_init_emitter_mediaInserted_1426, &_call_emitter_mediaInserted_1426); methods += new qt_gsi::GenericMethod ("mediaObject", "@brief Virtual method QMediaObject *QMediaPlaylist::mediaObject()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_mediaObject_c0_0, &_call_cbs_mediaObject_c0_0); methods += new qt_gsi::GenericMethod ("mediaObject", "@hide", true, &_init_cbs_mediaObject_c0_0, &_call_cbs_mediaObject_c0_0, &_set_callback_cbs_mediaObject_c0_0); - methods += new qt_gsi::GenericMethod ("emit_mediaRemoved", "@brief Emitter for signal void QMediaPlaylist::mediaRemoved(int start, int end)\nCall this method to emit this signal.", false, &_init_emitter_mediaRemoved_1426, &_call_emitter_mediaRemoved_1426); - methods += new qt_gsi::GenericMethod ("emit_playbackModeChanged", "@brief Emitter for signal void QMediaPlaylist::playbackModeChanged(QMediaPlaylist::PlaybackMode mode)\nCall this method to emit this signal.", false, &_init_emitter_playbackModeChanged_3159, &_call_emitter_playbackModeChanged_3159); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QMediaPlaylist::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QMediaPlaylist::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QMediaPlaylist::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); diff --git a/src/gsiqt/qt5/QtMultimedia/gsiDeclQMediaRecorder.cc b/src/gsiqt/qt5/QtMultimedia/gsiDeclQMediaRecorder.cc index ce5a4d9be..93568ef86 100644 --- a/src/gsiqt/qt5/QtMultimedia/gsiDeclQMediaRecorder.cc +++ b/src/gsiqt/qt5/QtMultimedia/gsiDeclQMediaRecorder.cc @@ -75,6 +75,26 @@ static void _call_f_actualLocation_c0 (const qt_gsi::GenericMethod * /*decl*/, v } +// void QMediaRecorder::actualLocationChanged(const QUrl &location) + + +static void _init_f_actualLocationChanged_1701 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("location"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_actualLocationChanged_1701 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QUrl &arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaRecorder *)cls)->actualLocationChanged (arg1); +} + + // QString QMediaRecorder::audioCodecDescription(const QString &codecName) @@ -124,6 +144,46 @@ static void _call_f_availability_c0 (const qt_gsi::GenericMethod * /*decl*/, voi } +// void QMediaRecorder::availabilityChanged(bool available) + + +static void _init_f_availabilityChanged_864 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("available"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_availabilityChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + bool arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaRecorder *)cls)->availabilityChanged (arg1); +} + + +// void QMediaRecorder::availabilityChanged(QMultimedia::AvailabilityStatus availability) + + +static void _init_f_availabilityChanged_3555 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("availability"); + decl->add_arg::target_type & > (argspec_0); + decl->set_return (); +} + +static void _call_f_availabilityChanged_3555 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaRecorder *)cls)->availabilityChanged (qt_gsi::QtToCppAdaptor(arg1).cref()); +} + + // QStringList QMediaRecorder::availableMetaData() @@ -188,6 +248,26 @@ static void _call_f_duration_c0 (const qt_gsi::GenericMethod * /*decl*/, void *c } +// void QMediaRecorder::durationChanged(qint64 duration) + + +static void _init_f_durationChanged_986 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("duration"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_durationChanged_986 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + qint64 arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaRecorder *)cls)->durationChanged (arg1); +} + + // QMediaRecorder::Error QMediaRecorder::error() @@ -203,6 +283,26 @@ static void _call_f_error_c0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, } +// void QMediaRecorder::error(QMediaRecorder::Error error) + + +static void _init_f_error_2457 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("error"); + decl->add_arg::target_type & > (argspec_0); + decl->set_return (); +} + +static void _call_f_error_2457 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaRecorder *)cls)->error (qt_gsi::QtToCppAdaptor(arg1).cref()); +} + + // QString QMediaRecorder::errorString() @@ -312,6 +412,105 @@ static void _call_f_metaData_c2025 (const qt_gsi::GenericMethod * /*decl*/, void } +// void QMediaRecorder::metaDataAvailableChanged(bool available) + + +static void _init_f_metaDataAvailableChanged_864 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("available"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_metaDataAvailableChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + bool arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaRecorder *)cls)->metaDataAvailableChanged (arg1); +} + + +// void QMediaRecorder::metaDataChanged() + + +static void _init_f_metaDataChanged_0 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_f_metaDataChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaRecorder *)cls)->metaDataChanged (); +} + + +// void QMediaRecorder::metaDataChanged(const QString &key, const QVariant &value) + + +static void _init_f_metaDataChanged_4036 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("key"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("value"); + decl->add_arg (argspec_1); + decl->set_return (); +} + +static void _call_f_metaDataChanged_4036 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + const QVariant &arg2 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaRecorder *)cls)->metaDataChanged (arg1, arg2); +} + + +// void QMediaRecorder::metaDataWritableChanged(bool writable) + + +static void _init_f_metaDataWritableChanged_864 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("writable"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_metaDataWritableChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + bool arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaRecorder *)cls)->metaDataWritableChanged (arg1); +} + + +// void QMediaRecorder::mutedChanged(bool muted) + + +static void _init_f_mutedChanged_864 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("muted"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_mutedChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + bool arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaRecorder *)cls)->mutedChanged (arg1); +} + + // QUrl QMediaRecorder::outputLocation() @@ -542,6 +741,26 @@ static void _call_f_state_c0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, } +// void QMediaRecorder::stateChanged(QMediaRecorder::State state) + + +static void _init_f_stateChanged_2448 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("state"); + decl->add_arg::target_type & > (argspec_0); + decl->set_return (); +} + +static void _call_f_stateChanged_2448 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaRecorder *)cls)->stateChanged (qt_gsi::QtToCppAdaptor(arg1).cref()); +} + + // QMediaRecorder::Status QMediaRecorder::status() @@ -557,6 +776,26 @@ static void _call_f_status_c0 (const qt_gsi::GenericMethod * /*decl*/, void *cls } +// void QMediaRecorder::statusChanged(QMediaRecorder::Status status) + + +static void _init_f_statusChanged_2579 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("status"); + decl->add_arg::target_type & > (argspec_0); + decl->set_return (); +} + +static void _call_f_statusChanged_2579 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaRecorder *)cls)->statusChanged (qt_gsi::QtToCppAdaptor(arg1).cref()); +} + + // void QMediaRecorder::stop() @@ -733,6 +972,26 @@ static void _call_f_volume_c0 (const qt_gsi::GenericMethod * /*decl*/, void *cls } +// void QMediaRecorder::volumeChanged(double volume) + + +static void _init_f_volumeChanged_1071 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("volume"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_volumeChanged_1071 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + double arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaRecorder *)cls)->volumeChanged (arg1); +} + + // static QString QMediaRecorder::tr(const char *s, const char *c, int n) @@ -835,14 +1094,19 @@ static gsi::Methods methods_QMediaRecorder () { gsi::Methods methods; methods += new qt_gsi::GenericStaticMethod ("staticMetaObject", "@brief Obtains the static MetaObject for this class.", &_init_smo, &_call_smo); methods += new qt_gsi::GenericMethod (":actualLocation", "@brief Method QUrl QMediaRecorder::actualLocation()\n", true, &_init_f_actualLocation_c0, &_call_f_actualLocation_c0); + methods += new qt_gsi::GenericMethod ("actualLocationChanged", "@brief Method void QMediaRecorder::actualLocationChanged(const QUrl &location)\n", false, &_init_f_actualLocationChanged_1701, &_call_f_actualLocationChanged_1701); methods += new qt_gsi::GenericMethod ("audioCodecDescription", "@brief Method QString QMediaRecorder::audioCodecDescription(const QString &codecName)\n", true, &_init_f_audioCodecDescription_c2025, &_call_f_audioCodecDescription_c2025); methods += new qt_gsi::GenericMethod (":audioSettings", "@brief Method QAudioEncoderSettings QMediaRecorder::audioSettings()\n", true, &_init_f_audioSettings_c0, &_call_f_audioSettings_c0); methods += new qt_gsi::GenericMethod ("availability", "@brief Method QMultimedia::AvailabilityStatus QMediaRecorder::availability()\n", true, &_init_f_availability_c0, &_call_f_availability_c0); + methods += new qt_gsi::GenericMethod ("availabilityChanged_bool", "@brief Method void QMediaRecorder::availabilityChanged(bool available)\n", false, &_init_f_availabilityChanged_864, &_call_f_availabilityChanged_864); + methods += new qt_gsi::GenericMethod ("availabilityChanged_status", "@brief Method void QMediaRecorder::availabilityChanged(QMultimedia::AvailabilityStatus availability)\n", false, &_init_f_availabilityChanged_3555, &_call_f_availabilityChanged_3555); methods += new qt_gsi::GenericMethod ("availableMetaData", "@brief Method QStringList QMediaRecorder::availableMetaData()\n", true, &_init_f_availableMetaData_c0, &_call_f_availableMetaData_c0); methods += new qt_gsi::GenericMethod ("containerDescription", "@brief Method QString QMediaRecorder::containerDescription(const QString &format)\n", true, &_init_f_containerDescription_c2025, &_call_f_containerDescription_c2025); methods += new qt_gsi::GenericMethod (":containerFormat", "@brief Method QString QMediaRecorder::containerFormat()\n", true, &_init_f_containerFormat_c0, &_call_f_containerFormat_c0); methods += new qt_gsi::GenericMethod (":duration", "@brief Method qint64 QMediaRecorder::duration()\n", true, &_init_f_duration_c0, &_call_f_duration_c0); + methods += new qt_gsi::GenericMethod ("durationChanged", "@brief Method void QMediaRecorder::durationChanged(qint64 duration)\n", false, &_init_f_durationChanged_986, &_call_f_durationChanged_986); methods += new qt_gsi::GenericMethod ("error", "@brief Method QMediaRecorder::Error QMediaRecorder::error()\n", true, &_init_f_error_c0, &_call_f_error_c0); + methods += new qt_gsi::GenericMethod ("error_sig", "@brief Method void QMediaRecorder::error(QMediaRecorder::Error error)\n", false, &_init_f_error_2457, &_call_f_error_2457); methods += new qt_gsi::GenericMethod ("errorString", "@brief Method QString QMediaRecorder::errorString()\n", true, &_init_f_errorString_c0, &_call_f_errorString_c0); methods += new qt_gsi::GenericMethod ("isAvailable?", "@brief Method bool QMediaRecorder::isAvailable()\n", true, &_init_f_isAvailable_c0, &_call_f_isAvailable_c0); methods += new qt_gsi::GenericMethod ("isMetaDataAvailable?|:metaDataAvailable", "@brief Method bool QMediaRecorder::isMetaDataAvailable()\n", true, &_init_f_isMetaDataAvailable_c0, &_call_f_isMetaDataAvailable_c0); @@ -850,6 +1114,11 @@ static gsi::Methods methods_QMediaRecorder () { methods += new qt_gsi::GenericMethod ("isMuted?|:muted", "@brief Method bool QMediaRecorder::isMuted()\n", true, &_init_f_isMuted_c0, &_call_f_isMuted_c0); methods += new qt_gsi::GenericMethod ("mediaObject", "@brief Method QMediaObject *QMediaRecorder::mediaObject()\nThis is a reimplementation of QMediaBindableInterface::mediaObject", true, &_init_f_mediaObject_c0, &_call_f_mediaObject_c0); methods += new qt_gsi::GenericMethod ("metaData", "@brief Method QVariant QMediaRecorder::metaData(const QString &key)\n", true, &_init_f_metaData_c2025, &_call_f_metaData_c2025); + methods += new qt_gsi::GenericMethod ("metaDataAvailableChanged", "@brief Method void QMediaRecorder::metaDataAvailableChanged(bool available)\n", false, &_init_f_metaDataAvailableChanged_864, &_call_f_metaDataAvailableChanged_864); + methods += new qt_gsi::GenericMethod ("metaDataChanged", "@brief Method void QMediaRecorder::metaDataChanged()\n", false, &_init_f_metaDataChanged_0, &_call_f_metaDataChanged_0); + methods += new qt_gsi::GenericMethod ("metaDataChanged_kv", "@brief Method void QMediaRecorder::metaDataChanged(const QString &key, const QVariant &value)\n", false, &_init_f_metaDataChanged_4036, &_call_f_metaDataChanged_4036); + methods += new qt_gsi::GenericMethod ("metaDataWritableChanged", "@brief Method void QMediaRecorder::metaDataWritableChanged(bool writable)\n", false, &_init_f_metaDataWritableChanged_864, &_call_f_metaDataWritableChanged_864); + methods += new qt_gsi::GenericMethod ("mutedChanged", "@brief Method void QMediaRecorder::mutedChanged(bool muted)\n", false, &_init_f_mutedChanged_864, &_call_f_mutedChanged_864); methods += new qt_gsi::GenericMethod (":outputLocation", "@brief Method QUrl QMediaRecorder::outputLocation()\n", true, &_init_f_outputLocation_c0, &_call_f_outputLocation_c0); methods += new qt_gsi::GenericMethod ("pause", "@brief Method void QMediaRecorder::pause()\n", false, &_init_f_pause_0, &_call_f_pause_0); methods += new qt_gsi::GenericMethod ("record", "@brief Method void QMediaRecorder::record()\n", false, &_init_f_record_0, &_call_f_record_0); @@ -862,7 +1131,9 @@ static gsi::Methods methods_QMediaRecorder () { methods += new qt_gsi::GenericMethod ("setVideoSettings|videoSettings=", "@brief Method void QMediaRecorder::setVideoSettings(const QVideoEncoderSettings &videoSettings)\n", false, &_init_f_setVideoSettings_3450, &_call_f_setVideoSettings_3450); methods += new qt_gsi::GenericMethod ("setVolume|volume=", "@brief Method void QMediaRecorder::setVolume(double volume)\n", false, &_init_f_setVolume_1071, &_call_f_setVolume_1071); methods += new qt_gsi::GenericMethod (":state", "@brief Method QMediaRecorder::State QMediaRecorder::state()\n", true, &_init_f_state_c0, &_call_f_state_c0); + methods += new qt_gsi::GenericMethod ("stateChanged", "@brief Method void QMediaRecorder::stateChanged(QMediaRecorder::State state)\n", false, &_init_f_stateChanged_2448, &_call_f_stateChanged_2448); methods += new qt_gsi::GenericMethod (":status", "@brief Method QMediaRecorder::Status QMediaRecorder::status()\n", true, &_init_f_status_c0, &_call_f_status_c0); + methods += new qt_gsi::GenericMethod ("statusChanged", "@brief Method void QMediaRecorder::statusChanged(QMediaRecorder::Status status)\n", false, &_init_f_statusChanged_2579, &_call_f_statusChanged_2579); methods += new qt_gsi::GenericMethod ("stop", "@brief Method void QMediaRecorder::stop()\n", false, &_init_f_stop_0, &_call_f_stop_0); methods += new qt_gsi::GenericMethod ("supportedAudioCodecs", "@brief Method QStringList QMediaRecorder::supportedAudioCodecs()\n", true, &_init_f_supportedAudioCodecs_c0, &_call_f_supportedAudioCodecs_c0); methods += new qt_gsi::GenericMethod ("supportedAudioSampleRates", "@brief Method QList QMediaRecorder::supportedAudioSampleRates(const QAudioEncoderSettings &settings, bool *continuous)\n", true, &_init_f_supportedAudioSampleRates_c4387, &_call_f_supportedAudioSampleRates_c4387); @@ -873,20 +1144,7 @@ static gsi::Methods methods_QMediaRecorder () { methods += new qt_gsi::GenericMethod ("videoCodecDescription", "@brief Method QString QMediaRecorder::videoCodecDescription(const QString &codecName)\n", true, &_init_f_videoCodecDescription_c2025, &_call_f_videoCodecDescription_c2025); methods += new qt_gsi::GenericMethod (":videoSettings", "@brief Method QVideoEncoderSettings QMediaRecorder::videoSettings()\n", true, &_init_f_videoSettings_c0, &_call_f_videoSettings_c0); methods += new qt_gsi::GenericMethod (":volume", "@brief Method double QMediaRecorder::volume()\n", true, &_init_f_volume_c0, &_call_f_volume_c0); - methods += gsi::qt_signal ("actualLocationChanged(const QUrl &)", "actualLocationChanged", gsi::arg("location"), "@brief Signal declaration for QMediaRecorder::actualLocationChanged(const QUrl &location)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("availabilityChanged(bool)", "availabilityChanged_bool", gsi::arg("available"), "@brief Signal declaration for QMediaRecorder::availabilityChanged(bool available)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal::target_type & > ("availabilityChanged(QMultimedia::AvailabilityStatus)", "availabilityChanged_status", gsi::arg("availability"), "@brief Signal declaration for QMediaRecorder::availabilityChanged(QMultimedia::AvailabilityStatus availability)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QMediaRecorder::destroyed(QObject *)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("durationChanged(qint64)", "durationChanged", gsi::arg("duration"), "@brief Signal declaration for QMediaRecorder::durationChanged(qint64 duration)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal::target_type & > ("error(QMediaRecorder::Error)", "error_sig", gsi::arg("error"), "@brief Signal declaration for QMediaRecorder::error(QMediaRecorder::Error error)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("metaDataAvailableChanged(bool)", "metaDataAvailableChanged", gsi::arg("available"), "@brief Signal declaration for QMediaRecorder::metaDataAvailableChanged(bool available)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("metaDataChanged()", "metaDataChanged", "@brief Signal declaration for QMediaRecorder::metaDataChanged()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("metaDataChanged(const QString &, const QVariant &)", "metaDataChanged_kv", gsi::arg("key"), gsi::arg("value"), "@brief Signal declaration for QMediaRecorder::metaDataChanged(const QString &key, const QVariant &value)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("metaDataWritableChanged(bool)", "metaDataWritableChanged", gsi::arg("writable"), "@brief Signal declaration for QMediaRecorder::metaDataWritableChanged(bool writable)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("mutedChanged(bool)", "mutedChanged", gsi::arg("muted"), "@brief Signal declaration for QMediaRecorder::mutedChanged(bool muted)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal::target_type & > ("stateChanged(QMediaRecorder::State)", "stateChanged", gsi::arg("state"), "@brief Signal declaration for QMediaRecorder::stateChanged(QMediaRecorder::State state)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal::target_type & > ("statusChanged(QMediaRecorder::Status)", "statusChanged", gsi::arg("status"), "@brief Signal declaration for QMediaRecorder::statusChanged(QMediaRecorder::Status status)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("volumeChanged(double)", "volumeChanged", gsi::arg("volume"), "@brief Signal declaration for QMediaRecorder::volumeChanged(double volume)\nYou can bind a procedure to this signal."); + methods += new qt_gsi::GenericMethod ("volumeChanged", "@brief Method void QMediaRecorder::volumeChanged(double volume)\n", false, &_init_f_volumeChanged_1071, &_call_f_volumeChanged_1071); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QMediaRecorder::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QMediaRecorder::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); methods += new qt_gsi::GenericMethod ("asQObject", "@brief Delivers the base class interface QObject of QMediaRecorder\nClass QMediaRecorder is derived from multiple base classes. This method delivers the QObject base class aspect.", false, &_init_f_QMediaRecorder_as_QObject, &_call_f_QMediaRecorder_as_QObject); @@ -945,42 +1203,6 @@ public: return QMediaRecorder::senderSignalIndex(); } - // [emitter impl] void QMediaRecorder::actualLocationChanged(const QUrl &location) - void emitter_QMediaRecorder_actualLocationChanged_1701(const QUrl &location) - { - emit QMediaRecorder::actualLocationChanged(location); - } - - // [emitter impl] void QMediaRecorder::availabilityChanged(bool available) - void emitter_QMediaRecorder_availabilityChanged_864(bool available) - { - emit QMediaRecorder::availabilityChanged(available); - } - - // [emitter impl] void QMediaRecorder::availabilityChanged(QMultimedia::AvailabilityStatus availability) - void emitter_QMediaRecorder_availabilityChanged_3555(QMultimedia::AvailabilityStatus availability) - { - emit QMediaRecorder::availabilityChanged(availability); - } - - // [emitter impl] void QMediaRecorder::destroyed(QObject *) - void emitter_QMediaRecorder_destroyed_1302(QObject *arg1) - { - emit QMediaRecorder::destroyed(arg1); - } - - // [emitter impl] void QMediaRecorder::durationChanged(qint64 duration) - void emitter_QMediaRecorder_durationChanged_986(qint64 duration) - { - emit QMediaRecorder::durationChanged(duration); - } - - // [emitter impl] void QMediaRecorder::error(QMediaRecorder::Error error) - void emitter_QMediaRecorder_error_2457(QMediaRecorder::Error _error) - { - emit QMediaRecorder::error(_error); - } - // [adaptor impl] bool QMediaRecorder::event(QEvent *) bool cbs_event_1217_0(QEvent *arg1) { @@ -1026,54 +1248,6 @@ public: } } - // [emitter impl] void QMediaRecorder::metaDataAvailableChanged(bool available) - void emitter_QMediaRecorder_metaDataAvailableChanged_864(bool available) - { - emit QMediaRecorder::metaDataAvailableChanged(available); - } - - // [emitter impl] void QMediaRecorder::metaDataChanged() - void emitter_QMediaRecorder_metaDataChanged_0() - { - emit QMediaRecorder::metaDataChanged(); - } - - // [emitter impl] void QMediaRecorder::metaDataChanged(const QString &key, const QVariant &value) - void emitter_QMediaRecorder_metaDataChanged_4036(const QString &key, const QVariant &value) - { - emit QMediaRecorder::metaDataChanged(key, value); - } - - // [emitter impl] void QMediaRecorder::metaDataWritableChanged(bool writable) - void emitter_QMediaRecorder_metaDataWritableChanged_864(bool writable) - { - emit QMediaRecorder::metaDataWritableChanged(writable); - } - - // [emitter impl] void QMediaRecorder::mutedChanged(bool muted) - void emitter_QMediaRecorder_mutedChanged_864(bool muted) - { - emit QMediaRecorder::mutedChanged(muted); - } - - // [emitter impl] void QMediaRecorder::stateChanged(QMediaRecorder::State state) - void emitter_QMediaRecorder_stateChanged_2448(QMediaRecorder::State state) - { - emit QMediaRecorder::stateChanged(state); - } - - // [emitter impl] void QMediaRecorder::statusChanged(QMediaRecorder::Status status) - void emitter_QMediaRecorder_statusChanged_2579(QMediaRecorder::Status status) - { - emit QMediaRecorder::statusChanged(status); - } - - // [emitter impl] void QMediaRecorder::volumeChanged(double volume) - void emitter_QMediaRecorder_volumeChanged_1071(double volume) - { - emit QMediaRecorder::volumeChanged(volume); - } - // [adaptor impl] void QMediaRecorder::childEvent(QChildEvent *) void cbs_childEvent_1701_0(QChildEvent *arg1) { @@ -1182,60 +1356,6 @@ static void _call_ctor_QMediaRecorder_Adaptor_2976 (const qt_gsi::GenericStaticM } -// emitter void QMediaRecorder::actualLocationChanged(const QUrl &location) - -static void _init_emitter_actualLocationChanged_1701 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("location"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_actualLocationChanged_1701 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const QUrl &arg1 = gsi::arg_reader() (args, heap); - ((QMediaRecorder_Adaptor *)cls)->emitter_QMediaRecorder_actualLocationChanged_1701 (arg1); -} - - -// emitter void QMediaRecorder::availabilityChanged(bool available) - -static void _init_emitter_availabilityChanged_864 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("available"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_availabilityChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - bool arg1 = gsi::arg_reader() (args, heap); - ((QMediaRecorder_Adaptor *)cls)->emitter_QMediaRecorder_availabilityChanged_864 (arg1); -} - - -// emitter void QMediaRecorder::availabilityChanged(QMultimedia::AvailabilityStatus availability) - -static void _init_emitter_availabilityChanged_3555 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("availability"); - decl->add_arg::target_type & > (argspec_0); - decl->set_return (); -} - -static void _call_emitter_availabilityChanged_3555 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); - ((QMediaRecorder_Adaptor *)cls)->emitter_QMediaRecorder_availabilityChanged_3555 (arg1); -} - - // void QMediaRecorder::childEvent(QChildEvent *) static void _init_cbs_childEvent_1701_0 (qt_gsi::GenericMethod *decl) @@ -1284,24 +1404,6 @@ static void _set_callback_cbs_customEvent_1217_0 (void *cls, const gsi::Callback } -// emitter void QMediaRecorder::destroyed(QObject *) - -static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - ((QMediaRecorder_Adaptor *)cls)->emitter_QMediaRecorder_destroyed_1302 (arg1); -} - - // void QMediaRecorder::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -1326,42 +1428,6 @@ static void _set_callback_cbs_disconnectNotify_2394_0 (void *cls, const gsi::Cal } -// emitter void QMediaRecorder::durationChanged(qint64 duration) - -static void _init_emitter_durationChanged_986 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("duration"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_durationChanged_986 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - qint64 arg1 = gsi::arg_reader() (args, heap); - ((QMediaRecorder_Adaptor *)cls)->emitter_QMediaRecorder_durationChanged_986 (arg1); -} - - -// emitter void QMediaRecorder::error(QMediaRecorder::Error error) - -static void _init_emitter_error_2457 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("error"); - decl->add_arg::target_type & > (argspec_0); - decl->set_return (); -} - -static void _call_emitter_error_2457 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); - ((QMediaRecorder_Adaptor *)cls)->emitter_QMediaRecorder_error_2457 (arg1); -} - - // bool QMediaRecorder::event(QEvent *) static void _init_cbs_event_1217_0 (qt_gsi::GenericMethod *decl) @@ -1448,95 +1514,6 @@ static void _set_callback_cbs_mediaObject_c0_0 (void *cls, const gsi::Callback & } -// emitter void QMediaRecorder::metaDataAvailableChanged(bool available) - -static void _init_emitter_metaDataAvailableChanged_864 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("available"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_metaDataAvailableChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - bool arg1 = gsi::arg_reader() (args, heap); - ((QMediaRecorder_Adaptor *)cls)->emitter_QMediaRecorder_metaDataAvailableChanged_864 (arg1); -} - - -// emitter void QMediaRecorder::metaDataChanged() - -static void _init_emitter_metaDataChanged_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_metaDataChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QMediaRecorder_Adaptor *)cls)->emitter_QMediaRecorder_metaDataChanged_0 (); -} - - -// emitter void QMediaRecorder::metaDataChanged(const QString &key, const QVariant &value) - -static void _init_emitter_metaDataChanged_4036 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("key"); - decl->add_arg (argspec_0); - static gsi::ArgSpecBase argspec_1 ("value"); - decl->add_arg (argspec_1); - decl->set_return (); -} - -static void _call_emitter_metaDataChanged_4036 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const QString &arg1 = gsi::arg_reader() (args, heap); - const QVariant &arg2 = gsi::arg_reader() (args, heap); - ((QMediaRecorder_Adaptor *)cls)->emitter_QMediaRecorder_metaDataChanged_4036 (arg1, arg2); -} - - -// emitter void QMediaRecorder::metaDataWritableChanged(bool writable) - -static void _init_emitter_metaDataWritableChanged_864 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("writable"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_metaDataWritableChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - bool arg1 = gsi::arg_reader() (args, heap); - ((QMediaRecorder_Adaptor *)cls)->emitter_QMediaRecorder_metaDataWritableChanged_864 (arg1); -} - - -// emitter void QMediaRecorder::mutedChanged(bool muted) - -static void _init_emitter_mutedChanged_864 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("muted"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_mutedChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - bool arg1 = gsi::arg_reader() (args, heap); - ((QMediaRecorder_Adaptor *)cls)->emitter_QMediaRecorder_mutedChanged_864 (arg1); -} - - // exposed int QMediaRecorder::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -1606,42 +1583,6 @@ static void _set_callback_cbs_setMediaObject_1782_0 (void *cls, const gsi::Callb } -// emitter void QMediaRecorder::stateChanged(QMediaRecorder::State state) - -static void _init_emitter_stateChanged_2448 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("state"); - decl->add_arg::target_type & > (argspec_0); - decl->set_return (); -} - -static void _call_emitter_stateChanged_2448 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); - ((QMediaRecorder_Adaptor *)cls)->emitter_QMediaRecorder_stateChanged_2448 (arg1); -} - - -// emitter void QMediaRecorder::statusChanged(QMediaRecorder::Status status) - -static void _init_emitter_statusChanged_2579 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("status"); - decl->add_arg::target_type & > (argspec_0); - decl->set_return (); -} - -static void _call_emitter_statusChanged_2579 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); - ((QMediaRecorder_Adaptor *)cls)->emitter_QMediaRecorder_statusChanged_2579 (arg1); -} - - // void QMediaRecorder::timerEvent(QTimerEvent *) static void _init_cbs_timerEvent_1730_0 (qt_gsi::GenericMethod *decl) @@ -1666,24 +1607,6 @@ static void _set_callback_cbs_timerEvent_1730_0 (void *cls, const gsi::Callback } -// emitter void QMediaRecorder::volumeChanged(double volume) - -static void _init_emitter_volumeChanged_1071 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("volume"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_volumeChanged_1071 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - double arg1 = gsi::arg_reader() (args, heap); - ((QMediaRecorder_Adaptor *)cls)->emitter_QMediaRecorder_volumeChanged_1071 (arg1); -} - - namespace gsi { @@ -1692,18 +1615,12 @@ gsi::Class &qtdecl_QMediaRecorder (); static gsi::Methods methods_QMediaRecorder_Adaptor () { gsi::Methods methods; methods += new qt_gsi::GenericStaticMethod ("new", "@brief Constructor QMediaRecorder::QMediaRecorder(QMediaObject *mediaObject, QObject *parent)\nThis method creates an object of class QMediaRecorder.", &_init_ctor_QMediaRecorder_Adaptor_2976, &_call_ctor_QMediaRecorder_Adaptor_2976); - methods += new qt_gsi::GenericMethod ("emit_actualLocationChanged", "@brief Emitter for signal void QMediaRecorder::actualLocationChanged(const QUrl &location)\nCall this method to emit this signal.", false, &_init_emitter_actualLocationChanged_1701, &_call_emitter_actualLocationChanged_1701); - methods += new qt_gsi::GenericMethod ("emit_availabilityChanged_bool", "@brief Emitter for signal void QMediaRecorder::availabilityChanged(bool available)\nCall this method to emit this signal.", false, &_init_emitter_availabilityChanged_864, &_call_emitter_availabilityChanged_864); - methods += new qt_gsi::GenericMethod ("emit_availabilityChanged_status", "@brief Emitter for signal void QMediaRecorder::availabilityChanged(QMultimedia::AvailabilityStatus availability)\nCall this method to emit this signal.", false, &_init_emitter_availabilityChanged_3555, &_call_emitter_availabilityChanged_3555); methods += new qt_gsi::GenericMethod ("*childEvent", "@brief Virtual method void QMediaRecorder::childEvent(QChildEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QMediaRecorder::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); - methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QMediaRecorder::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QMediaRecorder::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); - methods += new qt_gsi::GenericMethod ("emit_durationChanged", "@brief Emitter for signal void QMediaRecorder::durationChanged(qint64 duration)\nCall this method to emit this signal.", false, &_init_emitter_durationChanged_986, &_call_emitter_durationChanged_986); - methods += new qt_gsi::GenericMethod ("emit_error_sig", "@brief Emitter for signal void QMediaRecorder::error(QMediaRecorder::Error error)\nCall this method to emit this signal.", false, &_init_emitter_error_2457, &_call_emitter_error_2457); methods += new qt_gsi::GenericMethod ("event", "@brief Virtual method bool QMediaRecorder::event(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0); methods += new qt_gsi::GenericMethod ("event", "@hide", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0, &_set_callback_cbs_event_1217_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QMediaRecorder::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); @@ -1711,21 +1628,13 @@ static gsi::Methods methods_QMediaRecorder_Adaptor () { methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QMediaRecorder::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); methods += new qt_gsi::GenericMethod ("mediaObject", "@brief Virtual method QMediaObject *QMediaRecorder::mediaObject()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_mediaObject_c0_0, &_call_cbs_mediaObject_c0_0); methods += new qt_gsi::GenericMethod ("mediaObject", "@hide", true, &_init_cbs_mediaObject_c0_0, &_call_cbs_mediaObject_c0_0, &_set_callback_cbs_mediaObject_c0_0); - methods += new qt_gsi::GenericMethod ("emit_metaDataAvailableChanged", "@brief Emitter for signal void QMediaRecorder::metaDataAvailableChanged(bool available)\nCall this method to emit this signal.", false, &_init_emitter_metaDataAvailableChanged_864, &_call_emitter_metaDataAvailableChanged_864); - methods += new qt_gsi::GenericMethod ("emit_metaDataChanged", "@brief Emitter for signal void QMediaRecorder::metaDataChanged()\nCall this method to emit this signal.", false, &_init_emitter_metaDataChanged_0, &_call_emitter_metaDataChanged_0); - methods += new qt_gsi::GenericMethod ("emit_metaDataChanged_kv", "@brief Emitter for signal void QMediaRecorder::metaDataChanged(const QString &key, const QVariant &value)\nCall this method to emit this signal.", false, &_init_emitter_metaDataChanged_4036, &_call_emitter_metaDataChanged_4036); - methods += new qt_gsi::GenericMethod ("emit_metaDataWritableChanged", "@brief Emitter for signal void QMediaRecorder::metaDataWritableChanged(bool writable)\nCall this method to emit this signal.", false, &_init_emitter_metaDataWritableChanged_864, &_call_emitter_metaDataWritableChanged_864); - methods += new qt_gsi::GenericMethod ("emit_mutedChanged", "@brief Emitter for signal void QMediaRecorder::mutedChanged(bool muted)\nCall this method to emit this signal.", false, &_init_emitter_mutedChanged_864, &_call_emitter_mutedChanged_864); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QMediaRecorder::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QMediaRecorder::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QMediaRecorder::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); methods += new qt_gsi::GenericMethod ("*setMediaObject", "@brief Virtual method bool QMediaRecorder::setMediaObject(QMediaObject *object)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_setMediaObject_1782_0, &_call_cbs_setMediaObject_1782_0); methods += new qt_gsi::GenericMethod ("*setMediaObject", "@hide", false, &_init_cbs_setMediaObject_1782_0, &_call_cbs_setMediaObject_1782_0, &_set_callback_cbs_setMediaObject_1782_0); - methods += new qt_gsi::GenericMethod ("emit_stateChanged", "@brief Emitter for signal void QMediaRecorder::stateChanged(QMediaRecorder::State state)\nCall this method to emit this signal.", false, &_init_emitter_stateChanged_2448, &_call_emitter_stateChanged_2448); - methods += new qt_gsi::GenericMethod ("emit_statusChanged", "@brief Emitter for signal void QMediaRecorder::statusChanged(QMediaRecorder::Status status)\nCall this method to emit this signal.", false, &_init_emitter_statusChanged_2579, &_call_emitter_statusChanged_2579); methods += new qt_gsi::GenericMethod ("*timerEvent", "@brief Virtual method void QMediaRecorder::timerEvent(QTimerEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_timerEvent_1730_0, &_call_cbs_timerEvent_1730_0); methods += new qt_gsi::GenericMethod ("*timerEvent", "@hide", false, &_init_cbs_timerEvent_1730_0, &_call_cbs_timerEvent_1730_0, &_set_callback_cbs_timerEvent_1730_0); - methods += new qt_gsi::GenericMethod ("emit_volumeChanged", "@brief Emitter for signal void QMediaRecorder::volumeChanged(double volume)\nCall this method to emit this signal.", false, &_init_emitter_volumeChanged_1071, &_call_emitter_volumeChanged_1071); return methods; } diff --git a/src/gsiqt/qt5/QtMultimedia/gsiDeclQMediaRecorderControl.cc b/src/gsiqt/qt5/QtMultimedia/gsiDeclQMediaRecorderControl.cc index 6f8a235f5..ed87df163 100644 --- a/src/gsiqt/qt5/QtMultimedia/gsiDeclQMediaRecorderControl.cc +++ b/src/gsiqt/qt5/QtMultimedia/gsiDeclQMediaRecorderControl.cc @@ -56,6 +56,26 @@ static void _call_smo (const qt_gsi::GenericStaticMethod *, gsi::SerialArgs &, g } +// void QMediaRecorderControl::actualLocationChanged(const QUrl &location) + + +static void _init_f_actualLocationChanged_1701 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("location"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_actualLocationChanged_1701 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QUrl &arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaRecorderControl *)cls)->actualLocationChanged (arg1); +} + + // void QMediaRecorderControl::applySettings() @@ -87,6 +107,49 @@ static void _call_f_duration_c0 (const qt_gsi::GenericMethod * /*decl*/, void *c } +// void QMediaRecorderControl::durationChanged(qint64 position) + + +static void _init_f_durationChanged_986 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("position"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_durationChanged_986 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + qint64 arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaRecorderControl *)cls)->durationChanged (arg1); +} + + +// void QMediaRecorderControl::error(int error, const QString &errorString) + + +static void _init_f_error_2684 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("error"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("errorString"); + decl->add_arg (argspec_1); + decl->set_return (); +} + +static void _call_f_error_2684 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + int arg1 = gsi::arg_reader() (args, heap); + const QString &arg2 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaRecorderControl *)cls)->error (arg1, arg2); +} + + // bool QMediaRecorderControl::isMuted() @@ -102,6 +165,26 @@ static void _call_f_isMuted_c0 (const qt_gsi::GenericMethod * /*decl*/, void *cl } +// void QMediaRecorderControl::mutedChanged(bool muted) + + +static void _init_f_mutedChanged_864 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("muted"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_mutedChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + bool arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaRecorderControl *)cls)->mutedChanged (arg1); +} + + // QUrl QMediaRecorderControl::outputLocation() @@ -211,6 +294,26 @@ static void _call_f_state_c0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, } +// void QMediaRecorderControl::stateChanged(QMediaRecorder::State state) + + +static void _init_f_stateChanged_2448 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("state"); + decl->add_arg::target_type & > (argspec_0); + decl->set_return (); +} + +static void _call_f_stateChanged_2448 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaRecorderControl *)cls)->stateChanged (qt_gsi::QtToCppAdaptor(arg1).cref()); +} + + // QMediaRecorder::Status QMediaRecorderControl::status() @@ -226,6 +329,26 @@ static void _call_f_status_c0 (const qt_gsi::GenericMethod * /*decl*/, void *cls } +// void QMediaRecorderControl::statusChanged(QMediaRecorder::Status status) + + +static void _init_f_statusChanged_2579 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("status"); + decl->add_arg::target_type & > (argspec_0); + decl->set_return (); +} + +static void _call_f_statusChanged_2579 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaRecorderControl *)cls)->statusChanged (qt_gsi::QtToCppAdaptor(arg1).cref()); +} + + // double QMediaRecorderControl::volume() @@ -241,6 +364,26 @@ static void _call_f_volume_c0 (const qt_gsi::GenericMethod * /*decl*/, void *cls } +// void QMediaRecorderControl::volumeChanged(double volume) + + +static void _init_f_volumeChanged_1071 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("volume"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_volumeChanged_1071 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + double arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaRecorderControl *)cls)->volumeChanged (arg1); +} + + // static QString QMediaRecorderControl::tr(const char *s, const char *c, int n) @@ -297,25 +440,24 @@ namespace gsi static gsi::Methods methods_QMediaRecorderControl () { gsi::Methods methods; methods += new qt_gsi::GenericStaticMethod ("staticMetaObject", "@brief Obtains the static MetaObject for this class.", &_init_smo, &_call_smo); + methods += new qt_gsi::GenericMethod ("actualLocationChanged", "@brief Method void QMediaRecorderControl::actualLocationChanged(const QUrl &location)\n", false, &_init_f_actualLocationChanged_1701, &_call_f_actualLocationChanged_1701); methods += new qt_gsi::GenericMethod ("applySettings", "@brief Method void QMediaRecorderControl::applySettings()\n", false, &_init_f_applySettings_0, &_call_f_applySettings_0); methods += new qt_gsi::GenericMethod ("duration", "@brief Method qint64 QMediaRecorderControl::duration()\n", true, &_init_f_duration_c0, &_call_f_duration_c0); + methods += new qt_gsi::GenericMethod ("durationChanged", "@brief Method void QMediaRecorderControl::durationChanged(qint64 position)\n", false, &_init_f_durationChanged_986, &_call_f_durationChanged_986); + methods += new qt_gsi::GenericMethod ("error", "@brief Method void QMediaRecorderControl::error(int error, const QString &errorString)\n", false, &_init_f_error_2684, &_call_f_error_2684); methods += new qt_gsi::GenericMethod ("isMuted?|:muted", "@brief Method bool QMediaRecorderControl::isMuted()\n", true, &_init_f_isMuted_c0, &_call_f_isMuted_c0); + methods += new qt_gsi::GenericMethod ("mutedChanged", "@brief Method void QMediaRecorderControl::mutedChanged(bool muted)\n", false, &_init_f_mutedChanged_864, &_call_f_mutedChanged_864); methods += new qt_gsi::GenericMethod ("outputLocation", "@brief Method QUrl QMediaRecorderControl::outputLocation()\n", true, &_init_f_outputLocation_c0, &_call_f_outputLocation_c0); methods += new qt_gsi::GenericMethod ("setMuted|muted=", "@brief Method void QMediaRecorderControl::setMuted(bool muted)\n", false, &_init_f_setMuted_864, &_call_f_setMuted_864); methods += new qt_gsi::GenericMethod ("setOutputLocation", "@brief Method bool QMediaRecorderControl::setOutputLocation(const QUrl &location)\n", false, &_init_f_setOutputLocation_1701, &_call_f_setOutputLocation_1701); methods += new qt_gsi::GenericMethod ("setState|state=", "@brief Method void QMediaRecorderControl::setState(QMediaRecorder::State state)\n", false, &_init_f_setState_2448, &_call_f_setState_2448); methods += new qt_gsi::GenericMethod ("setVolume|volume=", "@brief Method void QMediaRecorderControl::setVolume(double volume)\n", false, &_init_f_setVolume_1071, &_call_f_setVolume_1071); methods += new qt_gsi::GenericMethod (":state", "@brief Method QMediaRecorder::State QMediaRecorderControl::state()\n", true, &_init_f_state_c0, &_call_f_state_c0); + methods += new qt_gsi::GenericMethod ("stateChanged", "@brief Method void QMediaRecorderControl::stateChanged(QMediaRecorder::State state)\n", false, &_init_f_stateChanged_2448, &_call_f_stateChanged_2448); methods += new qt_gsi::GenericMethod ("status", "@brief Method QMediaRecorder::Status QMediaRecorderControl::status()\n", true, &_init_f_status_c0, &_call_f_status_c0); + methods += new qt_gsi::GenericMethod ("statusChanged", "@brief Method void QMediaRecorderControl::statusChanged(QMediaRecorder::Status status)\n", false, &_init_f_statusChanged_2579, &_call_f_statusChanged_2579); methods += new qt_gsi::GenericMethod (":volume", "@brief Method double QMediaRecorderControl::volume()\n", true, &_init_f_volume_c0, &_call_f_volume_c0); - methods += gsi::qt_signal ("actualLocationChanged(const QUrl &)", "actualLocationChanged", gsi::arg("location"), "@brief Signal declaration for QMediaRecorderControl::actualLocationChanged(const QUrl &location)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QMediaRecorderControl::destroyed(QObject *)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("durationChanged(qint64)", "durationChanged", gsi::arg("position"), "@brief Signal declaration for QMediaRecorderControl::durationChanged(qint64 position)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("error(int, const QString &)", "error", gsi::arg("error"), gsi::arg("errorString"), "@brief Signal declaration for QMediaRecorderControl::error(int error, const QString &errorString)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("mutedChanged(bool)", "mutedChanged", gsi::arg("muted"), "@brief Signal declaration for QMediaRecorderControl::mutedChanged(bool muted)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal::target_type & > ("stateChanged(QMediaRecorder::State)", "stateChanged", gsi::arg("state"), "@brief Signal declaration for QMediaRecorderControl::stateChanged(QMediaRecorder::State state)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal::target_type & > ("statusChanged(QMediaRecorder::Status)", "statusChanged", gsi::arg("status"), "@brief Signal declaration for QMediaRecorderControl::statusChanged(QMediaRecorder::Status status)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("volumeChanged(double)", "volumeChanged", gsi::arg("volume"), "@brief Signal declaration for QMediaRecorderControl::volumeChanged(double volume)\nYou can bind a procedure to this signal."); + methods += new qt_gsi::GenericMethod ("volumeChanged", "@brief Method void QMediaRecorderControl::volumeChanged(double volume)\n", false, &_init_f_volumeChanged_1071, &_call_f_volumeChanged_1071); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QMediaRecorderControl::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QMediaRecorderControl::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -364,12 +506,6 @@ public: return QMediaRecorderControl::senderSignalIndex(); } - // [emitter impl] void QMediaRecorderControl::actualLocationChanged(const QUrl &location) - void emitter_QMediaRecorderControl_actualLocationChanged_1701(const QUrl &location) - { - emit QMediaRecorderControl::actualLocationChanged(location); - } - // [adaptor impl] void QMediaRecorderControl::applySettings() void cbs_applySettings_0_0() { @@ -385,12 +521,6 @@ public: } } - // [emitter impl] void QMediaRecorderControl::destroyed(QObject *) - void emitter_QMediaRecorderControl_destroyed_1302(QObject *arg1) - { - emit QMediaRecorderControl::destroyed(arg1); - } - // [adaptor impl] qint64 QMediaRecorderControl::duration() qint64 cbs_duration_c0_0() const { @@ -406,18 +536,6 @@ public: } } - // [emitter impl] void QMediaRecorderControl::durationChanged(qint64 position) - void emitter_QMediaRecorderControl_durationChanged_986(qint64 position) - { - emit QMediaRecorderControl::durationChanged(position); - } - - // [emitter impl] void QMediaRecorderControl::error(int error, const QString &errorString) - void emitter_QMediaRecorderControl_error_2684(int _error, const QString &errorString) - { - emit QMediaRecorderControl::error(_error, errorString); - } - // [adaptor impl] bool QMediaRecorderControl::event(QEvent *) bool cbs_event_1217_0(QEvent *arg1) { @@ -463,12 +581,6 @@ public: } } - // [emitter impl] void QMediaRecorderControl::mutedChanged(bool muted) - void emitter_QMediaRecorderControl_mutedChanged_864(bool muted) - { - emit QMediaRecorderControl::mutedChanged(muted); - } - // [adaptor impl] QUrl QMediaRecorderControl::outputLocation() QUrl cbs_outputLocation_c0_0() const { @@ -563,12 +675,6 @@ public: } } - // [emitter impl] void QMediaRecorderControl::stateChanged(QMediaRecorder::State state) - void emitter_QMediaRecorderControl_stateChanged_2448(QMediaRecorder::State state) - { - emit QMediaRecorderControl::stateChanged(state); - } - // [adaptor impl] QMediaRecorder::Status QMediaRecorderControl::status() qt_gsi::Converter::target_type cbs_status_c0_0() const { @@ -584,12 +690,6 @@ public: } } - // [emitter impl] void QMediaRecorderControl::statusChanged(QMediaRecorder::Status status) - void emitter_QMediaRecorderControl_statusChanged_2579(QMediaRecorder::Status status) - { - emit QMediaRecorderControl::statusChanged(status); - } - // [adaptor impl] double QMediaRecorderControl::volume() double cbs_volume_c0_0() const { @@ -605,12 +705,6 @@ public: } } - // [emitter impl] void QMediaRecorderControl::volumeChanged(double volume) - void emitter_QMediaRecorderControl_volumeChanged_1071(double volume) - { - emit QMediaRecorderControl::volumeChanged(volume); - } - // [adaptor impl] void QMediaRecorderControl::childEvent(QChildEvent *) void cbs_childEvent_1701_0(QChildEvent *arg1) { @@ -706,24 +800,6 @@ static void _call_ctor_QMediaRecorderControl_Adaptor_0 (const qt_gsi::GenericSta } -// emitter void QMediaRecorderControl::actualLocationChanged(const QUrl &location) - -static void _init_emitter_actualLocationChanged_1701 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("location"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_actualLocationChanged_1701 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const QUrl &arg1 = gsi::arg_reader() (args, heap); - ((QMediaRecorderControl_Adaptor *)cls)->emitter_QMediaRecorderControl_actualLocationChanged_1701 (arg1); -} - - // void QMediaRecorderControl::applySettings() static void _init_cbs_applySettings_0_0 (qt_gsi::GenericMethod *decl) @@ -792,24 +868,6 @@ static void _set_callback_cbs_customEvent_1217_0 (void *cls, const gsi::Callback } -// emitter void QMediaRecorderControl::destroyed(QObject *) - -static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - ((QMediaRecorderControl_Adaptor *)cls)->emitter_QMediaRecorderControl_destroyed_1302 (arg1); -} - - // void QMediaRecorderControl::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -853,45 +911,6 @@ static void _set_callback_cbs_duration_c0_0 (void *cls, const gsi::Callback &cb) } -// emitter void QMediaRecorderControl::durationChanged(qint64 position) - -static void _init_emitter_durationChanged_986 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("position"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_durationChanged_986 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - qint64 arg1 = gsi::arg_reader() (args, heap); - ((QMediaRecorderControl_Adaptor *)cls)->emitter_QMediaRecorderControl_durationChanged_986 (arg1); -} - - -// emitter void QMediaRecorderControl::error(int error, const QString &errorString) - -static void _init_emitter_error_2684 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("error"); - decl->add_arg (argspec_0); - static gsi::ArgSpecBase argspec_1 ("errorString"); - decl->add_arg (argspec_1); - decl->set_return (); -} - -static void _call_emitter_error_2684 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - int arg1 = gsi::arg_reader() (args, heap); - const QString &arg2 = gsi::arg_reader() (args, heap); - ((QMediaRecorderControl_Adaptor *)cls)->emitter_QMediaRecorderControl_error_2684 (arg1, arg2); -} - - // bool QMediaRecorderControl::event(QEvent *) static void _init_cbs_event_1217_0 (qt_gsi::GenericMethod *decl) @@ -978,24 +997,6 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } -// emitter void QMediaRecorderControl::mutedChanged(bool muted) - -static void _init_emitter_mutedChanged_864 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("muted"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_mutedChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - bool arg1 = gsi::arg_reader() (args, heap); - ((QMediaRecorderControl_Adaptor *)cls)->emitter_QMediaRecorderControl_mutedChanged_864 (arg1); -} - - // QUrl QMediaRecorderControl::outputLocation() static void _init_cbs_outputLocation_c0_0 (qt_gsi::GenericMethod *decl) @@ -1175,24 +1176,6 @@ static void _set_callback_cbs_state_c0_0 (void *cls, const gsi::Callback &cb) } -// emitter void QMediaRecorderControl::stateChanged(QMediaRecorder::State state) - -static void _init_emitter_stateChanged_2448 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("state"); - decl->add_arg::target_type & > (argspec_0); - decl->set_return (); -} - -static void _call_emitter_stateChanged_2448 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); - ((QMediaRecorderControl_Adaptor *)cls)->emitter_QMediaRecorderControl_stateChanged_2448 (arg1); -} - - // QMediaRecorder::Status QMediaRecorderControl::status() static void _init_cbs_status_c0_0 (qt_gsi::GenericMethod *decl) @@ -1212,24 +1195,6 @@ static void _set_callback_cbs_status_c0_0 (void *cls, const gsi::Callback &cb) } -// emitter void QMediaRecorderControl::statusChanged(QMediaRecorder::Status status) - -static void _init_emitter_statusChanged_2579 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("status"); - decl->add_arg::target_type & > (argspec_0); - decl->set_return (); -} - -static void _call_emitter_statusChanged_2579 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); - ((QMediaRecorderControl_Adaptor *)cls)->emitter_QMediaRecorderControl_statusChanged_2579 (arg1); -} - - // void QMediaRecorderControl::timerEvent(QTimerEvent *) static void _init_cbs_timerEvent_1730_0 (qt_gsi::GenericMethod *decl) @@ -1273,24 +1238,6 @@ static void _set_callback_cbs_volume_c0_0 (void *cls, const gsi::Callback &cb) } -// emitter void QMediaRecorderControl::volumeChanged(double volume) - -static void _init_emitter_volumeChanged_1071 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("volume"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_volumeChanged_1071 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - double arg1 = gsi::arg_reader() (args, heap); - ((QMediaRecorderControl_Adaptor *)cls)->emitter_QMediaRecorderControl_volumeChanged_1071 (arg1); -} - - namespace gsi { @@ -1299,20 +1246,16 @@ gsi::Class &qtdecl_QMediaRecorderControl (); static gsi::Methods methods_QMediaRecorderControl_Adaptor () { gsi::Methods methods; methods += new qt_gsi::GenericStaticMethod ("new", "@brief Constructor QMediaRecorderControl::QMediaRecorderControl()\nThis method creates an object of class QMediaRecorderControl.", &_init_ctor_QMediaRecorderControl_Adaptor_0, &_call_ctor_QMediaRecorderControl_Adaptor_0); - methods += new qt_gsi::GenericMethod ("emit_actualLocationChanged", "@brief Emitter for signal void QMediaRecorderControl::actualLocationChanged(const QUrl &location)\nCall this method to emit this signal.", false, &_init_emitter_actualLocationChanged_1701, &_call_emitter_actualLocationChanged_1701); methods += new qt_gsi::GenericMethod ("applySettings", "@brief Virtual method void QMediaRecorderControl::applySettings()\nThis method can be reimplemented in a derived class.", false, &_init_cbs_applySettings_0_0, &_call_cbs_applySettings_0_0); methods += new qt_gsi::GenericMethod ("applySettings", "@hide", false, &_init_cbs_applySettings_0_0, &_call_cbs_applySettings_0_0, &_set_callback_cbs_applySettings_0_0); methods += new qt_gsi::GenericMethod ("*childEvent", "@brief Virtual method void QMediaRecorderControl::childEvent(QChildEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QMediaRecorderControl::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); - methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QMediaRecorderControl::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QMediaRecorderControl::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("duration", "@brief Virtual method qint64 QMediaRecorderControl::duration()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_duration_c0_0, &_call_cbs_duration_c0_0); methods += new qt_gsi::GenericMethod ("duration", "@hide", true, &_init_cbs_duration_c0_0, &_call_cbs_duration_c0_0, &_set_callback_cbs_duration_c0_0); - methods += new qt_gsi::GenericMethod ("emit_durationChanged", "@brief Emitter for signal void QMediaRecorderControl::durationChanged(qint64 position)\nCall this method to emit this signal.", false, &_init_emitter_durationChanged_986, &_call_emitter_durationChanged_986); - methods += new qt_gsi::GenericMethod ("emit_error", "@brief Emitter for signal void QMediaRecorderControl::error(int error, const QString &errorString)\nCall this method to emit this signal.", false, &_init_emitter_error_2684, &_call_emitter_error_2684); methods += new qt_gsi::GenericMethod ("event", "@brief Virtual method bool QMediaRecorderControl::event(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0); methods += new qt_gsi::GenericMethod ("event", "@hide", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0, &_set_callback_cbs_event_1217_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QMediaRecorderControl::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); @@ -1320,7 +1263,6 @@ static gsi::Methods methods_QMediaRecorderControl_Adaptor () { methods += new qt_gsi::GenericMethod ("isMuted", "@brief Virtual method bool QMediaRecorderControl::isMuted()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_isMuted_c0_0, &_call_cbs_isMuted_c0_0); methods += new qt_gsi::GenericMethod ("isMuted", "@hide", true, &_init_cbs_isMuted_c0_0, &_call_cbs_isMuted_c0_0, &_set_callback_cbs_isMuted_c0_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QMediaRecorderControl::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); - methods += new qt_gsi::GenericMethod ("emit_mutedChanged", "@brief Emitter for signal void QMediaRecorderControl::mutedChanged(bool muted)\nCall this method to emit this signal.", false, &_init_emitter_mutedChanged_864, &_call_emitter_mutedChanged_864); methods += new qt_gsi::GenericMethod ("outputLocation", "@brief Virtual method QUrl QMediaRecorderControl::outputLocation()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_outputLocation_c0_0, &_call_cbs_outputLocation_c0_0); methods += new qt_gsi::GenericMethod ("outputLocation", "@hide", true, &_init_cbs_outputLocation_c0_0, &_call_cbs_outputLocation_c0_0, &_set_callback_cbs_outputLocation_c0_0); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QMediaRecorderControl::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); @@ -1336,15 +1278,12 @@ static gsi::Methods methods_QMediaRecorderControl_Adaptor () { methods += new qt_gsi::GenericMethod ("setVolume", "@hide", false, &_init_cbs_setVolume_1071_0, &_call_cbs_setVolume_1071_0, &_set_callback_cbs_setVolume_1071_0); methods += new qt_gsi::GenericMethod ("state", "@brief Virtual method QMediaRecorder::State QMediaRecorderControl::state()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_state_c0_0, &_call_cbs_state_c0_0); methods += new qt_gsi::GenericMethod ("state", "@hide", true, &_init_cbs_state_c0_0, &_call_cbs_state_c0_0, &_set_callback_cbs_state_c0_0); - methods += new qt_gsi::GenericMethod ("emit_stateChanged", "@brief Emitter for signal void QMediaRecorderControl::stateChanged(QMediaRecorder::State state)\nCall this method to emit this signal.", false, &_init_emitter_stateChanged_2448, &_call_emitter_stateChanged_2448); methods += new qt_gsi::GenericMethod ("status", "@brief Virtual method QMediaRecorder::Status QMediaRecorderControl::status()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_status_c0_0, &_call_cbs_status_c0_0); methods += new qt_gsi::GenericMethod ("status", "@hide", true, &_init_cbs_status_c0_0, &_call_cbs_status_c0_0, &_set_callback_cbs_status_c0_0); - methods += new qt_gsi::GenericMethod ("emit_statusChanged", "@brief Emitter for signal void QMediaRecorderControl::statusChanged(QMediaRecorder::Status status)\nCall this method to emit this signal.", false, &_init_emitter_statusChanged_2579, &_call_emitter_statusChanged_2579); methods += new qt_gsi::GenericMethod ("*timerEvent", "@brief Virtual method void QMediaRecorderControl::timerEvent(QTimerEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_timerEvent_1730_0, &_call_cbs_timerEvent_1730_0); methods += new qt_gsi::GenericMethod ("*timerEvent", "@hide", false, &_init_cbs_timerEvent_1730_0, &_call_cbs_timerEvent_1730_0, &_set_callback_cbs_timerEvent_1730_0); methods += new qt_gsi::GenericMethod ("volume", "@brief Virtual method double QMediaRecorderControl::volume()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_volume_c0_0, &_call_cbs_volume_c0_0); methods += new qt_gsi::GenericMethod ("volume", "@hide", true, &_init_cbs_volume_c0_0, &_call_cbs_volume_c0_0, &_set_callback_cbs_volume_c0_0); - methods += new qt_gsi::GenericMethod ("emit_volumeChanged", "@brief Emitter for signal void QMediaRecorderControl::volumeChanged(double volume)\nCall this method to emit this signal.", false, &_init_emitter_volumeChanged_1071, &_call_emitter_volumeChanged_1071); return methods; } diff --git a/src/gsiqt/qt5/QtMultimedia/gsiDeclQMediaService.cc b/src/gsiqt/qt5/QtMultimedia/gsiDeclQMediaService.cc index 7b61872a0..346cbbc3a 100644 --- a/src/gsiqt/qt5/QtMultimedia/gsiDeclQMediaService.cc +++ b/src/gsiqt/qt5/QtMultimedia/gsiDeclQMediaService.cc @@ -153,7 +153,6 @@ static gsi::Methods methods_QMediaService () { methods += new qt_gsi::GenericStaticMethod ("staticMetaObject", "@brief Obtains the static MetaObject for this class.", &_init_smo, &_call_smo); methods += new qt_gsi::GenericMethod ("releaseControl", "@brief Method void QMediaService::releaseControl(QMediaControl *control)\n", false, &_init_f_releaseControl_1920, &_call_f_releaseControl_1920); methods += new qt_gsi::GenericMethod ("requestControl", "@brief Method QMediaControl *QMediaService::requestControl(const char *name)\n", false, &_init_f_requestControl_1731, &_call_f_requestControl_1731); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QMediaService::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QMediaService::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QMediaService::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -196,12 +195,6 @@ public: return QMediaService::senderSignalIndex(); } - // [emitter impl] void QMediaService::destroyed(QObject *) - void emitter_QMediaService_destroyed_1302(QObject *arg1) - { - emit QMediaService::destroyed(arg1); - } - // [adaptor impl] bool QMediaService::event(QEvent *) bool cbs_event_1217_0(QEvent *arg1) { @@ -384,24 +377,6 @@ static void _set_callback_cbs_customEvent_1217_0 (void *cls, const gsi::Callback } -// emitter void QMediaService::destroyed(QObject *) - -static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - ((QMediaService_Adaptor *)cls)->emitter_QMediaService_destroyed_1302 (arg1); -} - - // void QMediaService::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -621,7 +596,6 @@ static gsi::Methods methods_QMediaService_Adaptor () { methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QMediaService::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); - methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QMediaService::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QMediaService::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("event", "@brief Virtual method bool QMediaService::event(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0); diff --git a/src/gsiqt/qt5/QtMultimedia/gsiDeclQMediaServiceProviderPlugin.cc b/src/gsiqt/qt5/QtMultimedia/gsiDeclQMediaServiceProviderPlugin.cc index d5b29d391..776c480e0 100644 --- a/src/gsiqt/qt5/QtMultimedia/gsiDeclQMediaServiceProviderPlugin.cc +++ b/src/gsiqt/qt5/QtMultimedia/gsiDeclQMediaServiceProviderPlugin.cc @@ -198,7 +198,6 @@ static gsi::Methods methods_QMediaServiceProviderPlugin () { methods += new qt_gsi::GenericStaticMethod ("staticMetaObject", "@brief Obtains the static MetaObject for this class.", &_init_smo, &_call_smo); methods += new qt_gsi::GenericMethod ("qt_create", "@brief Method QMediaService *QMediaServiceProviderPlugin::create(const QString &key)\n", false, &_init_f_create_2025u1, &_call_f_create_2025u1); methods += new qt_gsi::GenericMethod ("release", "@brief Method void QMediaServiceProviderPlugin::release(QMediaService *service)\nThis is a reimplementation of QMediaServiceProviderFactoryInterface::release", false, &_init_f_release_1904, &_call_f_release_1904); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QMediaServiceProviderPlugin::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QMediaServiceProviderPlugin::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QMediaServiceProviderPlugin::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); methods += new qt_gsi::GenericMethod ("asQObject", "@brief Delivers the base class interface QObject of QMediaServiceProviderPlugin\nClass QMediaServiceProviderPlugin is derived from multiple base classes. This method delivers the QObject base class aspect.", false, &_init_f_QMediaServiceProviderPlugin_as_QObject, &_call_f_QMediaServiceProviderPlugin_as_QObject); @@ -267,12 +266,6 @@ public: } } - // [emitter impl] void QMediaServiceProviderPlugin::destroyed(QObject *) - void emitter_QMediaServiceProviderPlugin_destroyed_1302(QObject *arg1) - { - emit QMediaServiceProviderPlugin::destroyed(arg1); - } - // [adaptor impl] bool QMediaServiceProviderPlugin::event(QEvent *) bool cbs_event_1217_0(QEvent *arg1) { @@ -476,24 +469,6 @@ static void _set_callback_cbs_customEvent_1217_0 (void *cls, const gsi::Callback } -// emitter void QMediaServiceProviderPlugin::destroyed(QObject *) - -static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - ((QMediaServiceProviderPlugin_Adaptor *)cls)->emitter_QMediaServiceProviderPlugin_destroyed_1302 (arg1); -} - - // void QMediaServiceProviderPlugin::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -693,7 +668,6 @@ static gsi::Methods methods_QMediaServiceProviderPlugin_Adaptor () { methods += new qt_gsi::GenericMethod ("qt_create", "@hide", false, &_init_cbs_create_2025u1_0, &_call_cbs_create_2025u1_0, &_set_callback_cbs_create_2025u1_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QMediaServiceProviderPlugin::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); - methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QMediaServiceProviderPlugin::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QMediaServiceProviderPlugin::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("event", "@brief Virtual method bool QMediaServiceProviderPlugin::event(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0); diff --git a/src/gsiqt/qt5/QtMultimedia/gsiDeclQMediaStreamsControl.cc b/src/gsiqt/qt5/QtMultimedia/gsiDeclQMediaStreamsControl.cc index 37a546cfc..7750da01c 100644 --- a/src/gsiqt/qt5/QtMultimedia/gsiDeclQMediaStreamsControl.cc +++ b/src/gsiqt/qt5/QtMultimedia/gsiDeclQMediaStreamsControl.cc @@ -55,6 +55,22 @@ static void _call_smo (const qt_gsi::GenericStaticMethod *, gsi::SerialArgs &, g } +// void QMediaStreamsControl::activeStreamsChanged() + + +static void _init_f_activeStreamsChanged_0 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_f_activeStreamsChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaStreamsControl *)cls)->activeStreamsChanged (); +} + + // bool QMediaStreamsControl::isActive(int streamNumber) @@ -153,6 +169,22 @@ static void _call_f_streamType_767 (const qt_gsi::GenericMethod * /*decl*/, void } +// void QMediaStreamsControl::streamsChanged() + + +static void _init_f_streamsChanged_0 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_f_streamsChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaStreamsControl *)cls)->streamsChanged (); +} + + // static QString QMediaStreamsControl::tr(const char *s, const char *c, int n) @@ -209,14 +241,13 @@ namespace gsi static gsi::Methods methods_QMediaStreamsControl () { gsi::Methods methods; methods += new qt_gsi::GenericStaticMethod ("staticMetaObject", "@brief Obtains the static MetaObject for this class.", &_init_smo, &_call_smo); + methods += new qt_gsi::GenericMethod ("activeStreamsChanged", "@brief Method void QMediaStreamsControl::activeStreamsChanged()\n", false, &_init_f_activeStreamsChanged_0, &_call_f_activeStreamsChanged_0); methods += new qt_gsi::GenericMethod ("isActive?", "@brief Method bool QMediaStreamsControl::isActive(int streamNumber)\n", false, &_init_f_isActive_767, &_call_f_isActive_767); methods += new qt_gsi::GenericMethod ("metaData", "@brief Method QVariant QMediaStreamsControl::metaData(int streamNumber, const QString &key)\n", false, &_init_f_metaData_2684, &_call_f_metaData_2684); methods += new qt_gsi::GenericMethod ("setActive", "@brief Method void QMediaStreamsControl::setActive(int streamNumber, bool state)\n", false, &_init_f_setActive_1523, &_call_f_setActive_1523); methods += new qt_gsi::GenericMethod ("streamCount", "@brief Method int QMediaStreamsControl::streamCount()\n", false, &_init_f_streamCount_0, &_call_f_streamCount_0); methods += new qt_gsi::GenericMethod ("streamType", "@brief Method QMediaStreamsControl::StreamType QMediaStreamsControl::streamType(int streamNumber)\n", false, &_init_f_streamType_767, &_call_f_streamType_767); - methods += gsi::qt_signal ("activeStreamsChanged()", "activeStreamsChanged", "@brief Signal declaration for QMediaStreamsControl::activeStreamsChanged()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QMediaStreamsControl::destroyed(QObject *)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("streamsChanged()", "streamsChanged", "@brief Signal declaration for QMediaStreamsControl::streamsChanged()\nYou can bind a procedure to this signal."); + methods += new qt_gsi::GenericMethod ("streamsChanged", "@brief Method void QMediaStreamsControl::streamsChanged()\n", false, &_init_f_streamsChanged_0, &_call_f_streamsChanged_0); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QMediaStreamsControl::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QMediaStreamsControl::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -265,18 +296,6 @@ public: return QMediaStreamsControl::senderSignalIndex(); } - // [emitter impl] void QMediaStreamsControl::activeStreamsChanged() - void emitter_QMediaStreamsControl_activeStreamsChanged_0() - { - emit QMediaStreamsControl::activeStreamsChanged(); - } - - // [emitter impl] void QMediaStreamsControl::destroyed(QObject *) - void emitter_QMediaStreamsControl_destroyed_1302(QObject *arg1) - { - emit QMediaStreamsControl::destroyed(arg1); - } - // [adaptor impl] bool QMediaStreamsControl::event(QEvent *) bool cbs_event_1217_0(QEvent *arg1) { @@ -388,12 +407,6 @@ public: } } - // [emitter impl] void QMediaStreamsControl::streamsChanged() - void emitter_QMediaStreamsControl_streamsChanged_0() - { - emit QMediaStreamsControl::streamsChanged(); - } - // [adaptor impl] void QMediaStreamsControl::childEvent(QChildEvent *) void cbs_childEvent_1701_0(QChildEvent *arg1) { @@ -483,20 +496,6 @@ static void _call_ctor_QMediaStreamsControl_Adaptor_0 (const qt_gsi::GenericStat } -// emitter void QMediaStreamsControl::activeStreamsChanged() - -static void _init_emitter_activeStreamsChanged_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_activeStreamsChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QMediaStreamsControl_Adaptor *)cls)->emitter_QMediaStreamsControl_activeStreamsChanged_0 (); -} - - // void QMediaStreamsControl::childEvent(QChildEvent *) static void _init_cbs_childEvent_1701_0 (qt_gsi::GenericMethod *decl) @@ -545,24 +544,6 @@ static void _set_callback_cbs_customEvent_1217_0 (void *cls, const gsi::Callback } -// emitter void QMediaStreamsControl::destroyed(QObject *) - -static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - ((QMediaStreamsControl_Adaptor *)cls)->emitter_QMediaStreamsControl_destroyed_1302 (arg1); -} - - // void QMediaStreamsControl::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -818,20 +799,6 @@ static void _set_callback_cbs_streamType_767_0 (void *cls, const gsi::Callback & } -// emitter void QMediaStreamsControl::streamsChanged() - -static void _init_emitter_streamsChanged_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_streamsChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QMediaStreamsControl_Adaptor *)cls)->emitter_QMediaStreamsControl_streamsChanged_0 (); -} - - // void QMediaStreamsControl::timerEvent(QTimerEvent *) static void _init_cbs_timerEvent_1730_0 (qt_gsi::GenericMethod *decl) @@ -864,12 +831,10 @@ gsi::Class &qtdecl_QMediaStreamsControl (); static gsi::Methods methods_QMediaStreamsControl_Adaptor () { gsi::Methods methods; methods += new qt_gsi::GenericStaticMethod ("new", "@brief Constructor QMediaStreamsControl::QMediaStreamsControl()\nThis method creates an object of class QMediaStreamsControl.", &_init_ctor_QMediaStreamsControl_Adaptor_0, &_call_ctor_QMediaStreamsControl_Adaptor_0); - methods += new qt_gsi::GenericMethod ("emit_activeStreamsChanged", "@brief Emitter for signal void QMediaStreamsControl::activeStreamsChanged()\nCall this method to emit this signal.", false, &_init_emitter_activeStreamsChanged_0, &_call_emitter_activeStreamsChanged_0); methods += new qt_gsi::GenericMethod ("*childEvent", "@brief Virtual method void QMediaStreamsControl::childEvent(QChildEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QMediaStreamsControl::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); - methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QMediaStreamsControl::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QMediaStreamsControl::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("event", "@brief Virtual method bool QMediaStreamsControl::event(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0); @@ -890,7 +855,6 @@ static gsi::Methods methods_QMediaStreamsControl_Adaptor () { methods += new qt_gsi::GenericMethod ("streamCount", "@hide", false, &_init_cbs_streamCount_0_0, &_call_cbs_streamCount_0_0, &_set_callback_cbs_streamCount_0_0); methods += new qt_gsi::GenericMethod ("streamType", "@brief Virtual method QMediaStreamsControl::StreamType QMediaStreamsControl::streamType(int streamNumber)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_streamType_767_0, &_call_cbs_streamType_767_0); methods += new qt_gsi::GenericMethod ("streamType", "@hide", false, &_init_cbs_streamType_767_0, &_call_cbs_streamType_767_0, &_set_callback_cbs_streamType_767_0); - methods += new qt_gsi::GenericMethod ("emit_streamsChanged", "@brief Emitter for signal void QMediaStreamsControl::streamsChanged()\nCall this method to emit this signal.", false, &_init_emitter_streamsChanged_0, &_call_emitter_streamsChanged_0); methods += new qt_gsi::GenericMethod ("*timerEvent", "@brief Virtual method void QMediaStreamsControl::timerEvent(QTimerEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_timerEvent_1730_0, &_call_cbs_timerEvent_1730_0); methods += new qt_gsi::GenericMethod ("*timerEvent", "@hide", false, &_init_cbs_timerEvent_1730_0, &_call_cbs_timerEvent_1730_0, &_set_callback_cbs_timerEvent_1730_0); return methods; diff --git a/src/gsiqt/qt5/QtMultimedia/gsiDeclQMediaVideoProbeControl.cc b/src/gsiqt/qt5/QtMultimedia/gsiDeclQMediaVideoProbeControl.cc index ef960580c..2fdb42d02 100644 --- a/src/gsiqt/qt5/QtMultimedia/gsiDeclQMediaVideoProbeControl.cc +++ b/src/gsiqt/qt5/QtMultimedia/gsiDeclQMediaVideoProbeControl.cc @@ -56,6 +56,42 @@ static void _call_smo (const qt_gsi::GenericStaticMethod *, gsi::SerialArgs &, g } +// void QMediaVideoProbeControl::flush() + + +static void _init_f_flush_0 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_f_flush_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaVideoProbeControl *)cls)->flush (); +} + + +// void QMediaVideoProbeControl::videoFrameProbed(const QVideoFrame &frame) + + +static void _init_f_videoFrameProbed_2388 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("frame"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_videoFrameProbed_2388 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QVideoFrame &arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMediaVideoProbeControl *)cls)->videoFrameProbed (arg1); +} + + // static QString QMediaVideoProbeControl::tr(const char *s, const char *c, int n) @@ -112,9 +148,8 @@ namespace gsi static gsi::Methods methods_QMediaVideoProbeControl () { gsi::Methods methods; methods += new qt_gsi::GenericStaticMethod ("staticMetaObject", "@brief Obtains the static MetaObject for this class.", &_init_smo, &_call_smo); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QMediaVideoProbeControl::destroyed(QObject *)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("flush()", "flush", "@brief Signal declaration for QMediaVideoProbeControl::flush()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("videoFrameProbed(const QVideoFrame &)", "videoFrameProbed", gsi::arg("frame"), "@brief Signal declaration for QMediaVideoProbeControl::videoFrameProbed(const QVideoFrame &frame)\nYou can bind a procedure to this signal."); + methods += new qt_gsi::GenericMethod ("flush", "@brief Method void QMediaVideoProbeControl::flush()\n", false, &_init_f_flush_0, &_call_f_flush_0); + methods += new qt_gsi::GenericMethod ("videoFrameProbed", "@brief Method void QMediaVideoProbeControl::videoFrameProbed(const QVideoFrame &frame)\n", false, &_init_f_videoFrameProbed_2388, &_call_f_videoFrameProbed_2388); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QMediaVideoProbeControl::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QMediaVideoProbeControl::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -157,12 +192,6 @@ public: return QMediaVideoProbeControl::senderSignalIndex(); } - // [emitter impl] void QMediaVideoProbeControl::destroyed(QObject *) - void emitter_QMediaVideoProbeControl_destroyed_1302(QObject *arg1) - { - emit QMediaVideoProbeControl::destroyed(arg1); - } - // [adaptor impl] bool QMediaVideoProbeControl::event(QEvent *) bool cbs_event_1217_0(QEvent *arg1) { @@ -193,18 +222,6 @@ public: } } - // [emitter impl] void QMediaVideoProbeControl::flush() - void emitter_QMediaVideoProbeControl_flush_0() - { - emit QMediaVideoProbeControl::flush(); - } - - // [emitter impl] void QMediaVideoProbeControl::videoFrameProbed(const QVideoFrame &frame) - void emitter_QMediaVideoProbeControl_videoFrameProbed_2388(const QVideoFrame &frame) - { - emit QMediaVideoProbeControl::videoFrameProbed(frame); - } - // [adaptor impl] void QMediaVideoProbeControl::childEvent(QChildEvent *) void cbs_childEvent_1701_0(QChildEvent *arg1) { @@ -323,24 +340,6 @@ static void _set_callback_cbs_customEvent_1217_0 (void *cls, const gsi::Callback } -// emitter void QMediaVideoProbeControl::destroyed(QObject *) - -static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - ((QMediaVideoProbeControl_Adaptor *)cls)->emitter_QMediaVideoProbeControl_destroyed_1302 (arg1); -} - - // void QMediaVideoProbeControl::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -414,20 +413,6 @@ static void _set_callback_cbs_eventFilter_2411_0 (void *cls, const gsi::Callback } -// emitter void QMediaVideoProbeControl::flush() - -static void _init_emitter_flush_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_flush_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QMediaVideoProbeControl_Adaptor *)cls)->emitter_QMediaVideoProbeControl_flush_0 (); -} - - // exposed bool QMediaVideoProbeControl::isSignalConnected(const QMetaMethod &signal) static void _init_fp_isSignalConnected_c2394 (qt_gsi::GenericMethod *decl) @@ -516,24 +501,6 @@ static void _set_callback_cbs_timerEvent_1730_0 (void *cls, const gsi::Callback } -// emitter void QMediaVideoProbeControl::videoFrameProbed(const QVideoFrame &frame) - -static void _init_emitter_videoFrameProbed_2388 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("frame"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_videoFrameProbed_2388 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const QVideoFrame &arg1 = gsi::arg_reader() (args, heap); - ((QMediaVideoProbeControl_Adaptor *)cls)->emitter_QMediaVideoProbeControl_videoFrameProbed_2388 (arg1); -} - - namespace gsi { @@ -545,21 +512,18 @@ static gsi::Methods methods_QMediaVideoProbeControl_Adaptor () { methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QMediaVideoProbeControl::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); - methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QMediaVideoProbeControl::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QMediaVideoProbeControl::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("event", "@brief Virtual method bool QMediaVideoProbeControl::event(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0); methods += new qt_gsi::GenericMethod ("event", "@hide", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0, &_set_callback_cbs_event_1217_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QMediaVideoProbeControl::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); - methods += new qt_gsi::GenericMethod ("emit_flush", "@brief Emitter for signal void QMediaVideoProbeControl::flush()\nCall this method to emit this signal.", false, &_init_emitter_flush_0, &_call_emitter_flush_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QMediaVideoProbeControl::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QMediaVideoProbeControl::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QMediaVideoProbeControl::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QMediaVideoProbeControl::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); methods += new qt_gsi::GenericMethod ("*timerEvent", "@brief Virtual method void QMediaVideoProbeControl::timerEvent(QTimerEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_timerEvent_1730_0, &_call_cbs_timerEvent_1730_0); methods += new qt_gsi::GenericMethod ("*timerEvent", "@hide", false, &_init_cbs_timerEvent_1730_0, &_call_cbs_timerEvent_1730_0, &_set_callback_cbs_timerEvent_1730_0); - methods += new qt_gsi::GenericMethod ("emit_videoFrameProbed", "@brief Emitter for signal void QMediaVideoProbeControl::videoFrameProbed(const QVideoFrame &frame)\nCall this method to emit this signal.", false, &_init_emitter_videoFrameProbed_2388, &_call_emitter_videoFrameProbed_2388); return methods; } diff --git a/src/gsiqt/qt5/QtMultimedia/gsiDeclQMetaDataReaderControl.cc b/src/gsiqt/qt5/QtMultimedia/gsiDeclQMetaDataReaderControl.cc index 2486e6a83..3b5ee565a 100644 --- a/src/gsiqt/qt5/QtMultimedia/gsiDeclQMetaDataReaderControl.cc +++ b/src/gsiqt/qt5/QtMultimedia/gsiDeclQMetaDataReaderControl.cc @@ -104,6 +104,65 @@ static void _call_f_metaData_c2025 (const qt_gsi::GenericMethod * /*decl*/, void } +// void QMetaDataReaderControl::metaDataAvailableChanged(bool available) + + +static void _init_f_metaDataAvailableChanged_864 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("available"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_metaDataAvailableChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + bool arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMetaDataReaderControl *)cls)->metaDataAvailableChanged (arg1); +} + + +// void QMetaDataReaderControl::metaDataChanged() + + +static void _init_f_metaDataChanged_0 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_f_metaDataChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMetaDataReaderControl *)cls)->metaDataChanged (); +} + + +// void QMetaDataReaderControl::metaDataChanged(const QString &key, const QVariant &value) + + +static void _init_f_metaDataChanged_4036 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("key"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("value"); + decl->add_arg (argspec_1); + decl->set_return (); +} + +static void _call_f_metaDataChanged_4036 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + const QVariant &arg2 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMetaDataReaderControl *)cls)->metaDataChanged (arg1, arg2); +} + + // static QString QMetaDataReaderControl::tr(const char *s, const char *c, int n) @@ -163,10 +222,9 @@ static gsi::Methods methods_QMetaDataReaderControl () { methods += new qt_gsi::GenericMethod ("availableMetaData", "@brief Method QStringList QMetaDataReaderControl::availableMetaData()\n", true, &_init_f_availableMetaData_c0, &_call_f_availableMetaData_c0); methods += new qt_gsi::GenericMethod ("isMetaDataAvailable?", "@brief Method bool QMetaDataReaderControl::isMetaDataAvailable()\n", true, &_init_f_isMetaDataAvailable_c0, &_call_f_isMetaDataAvailable_c0); methods += new qt_gsi::GenericMethod ("metaData", "@brief Method QVariant QMetaDataReaderControl::metaData(const QString &key)\n", true, &_init_f_metaData_c2025, &_call_f_metaData_c2025); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QMetaDataReaderControl::destroyed(QObject *)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("metaDataAvailableChanged(bool)", "metaDataAvailableChanged", gsi::arg("available"), "@brief Signal declaration for QMetaDataReaderControl::metaDataAvailableChanged(bool available)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("metaDataChanged()", "metaDataChanged", "@brief Signal declaration for QMetaDataReaderControl::metaDataChanged()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("metaDataChanged(const QString &, const QVariant &)", "metaDataChanged_kv", gsi::arg("key"), gsi::arg("value"), "@brief Signal declaration for QMetaDataReaderControl::metaDataChanged(const QString &key, const QVariant &value)\nYou can bind a procedure to this signal."); + methods += new qt_gsi::GenericMethod ("metaDataAvailableChanged", "@brief Method void QMetaDataReaderControl::metaDataAvailableChanged(bool available)\n", false, &_init_f_metaDataAvailableChanged_864, &_call_f_metaDataAvailableChanged_864); + methods += new qt_gsi::GenericMethod ("metaDataChanged", "@brief Method void QMetaDataReaderControl::metaDataChanged()\n", false, &_init_f_metaDataChanged_0, &_call_f_metaDataChanged_0); + methods += new qt_gsi::GenericMethod ("metaDataChanged_kv", "@brief Method void QMetaDataReaderControl::metaDataChanged(const QString &key, const QVariant &value)\n", false, &_init_f_metaDataChanged_4036, &_call_f_metaDataChanged_4036); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QMetaDataReaderControl::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QMetaDataReaderControl::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -230,12 +288,6 @@ public: } } - // [emitter impl] void QMetaDataReaderControl::destroyed(QObject *) - void emitter_QMetaDataReaderControl_destroyed_1302(QObject *arg1) - { - emit QMetaDataReaderControl::destroyed(arg1); - } - // [adaptor impl] bool QMetaDataReaderControl::event(QEvent *) bool cbs_event_1217_0(QEvent *arg1) { @@ -297,24 +349,6 @@ public: } } - // [emitter impl] void QMetaDataReaderControl::metaDataAvailableChanged(bool available) - void emitter_QMetaDataReaderControl_metaDataAvailableChanged_864(bool available) - { - emit QMetaDataReaderControl::metaDataAvailableChanged(available); - } - - // [emitter impl] void QMetaDataReaderControl::metaDataChanged() - void emitter_QMetaDataReaderControl_metaDataChanged_0() - { - emit QMetaDataReaderControl::metaDataChanged(); - } - - // [emitter impl] void QMetaDataReaderControl::metaDataChanged(const QString &key, const QVariant &value) - void emitter_QMetaDataReaderControl_metaDataChanged_4036(const QString &key, const QVariant &value) - { - emit QMetaDataReaderControl::metaDataChanged(key, value); - } - // [adaptor impl] void QMetaDataReaderControl::childEvent(QChildEvent *) void cbs_childEvent_1701_0(QChildEvent *arg1) { @@ -469,24 +503,6 @@ static void _set_callback_cbs_customEvent_1217_0 (void *cls, const gsi::Callback } -// emitter void QMetaDataReaderControl::destroyed(QObject *) - -static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - ((QMetaDataReaderControl_Adaptor *)cls)->emitter_QMetaDataReaderControl_destroyed_1302 (arg1); -} - - // void QMetaDataReaderControl::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -620,59 +636,6 @@ static void _set_callback_cbs_metaData_c2025_0 (void *cls, const gsi::Callback & } -// emitter void QMetaDataReaderControl::metaDataAvailableChanged(bool available) - -static void _init_emitter_metaDataAvailableChanged_864 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("available"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_metaDataAvailableChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - bool arg1 = gsi::arg_reader() (args, heap); - ((QMetaDataReaderControl_Adaptor *)cls)->emitter_QMetaDataReaderControl_metaDataAvailableChanged_864 (arg1); -} - - -// emitter void QMetaDataReaderControl::metaDataChanged() - -static void _init_emitter_metaDataChanged_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_metaDataChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QMetaDataReaderControl_Adaptor *)cls)->emitter_QMetaDataReaderControl_metaDataChanged_0 (); -} - - -// emitter void QMetaDataReaderControl::metaDataChanged(const QString &key, const QVariant &value) - -static void _init_emitter_metaDataChanged_4036 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("key"); - decl->add_arg (argspec_0); - static gsi::ArgSpecBase argspec_1 ("value"); - decl->add_arg (argspec_1); - decl->set_return (); -} - -static void _call_emitter_metaDataChanged_4036 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const QString &arg1 = gsi::arg_reader() (args, heap); - const QVariant &arg2 = gsi::arg_reader() (args, heap); - ((QMetaDataReaderControl_Adaptor *)cls)->emitter_QMetaDataReaderControl_metaDataChanged_4036 (arg1, arg2); -} - - // exposed int QMetaDataReaderControl::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -757,7 +720,6 @@ static gsi::Methods methods_QMetaDataReaderControl_Adaptor () { methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QMetaDataReaderControl::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); - methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QMetaDataReaderControl::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QMetaDataReaderControl::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("event", "@brief Virtual method bool QMetaDataReaderControl::event(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0); @@ -769,9 +731,6 @@ static gsi::Methods methods_QMetaDataReaderControl_Adaptor () { methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QMetaDataReaderControl::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); methods += new qt_gsi::GenericMethod ("metaData", "@brief Virtual method QVariant QMetaDataReaderControl::metaData(const QString &key)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_metaData_c2025_0, &_call_cbs_metaData_c2025_0); methods += new qt_gsi::GenericMethod ("metaData", "@hide", true, &_init_cbs_metaData_c2025_0, &_call_cbs_metaData_c2025_0, &_set_callback_cbs_metaData_c2025_0); - methods += new qt_gsi::GenericMethod ("emit_metaDataAvailableChanged", "@brief Emitter for signal void QMetaDataReaderControl::metaDataAvailableChanged(bool available)\nCall this method to emit this signal.", false, &_init_emitter_metaDataAvailableChanged_864, &_call_emitter_metaDataAvailableChanged_864); - methods += new qt_gsi::GenericMethod ("emit_metaDataChanged", "@brief Emitter for signal void QMetaDataReaderControl::metaDataChanged()\nCall this method to emit this signal.", false, &_init_emitter_metaDataChanged_0, &_call_emitter_metaDataChanged_0); - methods += new qt_gsi::GenericMethod ("emit_metaDataChanged_kv", "@brief Emitter for signal void QMetaDataReaderControl::metaDataChanged(const QString &key, const QVariant &value)\nCall this method to emit this signal.", false, &_init_emitter_metaDataChanged_4036, &_call_emitter_metaDataChanged_4036); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QMetaDataReaderControl::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QMetaDataReaderControl::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QMetaDataReaderControl::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); diff --git a/src/gsiqt/qt5/QtMultimedia/gsiDeclQMetaDataWriterControl.cc b/src/gsiqt/qt5/QtMultimedia/gsiDeclQMetaDataWriterControl.cc index 8c3e8e5e7..e9a5b74e7 100644 --- a/src/gsiqt/qt5/QtMultimedia/gsiDeclQMetaDataWriterControl.cc +++ b/src/gsiqt/qt5/QtMultimedia/gsiDeclQMetaDataWriterControl.cc @@ -119,6 +119,65 @@ static void _call_f_metaData_c2025 (const qt_gsi::GenericMethod * /*decl*/, void } +// void QMetaDataWriterControl::metaDataAvailableChanged(bool available) + + +static void _init_f_metaDataAvailableChanged_864 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("available"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_metaDataAvailableChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + bool arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMetaDataWriterControl *)cls)->metaDataAvailableChanged (arg1); +} + + +// void QMetaDataWriterControl::metaDataChanged() + + +static void _init_f_metaDataChanged_0 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_f_metaDataChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMetaDataWriterControl *)cls)->metaDataChanged (); +} + + +// void QMetaDataWriterControl::metaDataChanged(const QString &key, const QVariant &value) + + +static void _init_f_metaDataChanged_4036 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("key"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("value"); + decl->add_arg (argspec_1); + decl->set_return (); +} + +static void _call_f_metaDataChanged_4036 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + const QVariant &arg2 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMetaDataWriterControl *)cls)->metaDataChanged (arg1, arg2); +} + + // void QMetaDataWriterControl::setMetaData(const QString &key, const QVariant &value) @@ -142,6 +201,26 @@ static void _call_f_setMetaData_4036 (const qt_gsi::GenericMethod * /*decl*/, vo } +// void QMetaDataWriterControl::writableChanged(bool writable) + + +static void _init_f_writableChanged_864 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("writable"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_writableChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + bool arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QMetaDataWriterControl *)cls)->writableChanged (arg1); +} + + // static QString QMetaDataWriterControl::tr(const char *s, const char *c, int n) @@ -202,12 +281,11 @@ static gsi::Methods methods_QMetaDataWriterControl () { methods += new qt_gsi::GenericMethod ("isMetaDataAvailable?", "@brief Method bool QMetaDataWriterControl::isMetaDataAvailable()\n", true, &_init_f_isMetaDataAvailable_c0, &_call_f_isMetaDataAvailable_c0); methods += new qt_gsi::GenericMethod ("isWritable?", "@brief Method bool QMetaDataWriterControl::isWritable()\n", true, &_init_f_isWritable_c0, &_call_f_isWritable_c0); methods += new qt_gsi::GenericMethod ("metaData", "@brief Method QVariant QMetaDataWriterControl::metaData(const QString &key)\n", true, &_init_f_metaData_c2025, &_call_f_metaData_c2025); + methods += new qt_gsi::GenericMethod ("metaDataAvailableChanged", "@brief Method void QMetaDataWriterControl::metaDataAvailableChanged(bool available)\n", false, &_init_f_metaDataAvailableChanged_864, &_call_f_metaDataAvailableChanged_864); + methods += new qt_gsi::GenericMethod ("metaDataChanged", "@brief Method void QMetaDataWriterControl::metaDataChanged()\n", false, &_init_f_metaDataChanged_0, &_call_f_metaDataChanged_0); + methods += new qt_gsi::GenericMethod ("metaDataChanged_kv", "@brief Method void QMetaDataWriterControl::metaDataChanged(const QString &key, const QVariant &value)\n", false, &_init_f_metaDataChanged_4036, &_call_f_metaDataChanged_4036); methods += new qt_gsi::GenericMethod ("setMetaData", "@brief Method void QMetaDataWriterControl::setMetaData(const QString &key, const QVariant &value)\n", false, &_init_f_setMetaData_4036, &_call_f_setMetaData_4036); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QMetaDataWriterControl::destroyed(QObject *)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("metaDataAvailableChanged(bool)", "metaDataAvailableChanged", gsi::arg("available"), "@brief Signal declaration for QMetaDataWriterControl::metaDataAvailableChanged(bool available)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("metaDataChanged()", "metaDataChanged", "@brief Signal declaration for QMetaDataWriterControl::metaDataChanged()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("metaDataChanged(const QString &, const QVariant &)", "metaDataChanged_kv", gsi::arg("key"), gsi::arg("value"), "@brief Signal declaration for QMetaDataWriterControl::metaDataChanged(const QString &key, const QVariant &value)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("writableChanged(bool)", "writableChanged", gsi::arg("writable"), "@brief Signal declaration for QMetaDataWriterControl::writableChanged(bool writable)\nYou can bind a procedure to this signal."); + methods += new qt_gsi::GenericMethod ("writableChanged", "@brief Method void QMetaDataWriterControl::writableChanged(bool writable)\n", false, &_init_f_writableChanged_864, &_call_f_writableChanged_864); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QMetaDataWriterControl::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QMetaDataWriterControl::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -271,12 +349,6 @@ public: } } - // [emitter impl] void QMetaDataWriterControl::destroyed(QObject *) - void emitter_QMetaDataWriterControl_destroyed_1302(QObject *arg1) - { - emit QMetaDataWriterControl::destroyed(arg1); - } - // [adaptor impl] bool QMetaDataWriterControl::event(QEvent *) bool cbs_event_1217_0(QEvent *arg1) { @@ -353,24 +425,6 @@ public: } } - // [emitter impl] void QMetaDataWriterControl::metaDataAvailableChanged(bool available) - void emitter_QMetaDataWriterControl_metaDataAvailableChanged_864(bool available) - { - emit QMetaDataWriterControl::metaDataAvailableChanged(available); - } - - // [emitter impl] void QMetaDataWriterControl::metaDataChanged() - void emitter_QMetaDataWriterControl_metaDataChanged_0() - { - emit QMetaDataWriterControl::metaDataChanged(); - } - - // [emitter impl] void QMetaDataWriterControl::metaDataChanged(const QString &key, const QVariant &value) - void emitter_QMetaDataWriterControl_metaDataChanged_4036(const QString &key, const QVariant &value) - { - emit QMetaDataWriterControl::metaDataChanged(key, value); - } - // [adaptor impl] void QMetaDataWriterControl::setMetaData(const QString &key, const QVariant &value) void cbs_setMetaData_4036_0(const QString &key, const QVariant &value) { @@ -388,12 +442,6 @@ public: } } - // [emitter impl] void QMetaDataWriterControl::writableChanged(bool writable) - void emitter_QMetaDataWriterControl_writableChanged_864(bool writable) - { - emit QMetaDataWriterControl::writableChanged(writable); - } - // [adaptor impl] void QMetaDataWriterControl::childEvent(QChildEvent *) void cbs_childEvent_1701_0(QChildEvent *arg1) { @@ -550,24 +598,6 @@ static void _set_callback_cbs_customEvent_1217_0 (void *cls, const gsi::Callback } -// emitter void QMetaDataWriterControl::destroyed(QObject *) - -static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - ((QMetaDataWriterControl_Adaptor *)cls)->emitter_QMetaDataWriterControl_destroyed_1302 (arg1); -} - - // void QMetaDataWriterControl::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -720,59 +750,6 @@ static void _set_callback_cbs_metaData_c2025_0 (void *cls, const gsi::Callback & } -// emitter void QMetaDataWriterControl::metaDataAvailableChanged(bool available) - -static void _init_emitter_metaDataAvailableChanged_864 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("available"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_metaDataAvailableChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - bool arg1 = gsi::arg_reader() (args, heap); - ((QMetaDataWriterControl_Adaptor *)cls)->emitter_QMetaDataWriterControl_metaDataAvailableChanged_864 (arg1); -} - - -// emitter void QMetaDataWriterControl::metaDataChanged() - -static void _init_emitter_metaDataChanged_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_metaDataChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QMetaDataWriterControl_Adaptor *)cls)->emitter_QMetaDataWriterControl_metaDataChanged_0 (); -} - - -// emitter void QMetaDataWriterControl::metaDataChanged(const QString &key, const QVariant &value) - -static void _init_emitter_metaDataChanged_4036 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("key"); - decl->add_arg (argspec_0); - static gsi::ArgSpecBase argspec_1 ("value"); - decl->add_arg (argspec_1); - decl->set_return (); -} - -static void _call_emitter_metaDataChanged_4036 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const QString &arg1 = gsi::arg_reader() (args, heap); - const QVariant &arg2 = gsi::arg_reader() (args, heap); - ((QMetaDataWriterControl_Adaptor *)cls)->emitter_QMetaDataWriterControl_metaDataChanged_4036 (arg1, arg2); -} - - // exposed int QMetaDataWriterControl::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -870,24 +847,6 @@ static void _set_callback_cbs_timerEvent_1730_0 (void *cls, const gsi::Callback } -// emitter void QMetaDataWriterControl::writableChanged(bool writable) - -static void _init_emitter_writableChanged_864 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("writable"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_writableChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - bool arg1 = gsi::arg_reader() (args, heap); - ((QMetaDataWriterControl_Adaptor *)cls)->emitter_QMetaDataWriterControl_writableChanged_864 (arg1); -} - - namespace gsi { @@ -902,7 +861,6 @@ static gsi::Methods methods_QMetaDataWriterControl_Adaptor () { methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QMetaDataWriterControl::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); - methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QMetaDataWriterControl::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QMetaDataWriterControl::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("event", "@brief Virtual method bool QMetaDataWriterControl::event(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0); @@ -916,9 +874,6 @@ static gsi::Methods methods_QMetaDataWriterControl_Adaptor () { methods += new qt_gsi::GenericMethod ("isWritable", "@hide", true, &_init_cbs_isWritable_c0_0, &_call_cbs_isWritable_c0_0, &_set_callback_cbs_isWritable_c0_0); methods += new qt_gsi::GenericMethod ("metaData", "@brief Virtual method QVariant QMetaDataWriterControl::metaData(const QString &key)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_metaData_c2025_0, &_call_cbs_metaData_c2025_0); methods += new qt_gsi::GenericMethod ("metaData", "@hide", true, &_init_cbs_metaData_c2025_0, &_call_cbs_metaData_c2025_0, &_set_callback_cbs_metaData_c2025_0); - methods += new qt_gsi::GenericMethod ("emit_metaDataAvailableChanged", "@brief Emitter for signal void QMetaDataWriterControl::metaDataAvailableChanged(bool available)\nCall this method to emit this signal.", false, &_init_emitter_metaDataAvailableChanged_864, &_call_emitter_metaDataAvailableChanged_864); - methods += new qt_gsi::GenericMethod ("emit_metaDataChanged", "@brief Emitter for signal void QMetaDataWriterControl::metaDataChanged()\nCall this method to emit this signal.", false, &_init_emitter_metaDataChanged_0, &_call_emitter_metaDataChanged_0); - methods += new qt_gsi::GenericMethod ("emit_metaDataChanged_kv", "@brief Emitter for signal void QMetaDataWriterControl::metaDataChanged(const QString &key, const QVariant &value)\nCall this method to emit this signal.", false, &_init_emitter_metaDataChanged_4036, &_call_emitter_metaDataChanged_4036); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QMetaDataWriterControl::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QMetaDataWriterControl::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QMetaDataWriterControl::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); @@ -926,7 +881,6 @@ static gsi::Methods methods_QMetaDataWriterControl_Adaptor () { methods += new qt_gsi::GenericMethod ("setMetaData", "@hide", false, &_init_cbs_setMetaData_4036_0, &_call_cbs_setMetaData_4036_0, &_set_callback_cbs_setMetaData_4036_0); methods += new qt_gsi::GenericMethod ("*timerEvent", "@brief Virtual method void QMetaDataWriterControl::timerEvent(QTimerEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_timerEvent_1730_0, &_call_cbs_timerEvent_1730_0); methods += new qt_gsi::GenericMethod ("*timerEvent", "@hide", false, &_init_cbs_timerEvent_1730_0, &_call_cbs_timerEvent_1730_0, &_set_callback_cbs_timerEvent_1730_0); - methods += new qt_gsi::GenericMethod ("emit_writableChanged", "@brief Emitter for signal void QMetaDataWriterControl::writableChanged(bool writable)\nCall this method to emit this signal.", false, &_init_emitter_writableChanged_864, &_call_emitter_writableChanged_864); return methods; } diff --git a/src/gsiqt/qt5/QtMultimedia/gsiDeclQRadioData.cc b/src/gsiqt/qt5/QtMultimedia/gsiDeclQRadioData.cc index aabf430ba..49983ea40 100644 --- a/src/gsiqt/qt5/QtMultimedia/gsiDeclQRadioData.cc +++ b/src/gsiqt/qt5/QtMultimedia/gsiDeclQRadioData.cc @@ -56,6 +56,26 @@ static void _call_smo (const qt_gsi::GenericStaticMethod *, gsi::SerialArgs &, g } +// void QRadioData::alternativeFrequenciesEnabledChanged(bool enabled) + + +static void _init_f_alternativeFrequenciesEnabledChanged_864 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("enabled"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_alternativeFrequenciesEnabledChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + bool arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QRadioData *)cls)->alternativeFrequenciesEnabledChanged (arg1); +} + + // QMultimedia::AvailabilityStatus QRadioData::availability() @@ -86,6 +106,26 @@ static void _call_f_error_c0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, } +// void QRadioData::error(QRadioData::Error error) + + +static void _init_f_error_2028 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("error"); + decl->add_arg::target_type & > (argspec_0); + decl->set_return (); +} + +static void _call_f_error_2028 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QRadioData *)cls)->error (qt_gsi::QtToCppAdaptor(arg1).cref()); +} + + // QString QRadioData::errorString() @@ -146,6 +186,26 @@ static void _call_f_programType_c0 (const qt_gsi::GenericMethod * /*decl*/, void } +// void QRadioData::programTypeChanged(QRadioData::ProgramType programType) + + +static void _init_f_programTypeChanged_2652 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("programType"); + decl->add_arg::target_type & > (argspec_0); + decl->set_return (); +} + +static void _call_f_programTypeChanged_2652 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QRadioData *)cls)->programTypeChanged (qt_gsi::QtToCppAdaptor(arg1).cref()); +} + + // QString QRadioData::programTypeName() @@ -161,6 +221,26 @@ static void _call_f_programTypeName_c0 (const qt_gsi::GenericMethod * /*decl*/, } +// void QRadioData::programTypeNameChanged(QString programTypeName) + + +static void _init_f_programTypeNameChanged_1148 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("programTypeName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_programTypeNameChanged_1148 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + QString arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QRadioData *)cls)->programTypeNameChanged (arg1); +} + + // QString QRadioData::radioText() @@ -176,6 +256,26 @@ static void _call_f_radioText_c0 (const qt_gsi::GenericMethod * /*decl*/, void * } +// void QRadioData::radioTextChanged(QString radioText) + + +static void _init_f_radioTextChanged_1148 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("radioText"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_radioTextChanged_1148 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + QString arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QRadioData *)cls)->radioTextChanged (arg1); +} + + // void QRadioData::setAlternativeFrequenciesEnabled(bool enabled) @@ -211,6 +311,26 @@ static void _call_f_stationId_c0 (const qt_gsi::GenericMethod * /*decl*/, void * } +// void QRadioData::stationIdChanged(QString stationId) + + +static void _init_f_stationIdChanged_1148 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("stationId"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_stationIdChanged_1148 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + QString arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QRadioData *)cls)->stationIdChanged (arg1); +} + + // QString QRadioData::stationName() @@ -226,6 +346,26 @@ static void _call_f_stationName_c0 (const qt_gsi::GenericMethod * /*decl*/, void } +// void QRadioData::stationNameChanged(QString stationName) + + +static void _init_f_stationNameChanged_1148 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("stationName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_stationNameChanged_1148 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + QString arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QRadioData *)cls)->stationNameChanged (arg1); +} + + // static QString QRadioData::tr(const char *s, const char *c, int n) @@ -327,25 +467,24 @@ namespace gsi static gsi::Methods methods_QRadioData () { gsi::Methods methods; methods += new qt_gsi::GenericStaticMethod ("staticMetaObject", "@brief Obtains the static MetaObject for this class.", &_init_smo, &_call_smo); + methods += new qt_gsi::GenericMethod ("alternativeFrequenciesEnabledChanged", "@brief Method void QRadioData::alternativeFrequenciesEnabledChanged(bool enabled)\n", false, &_init_f_alternativeFrequenciesEnabledChanged_864, &_call_f_alternativeFrequenciesEnabledChanged_864); methods += new qt_gsi::GenericMethod ("availability", "@brief Method QMultimedia::AvailabilityStatus QRadioData::availability()\n", true, &_init_f_availability_c0, &_call_f_availability_c0); methods += new qt_gsi::GenericMethod ("error", "@brief Method QRadioData::Error QRadioData::error()\n", true, &_init_f_error_c0, &_call_f_error_c0); + methods += new qt_gsi::GenericMethod ("error_sig", "@brief Method void QRadioData::error(QRadioData::Error error)\n", false, &_init_f_error_2028, &_call_f_error_2028); methods += new qt_gsi::GenericMethod ("errorString", "@brief Method QString QRadioData::errorString()\n", true, &_init_f_errorString_c0, &_call_f_errorString_c0); methods += new qt_gsi::GenericMethod ("isAlternativeFrequenciesEnabled?|:alternativeFrequenciesEnabled", "@brief Method bool QRadioData::isAlternativeFrequenciesEnabled()\n", true, &_init_f_isAlternativeFrequenciesEnabled_c0, &_call_f_isAlternativeFrequenciesEnabled_c0); methods += new qt_gsi::GenericMethod ("mediaObject", "@brief Method QMediaObject *QRadioData::mediaObject()\nThis is a reimplementation of QMediaBindableInterface::mediaObject", true, &_init_f_mediaObject_c0, &_call_f_mediaObject_c0); methods += new qt_gsi::GenericMethod (":programType", "@brief Method QRadioData::ProgramType QRadioData::programType()\n", true, &_init_f_programType_c0, &_call_f_programType_c0); + methods += new qt_gsi::GenericMethod ("programTypeChanged", "@brief Method void QRadioData::programTypeChanged(QRadioData::ProgramType programType)\n", false, &_init_f_programTypeChanged_2652, &_call_f_programTypeChanged_2652); methods += new qt_gsi::GenericMethod (":programTypeName", "@brief Method QString QRadioData::programTypeName()\n", true, &_init_f_programTypeName_c0, &_call_f_programTypeName_c0); + methods += new qt_gsi::GenericMethod ("programTypeNameChanged", "@brief Method void QRadioData::programTypeNameChanged(QString programTypeName)\n", false, &_init_f_programTypeNameChanged_1148, &_call_f_programTypeNameChanged_1148); methods += new qt_gsi::GenericMethod (":radioText", "@brief Method QString QRadioData::radioText()\n", true, &_init_f_radioText_c0, &_call_f_radioText_c0); + methods += new qt_gsi::GenericMethod ("radioTextChanged", "@brief Method void QRadioData::radioTextChanged(QString radioText)\n", false, &_init_f_radioTextChanged_1148, &_call_f_radioTextChanged_1148); methods += new qt_gsi::GenericMethod ("setAlternativeFrequenciesEnabled|alternativeFrequenciesEnabled=", "@brief Method void QRadioData::setAlternativeFrequenciesEnabled(bool enabled)\n", false, &_init_f_setAlternativeFrequenciesEnabled_864, &_call_f_setAlternativeFrequenciesEnabled_864); methods += new qt_gsi::GenericMethod (":stationId", "@brief Method QString QRadioData::stationId()\n", true, &_init_f_stationId_c0, &_call_f_stationId_c0); + methods += new qt_gsi::GenericMethod ("stationIdChanged", "@brief Method void QRadioData::stationIdChanged(QString stationId)\n", false, &_init_f_stationIdChanged_1148, &_call_f_stationIdChanged_1148); methods += new qt_gsi::GenericMethod (":stationName", "@brief Method QString QRadioData::stationName()\n", true, &_init_f_stationName_c0, &_call_f_stationName_c0); - methods += gsi::qt_signal ("alternativeFrequenciesEnabledChanged(bool)", "alternativeFrequenciesEnabledChanged", gsi::arg("enabled"), "@brief Signal declaration for QRadioData::alternativeFrequenciesEnabledChanged(bool enabled)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QRadioData::destroyed(QObject *)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal::target_type & > ("error(QRadioData::Error)", "error_sig", gsi::arg("error"), "@brief Signal declaration for QRadioData::error(QRadioData::Error error)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal::target_type & > ("programTypeChanged(QRadioData::ProgramType)", "programTypeChanged", gsi::arg("programType"), "@brief Signal declaration for QRadioData::programTypeChanged(QRadioData::ProgramType programType)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("programTypeNameChanged(QString)", "programTypeNameChanged", gsi::arg("programTypeName"), "@brief Signal declaration for QRadioData::programTypeNameChanged(QString programTypeName)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("radioTextChanged(QString)", "radioTextChanged", gsi::arg("radioText"), "@brief Signal declaration for QRadioData::radioTextChanged(QString radioText)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("stationIdChanged(QString)", "stationIdChanged", gsi::arg("stationId"), "@brief Signal declaration for QRadioData::stationIdChanged(QString stationId)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("stationNameChanged(QString)", "stationNameChanged", gsi::arg("stationName"), "@brief Signal declaration for QRadioData::stationNameChanged(QString stationName)\nYou can bind a procedure to this signal."); + methods += new qt_gsi::GenericMethod ("stationNameChanged", "@brief Method void QRadioData::stationNameChanged(QString stationName)\n", false, &_init_f_stationNameChanged_1148, &_call_f_stationNameChanged_1148); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QRadioData::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QRadioData::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); methods += new qt_gsi::GenericMethod ("asQObject", "@brief Delivers the base class interface QObject of QRadioData\nClass QRadioData is derived from multiple base classes. This method delivers the QObject base class aspect.", false, &_init_f_QRadioData_as_QObject, &_call_f_QRadioData_as_QObject); @@ -404,24 +543,6 @@ public: return QRadioData::senderSignalIndex(); } - // [emitter impl] void QRadioData::alternativeFrequenciesEnabledChanged(bool enabled) - void emitter_QRadioData_alternativeFrequenciesEnabledChanged_864(bool enabled) - { - emit QRadioData::alternativeFrequenciesEnabledChanged(enabled); - } - - // [emitter impl] void QRadioData::destroyed(QObject *) - void emitter_QRadioData_destroyed_1302(QObject *arg1) - { - emit QRadioData::destroyed(arg1); - } - - // [emitter impl] void QRadioData::error(QRadioData::Error error) - void emitter_QRadioData_error_2028(QRadioData::Error _error) - { - emit QRadioData::error(_error); - } - // [adaptor impl] bool QRadioData::event(QEvent *) bool cbs_event_1217_0(QEvent *arg1) { @@ -467,36 +588,6 @@ public: } } - // [emitter impl] void QRadioData::programTypeChanged(QRadioData::ProgramType programType) - void emitter_QRadioData_programTypeChanged_2652(QRadioData::ProgramType programType) - { - emit QRadioData::programTypeChanged(programType); - } - - // [emitter impl] void QRadioData::programTypeNameChanged(QString programTypeName) - void emitter_QRadioData_programTypeNameChanged_1148(QString programTypeName) - { - emit QRadioData::programTypeNameChanged(programTypeName); - } - - // [emitter impl] void QRadioData::radioTextChanged(QString radioText) - void emitter_QRadioData_radioTextChanged_1148(QString radioText) - { - emit QRadioData::radioTextChanged(radioText); - } - - // [emitter impl] void QRadioData::stationIdChanged(QString stationId) - void emitter_QRadioData_stationIdChanged_1148(QString stationId) - { - emit QRadioData::stationIdChanged(stationId); - } - - // [emitter impl] void QRadioData::stationNameChanged(QString stationName) - void emitter_QRadioData_stationNameChanged_1148(QString stationName) - { - emit QRadioData::stationNameChanged(stationName); - } - // [adaptor impl] void QRadioData::childEvent(QChildEvent *) void cbs_childEvent_1701_0(QChildEvent *arg1) { @@ -605,24 +696,6 @@ static void _call_ctor_QRadioData_Adaptor_2976 (const qt_gsi::GenericStaticMetho } -// emitter void QRadioData::alternativeFrequenciesEnabledChanged(bool enabled) - -static void _init_emitter_alternativeFrequenciesEnabledChanged_864 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("enabled"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_alternativeFrequenciesEnabledChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - bool arg1 = gsi::arg_reader() (args, heap); - ((QRadioData_Adaptor *)cls)->emitter_QRadioData_alternativeFrequenciesEnabledChanged_864 (arg1); -} - - // void QRadioData::childEvent(QChildEvent *) static void _init_cbs_childEvent_1701_0 (qt_gsi::GenericMethod *decl) @@ -671,24 +744,6 @@ static void _set_callback_cbs_customEvent_1217_0 (void *cls, const gsi::Callback } -// emitter void QRadioData::destroyed(QObject *) - -static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - ((QRadioData_Adaptor *)cls)->emitter_QRadioData_destroyed_1302 (arg1); -} - - // void QRadioData::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -713,24 +768,6 @@ static void _set_callback_cbs_disconnectNotify_2394_0 (void *cls, const gsi::Cal } -// emitter void QRadioData::error(QRadioData::Error error) - -static void _init_emitter_error_2028 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("error"); - decl->add_arg::target_type & > (argspec_0); - decl->set_return (); -} - -static void _call_emitter_error_2028 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); - ((QRadioData_Adaptor *)cls)->emitter_QRadioData_error_2028 (arg1); -} - - // bool QRadioData::event(QEvent *) static void _init_cbs_event_1217_0 (qt_gsi::GenericMethod *decl) @@ -817,60 +854,6 @@ static void _set_callback_cbs_mediaObject_c0_0 (void *cls, const gsi::Callback & } -// emitter void QRadioData::programTypeChanged(QRadioData::ProgramType programType) - -static void _init_emitter_programTypeChanged_2652 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("programType"); - decl->add_arg::target_type & > (argspec_0); - decl->set_return (); -} - -static void _call_emitter_programTypeChanged_2652 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); - ((QRadioData_Adaptor *)cls)->emitter_QRadioData_programTypeChanged_2652 (arg1); -} - - -// emitter void QRadioData::programTypeNameChanged(QString programTypeName) - -static void _init_emitter_programTypeNameChanged_1148 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("programTypeName"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_programTypeNameChanged_1148 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QString arg1 = gsi::arg_reader() (args, heap); - ((QRadioData_Adaptor *)cls)->emitter_QRadioData_programTypeNameChanged_1148 (arg1); -} - - -// emitter void QRadioData::radioTextChanged(QString radioText) - -static void _init_emitter_radioTextChanged_1148 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("radioText"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_radioTextChanged_1148 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QString arg1 = gsi::arg_reader() (args, heap); - ((QRadioData_Adaptor *)cls)->emitter_QRadioData_radioTextChanged_1148 (arg1); -} - - // exposed int QRadioData::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -940,42 +923,6 @@ static void _set_callback_cbs_setMediaObject_1782_0 (void *cls, const gsi::Callb } -// emitter void QRadioData::stationIdChanged(QString stationId) - -static void _init_emitter_stationIdChanged_1148 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("stationId"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_stationIdChanged_1148 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QString arg1 = gsi::arg_reader() (args, heap); - ((QRadioData_Adaptor *)cls)->emitter_QRadioData_stationIdChanged_1148 (arg1); -} - - -// emitter void QRadioData::stationNameChanged(QString stationName) - -static void _init_emitter_stationNameChanged_1148 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("stationName"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_stationNameChanged_1148 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QString arg1 = gsi::arg_reader() (args, heap); - ((QRadioData_Adaptor *)cls)->emitter_QRadioData_stationNameChanged_1148 (arg1); -} - - // void QRadioData::timerEvent(QTimerEvent *) static void _init_cbs_timerEvent_1730_0 (qt_gsi::GenericMethod *decl) @@ -1008,15 +955,12 @@ gsi::Class &qtdecl_QRadioData (); static gsi::Methods methods_QRadioData_Adaptor () { gsi::Methods methods; methods += new qt_gsi::GenericStaticMethod ("new", "@brief Constructor QRadioData::QRadioData(QMediaObject *mediaObject, QObject *parent)\nThis method creates an object of class QRadioData.", &_init_ctor_QRadioData_Adaptor_2976, &_call_ctor_QRadioData_Adaptor_2976); - methods += new qt_gsi::GenericMethod ("emit_alternativeFrequenciesEnabledChanged", "@brief Emitter for signal void QRadioData::alternativeFrequenciesEnabledChanged(bool enabled)\nCall this method to emit this signal.", false, &_init_emitter_alternativeFrequenciesEnabledChanged_864, &_call_emitter_alternativeFrequenciesEnabledChanged_864); methods += new qt_gsi::GenericMethod ("*childEvent", "@brief Virtual method void QRadioData::childEvent(QChildEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QRadioData::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); - methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QRadioData::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QRadioData::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); - methods += new qt_gsi::GenericMethod ("emit_error_sig", "@brief Emitter for signal void QRadioData::error(QRadioData::Error error)\nCall this method to emit this signal.", false, &_init_emitter_error_2028, &_call_emitter_error_2028); methods += new qt_gsi::GenericMethod ("event", "@brief Virtual method bool QRadioData::event(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0); methods += new qt_gsi::GenericMethod ("event", "@hide", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0, &_set_callback_cbs_event_1217_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QRadioData::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); @@ -1024,16 +968,11 @@ static gsi::Methods methods_QRadioData_Adaptor () { methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QRadioData::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); methods += new qt_gsi::GenericMethod ("mediaObject", "@brief Virtual method QMediaObject *QRadioData::mediaObject()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_mediaObject_c0_0, &_call_cbs_mediaObject_c0_0); methods += new qt_gsi::GenericMethod ("mediaObject", "@hide", true, &_init_cbs_mediaObject_c0_0, &_call_cbs_mediaObject_c0_0, &_set_callback_cbs_mediaObject_c0_0); - methods += new qt_gsi::GenericMethod ("emit_programTypeChanged", "@brief Emitter for signal void QRadioData::programTypeChanged(QRadioData::ProgramType programType)\nCall this method to emit this signal.", false, &_init_emitter_programTypeChanged_2652, &_call_emitter_programTypeChanged_2652); - methods += new qt_gsi::GenericMethod ("emit_programTypeNameChanged", "@brief Emitter for signal void QRadioData::programTypeNameChanged(QString programTypeName)\nCall this method to emit this signal.", false, &_init_emitter_programTypeNameChanged_1148, &_call_emitter_programTypeNameChanged_1148); - methods += new qt_gsi::GenericMethod ("emit_radioTextChanged", "@brief Emitter for signal void QRadioData::radioTextChanged(QString radioText)\nCall this method to emit this signal.", false, &_init_emitter_radioTextChanged_1148, &_call_emitter_radioTextChanged_1148); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QRadioData::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QRadioData::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QRadioData::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); methods += new qt_gsi::GenericMethod ("*setMediaObject", "@brief Virtual method bool QRadioData::setMediaObject(QMediaObject *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_setMediaObject_1782_0, &_call_cbs_setMediaObject_1782_0); methods += new qt_gsi::GenericMethod ("*setMediaObject", "@hide", false, &_init_cbs_setMediaObject_1782_0, &_call_cbs_setMediaObject_1782_0, &_set_callback_cbs_setMediaObject_1782_0); - methods += new qt_gsi::GenericMethod ("emit_stationIdChanged", "@brief Emitter for signal void QRadioData::stationIdChanged(QString stationId)\nCall this method to emit this signal.", false, &_init_emitter_stationIdChanged_1148, &_call_emitter_stationIdChanged_1148); - methods += new qt_gsi::GenericMethod ("emit_stationNameChanged", "@brief Emitter for signal void QRadioData::stationNameChanged(QString stationName)\nCall this method to emit this signal.", false, &_init_emitter_stationNameChanged_1148, &_call_emitter_stationNameChanged_1148); methods += new qt_gsi::GenericMethod ("*timerEvent", "@brief Virtual method void QRadioData::timerEvent(QTimerEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_timerEvent_1730_0, &_call_cbs_timerEvent_1730_0); methods += new qt_gsi::GenericMethod ("*timerEvent", "@hide", false, &_init_cbs_timerEvent_1730_0, &_call_cbs_timerEvent_1730_0, &_set_callback_cbs_timerEvent_1730_0); return methods; diff --git a/src/gsiqt/qt5/QtMultimedia/gsiDeclQRadioDataControl.cc b/src/gsiqt/qt5/QtMultimedia/gsiDeclQRadioDataControl.cc index 8ea1141a6..ab18d9041 100644 --- a/src/gsiqt/qt5/QtMultimedia/gsiDeclQRadioDataControl.cc +++ b/src/gsiqt/qt5/QtMultimedia/gsiDeclQRadioDataControl.cc @@ -55,6 +55,26 @@ static void _call_smo (const qt_gsi::GenericStaticMethod *, gsi::SerialArgs &, g } +// void QRadioDataControl::alternativeFrequenciesEnabledChanged(bool enabled) + + +static void _init_f_alternativeFrequenciesEnabledChanged_864 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("enabled"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_alternativeFrequenciesEnabledChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + bool arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QRadioDataControl *)cls)->alternativeFrequenciesEnabledChanged (arg1); +} + + // QRadioData::Error QRadioDataControl::error() @@ -70,6 +90,26 @@ static void _call_f_error_c0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, } +// void QRadioDataControl::error(QRadioData::Error err) + + +static void _init_f_error_2028 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("err"); + decl->add_arg::target_type & > (argspec_0); + decl->set_return (); +} + +static void _call_f_error_2028 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QRadioDataControl *)cls)->error (qt_gsi::QtToCppAdaptor(arg1).cref()); +} + + // QString QRadioDataControl::errorString() @@ -115,6 +155,26 @@ static void _call_f_programType_c0 (const qt_gsi::GenericMethod * /*decl*/, void } +// void QRadioDataControl::programTypeChanged(QRadioData::ProgramType programType) + + +static void _init_f_programTypeChanged_2652 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("programType"); + decl->add_arg::target_type & > (argspec_0); + decl->set_return (); +} + +static void _call_f_programTypeChanged_2652 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QRadioDataControl *)cls)->programTypeChanged (qt_gsi::QtToCppAdaptor(arg1).cref()); +} + + // QString QRadioDataControl::programTypeName() @@ -130,6 +190,26 @@ static void _call_f_programTypeName_c0 (const qt_gsi::GenericMethod * /*decl*/, } +// void QRadioDataControl::programTypeNameChanged(QString programTypeName) + + +static void _init_f_programTypeNameChanged_1148 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("programTypeName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_programTypeNameChanged_1148 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + QString arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QRadioDataControl *)cls)->programTypeNameChanged (arg1); +} + + // QString QRadioDataControl::radioText() @@ -145,6 +225,26 @@ static void _call_f_radioText_c0 (const qt_gsi::GenericMethod * /*decl*/, void * } +// void QRadioDataControl::radioTextChanged(QString radioText) + + +static void _init_f_radioTextChanged_1148 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("radioText"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_radioTextChanged_1148 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + QString arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QRadioDataControl *)cls)->radioTextChanged (arg1); +} + + // void QRadioDataControl::setAlternativeFrequenciesEnabled(bool enabled) @@ -180,6 +280,26 @@ static void _call_f_stationId_c0 (const qt_gsi::GenericMethod * /*decl*/, void * } +// void QRadioDataControl::stationIdChanged(QString stationId) + + +static void _init_f_stationIdChanged_1148 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("stationId"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_stationIdChanged_1148 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + QString arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QRadioDataControl *)cls)->stationIdChanged (arg1); +} + + // QString QRadioDataControl::stationName() @@ -195,6 +315,26 @@ static void _call_f_stationName_c0 (const qt_gsi::GenericMethod * /*decl*/, void } +// void QRadioDataControl::stationNameChanged(QString stationName) + + +static void _init_f_stationNameChanged_1148 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("stationName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_stationNameChanged_1148 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + QString arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QRadioDataControl *)cls)->stationNameChanged (arg1); +} + + // static QString QRadioDataControl::tr(const char *s, const char *c, int n) @@ -251,23 +391,22 @@ namespace gsi static gsi::Methods methods_QRadioDataControl () { gsi::Methods methods; methods += new qt_gsi::GenericStaticMethod ("staticMetaObject", "@brief Obtains the static MetaObject for this class.", &_init_smo, &_call_smo); + methods += new qt_gsi::GenericMethod ("alternativeFrequenciesEnabledChanged", "@brief Method void QRadioDataControl::alternativeFrequenciesEnabledChanged(bool enabled)\n", false, &_init_f_alternativeFrequenciesEnabledChanged_864, &_call_f_alternativeFrequenciesEnabledChanged_864); methods += new qt_gsi::GenericMethod ("error", "@brief Method QRadioData::Error QRadioDataControl::error()\n", true, &_init_f_error_c0, &_call_f_error_c0); + methods += new qt_gsi::GenericMethod ("error_sig", "@brief Method void QRadioDataControl::error(QRadioData::Error err)\n", false, &_init_f_error_2028, &_call_f_error_2028); methods += new qt_gsi::GenericMethod ("errorString", "@brief Method QString QRadioDataControl::errorString()\n", true, &_init_f_errorString_c0, &_call_f_errorString_c0); methods += new qt_gsi::GenericMethod ("isAlternativeFrequenciesEnabled?|:alternativeFrequenciesEnabled", "@brief Method bool QRadioDataControl::isAlternativeFrequenciesEnabled()\n", true, &_init_f_isAlternativeFrequenciesEnabled_c0, &_call_f_isAlternativeFrequenciesEnabled_c0); methods += new qt_gsi::GenericMethod ("programType", "@brief Method QRadioData::ProgramType QRadioDataControl::programType()\n", true, &_init_f_programType_c0, &_call_f_programType_c0); + methods += new qt_gsi::GenericMethod ("programTypeChanged", "@brief Method void QRadioDataControl::programTypeChanged(QRadioData::ProgramType programType)\n", false, &_init_f_programTypeChanged_2652, &_call_f_programTypeChanged_2652); methods += new qt_gsi::GenericMethod ("programTypeName", "@brief Method QString QRadioDataControl::programTypeName()\n", true, &_init_f_programTypeName_c0, &_call_f_programTypeName_c0); + methods += new qt_gsi::GenericMethod ("programTypeNameChanged", "@brief Method void QRadioDataControl::programTypeNameChanged(QString programTypeName)\n", false, &_init_f_programTypeNameChanged_1148, &_call_f_programTypeNameChanged_1148); methods += new qt_gsi::GenericMethod ("radioText", "@brief Method QString QRadioDataControl::radioText()\n", true, &_init_f_radioText_c0, &_call_f_radioText_c0); + methods += new qt_gsi::GenericMethod ("radioTextChanged", "@brief Method void QRadioDataControl::radioTextChanged(QString radioText)\n", false, &_init_f_radioTextChanged_1148, &_call_f_radioTextChanged_1148); methods += new qt_gsi::GenericMethod ("setAlternativeFrequenciesEnabled|alternativeFrequenciesEnabled=", "@brief Method void QRadioDataControl::setAlternativeFrequenciesEnabled(bool enabled)\n", false, &_init_f_setAlternativeFrequenciesEnabled_864, &_call_f_setAlternativeFrequenciesEnabled_864); methods += new qt_gsi::GenericMethod ("stationId", "@brief Method QString QRadioDataControl::stationId()\n", true, &_init_f_stationId_c0, &_call_f_stationId_c0); + methods += new qt_gsi::GenericMethod ("stationIdChanged", "@brief Method void QRadioDataControl::stationIdChanged(QString stationId)\n", false, &_init_f_stationIdChanged_1148, &_call_f_stationIdChanged_1148); methods += new qt_gsi::GenericMethod ("stationName", "@brief Method QString QRadioDataControl::stationName()\n", true, &_init_f_stationName_c0, &_call_f_stationName_c0); - methods += gsi::qt_signal ("alternativeFrequenciesEnabledChanged(bool)", "alternativeFrequenciesEnabledChanged", gsi::arg("enabled"), "@brief Signal declaration for QRadioDataControl::alternativeFrequenciesEnabledChanged(bool enabled)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QRadioDataControl::destroyed(QObject *)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal::target_type & > ("error(QRadioData::Error)", "error_sig", gsi::arg("err"), "@brief Signal declaration for QRadioDataControl::error(QRadioData::Error err)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal::target_type & > ("programTypeChanged(QRadioData::ProgramType)", "programTypeChanged", gsi::arg("programType"), "@brief Signal declaration for QRadioDataControl::programTypeChanged(QRadioData::ProgramType programType)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("programTypeNameChanged(QString)", "programTypeNameChanged", gsi::arg("programTypeName"), "@brief Signal declaration for QRadioDataControl::programTypeNameChanged(QString programTypeName)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("radioTextChanged(QString)", "radioTextChanged", gsi::arg("radioText"), "@brief Signal declaration for QRadioDataControl::radioTextChanged(QString radioText)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("stationIdChanged(QString)", "stationIdChanged", gsi::arg("stationId"), "@brief Signal declaration for QRadioDataControl::stationIdChanged(QString stationId)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("stationNameChanged(QString)", "stationNameChanged", gsi::arg("stationName"), "@brief Signal declaration for QRadioDataControl::stationNameChanged(QString stationName)\nYou can bind a procedure to this signal."); + methods += new qt_gsi::GenericMethod ("stationNameChanged", "@brief Method void QRadioDataControl::stationNameChanged(QString stationName)\n", false, &_init_f_stationNameChanged_1148, &_call_f_stationNameChanged_1148); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QRadioDataControl::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QRadioDataControl::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -310,18 +449,6 @@ public: return QRadioDataControl::senderSignalIndex(); } - // [emitter impl] void QRadioDataControl::alternativeFrequenciesEnabledChanged(bool enabled) - void emitter_QRadioDataControl_alternativeFrequenciesEnabledChanged_864(bool enabled) - { - emit QRadioDataControl::alternativeFrequenciesEnabledChanged(enabled); - } - - // [emitter impl] void QRadioDataControl::destroyed(QObject *) - void emitter_QRadioDataControl_destroyed_1302(QObject *arg1) - { - emit QRadioDataControl::destroyed(arg1); - } - // [adaptor impl] QRadioData::Error QRadioDataControl::error() qt_gsi::Converter::target_type cbs_error_c0_0() const { @@ -337,12 +464,6 @@ public: } } - // [emitter impl] void QRadioDataControl::error(QRadioData::Error err) - void emitter_QRadioDataControl_error_2028(QRadioData::Error err) - { - emit QRadioDataControl::error(err); - } - // [adaptor impl] QString QRadioDataControl::errorString() QString cbs_errorString_c0_0() const { @@ -418,12 +539,6 @@ public: } } - // [emitter impl] void QRadioDataControl::programTypeChanged(QRadioData::ProgramType programType) - void emitter_QRadioDataControl_programTypeChanged_2652(QRadioData::ProgramType programType) - { - emit QRadioDataControl::programTypeChanged(programType); - } - // [adaptor impl] QString QRadioDataControl::programTypeName() QString cbs_programTypeName_c0_0() const { @@ -439,12 +554,6 @@ public: } } - // [emitter impl] void QRadioDataControl::programTypeNameChanged(QString programTypeName) - void emitter_QRadioDataControl_programTypeNameChanged_1148(QString programTypeName) - { - emit QRadioDataControl::programTypeNameChanged(programTypeName); - } - // [adaptor impl] QString QRadioDataControl::radioText() QString cbs_radioText_c0_0() const { @@ -460,12 +569,6 @@ public: } } - // [emitter impl] void QRadioDataControl::radioTextChanged(QString radioText) - void emitter_QRadioDataControl_radioTextChanged_1148(QString radioText) - { - emit QRadioDataControl::radioTextChanged(radioText); - } - // [adaptor impl] void QRadioDataControl::setAlternativeFrequenciesEnabled(bool enabled) void cbs_setAlternativeFrequenciesEnabled_864_0(bool enabled) { @@ -497,12 +600,6 @@ public: } } - // [emitter impl] void QRadioDataControl::stationIdChanged(QString stationId) - void emitter_QRadioDataControl_stationIdChanged_1148(QString stationId) - { - emit QRadioDataControl::stationIdChanged(stationId); - } - // [adaptor impl] QString QRadioDataControl::stationName() QString cbs_stationName_c0_0() const { @@ -518,12 +615,6 @@ public: } } - // [emitter impl] void QRadioDataControl::stationNameChanged(QString stationName) - void emitter_QRadioDataControl_stationNameChanged_1148(QString stationName) - { - emit QRadioDataControl::stationNameChanged(stationName); - } - // [adaptor impl] void QRadioDataControl::childEvent(QChildEvent *) void cbs_childEvent_1701_0(QChildEvent *arg1) { @@ -603,24 +694,6 @@ public: QRadioDataControl_Adaptor::~QRadioDataControl_Adaptor() { } -// emitter void QRadioDataControl::alternativeFrequenciesEnabledChanged(bool enabled) - -static void _init_emitter_alternativeFrequenciesEnabledChanged_864 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("enabled"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_alternativeFrequenciesEnabledChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - bool arg1 = gsi::arg_reader() (args, heap); - ((QRadioDataControl_Adaptor *)cls)->emitter_QRadioDataControl_alternativeFrequenciesEnabledChanged_864 (arg1); -} - - // void QRadioDataControl::childEvent(QChildEvent *) static void _init_cbs_childEvent_1701_0 (qt_gsi::GenericMethod *decl) @@ -669,24 +742,6 @@ static void _set_callback_cbs_customEvent_1217_0 (void *cls, const gsi::Callback } -// emitter void QRadioDataControl::destroyed(QObject *) - -static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - ((QRadioDataControl_Adaptor *)cls)->emitter_QRadioDataControl_destroyed_1302 (arg1); -} - - // void QRadioDataControl::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -730,24 +785,6 @@ static void _set_callback_cbs_error_c0_0 (void *cls, const gsi::Callback &cb) } -// emitter void QRadioDataControl::error(QRadioData::Error err) - -static void _init_emitter_error_2028 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("err"); - decl->add_arg::target_type & > (argspec_0); - decl->set_return (); -} - -static void _call_emitter_error_2028 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); - ((QRadioDataControl_Adaptor *)cls)->emitter_QRadioDataControl_error_2028 (arg1); -} - - // QString QRadioDataControl::errorString() static void _init_cbs_errorString_c0_0 (qt_gsi::GenericMethod *decl) @@ -872,24 +909,6 @@ static void _set_callback_cbs_programType_c0_0 (void *cls, const gsi::Callback & } -// emitter void QRadioDataControl::programTypeChanged(QRadioData::ProgramType programType) - -static void _init_emitter_programTypeChanged_2652 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("programType"); - decl->add_arg::target_type & > (argspec_0); - decl->set_return (); -} - -static void _call_emitter_programTypeChanged_2652 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); - ((QRadioDataControl_Adaptor *)cls)->emitter_QRadioDataControl_programTypeChanged_2652 (arg1); -} - - // QString QRadioDataControl::programTypeName() static void _init_cbs_programTypeName_c0_0 (qt_gsi::GenericMethod *decl) @@ -909,24 +928,6 @@ static void _set_callback_cbs_programTypeName_c0_0 (void *cls, const gsi::Callba } -// emitter void QRadioDataControl::programTypeNameChanged(QString programTypeName) - -static void _init_emitter_programTypeNameChanged_1148 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("programTypeName"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_programTypeNameChanged_1148 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QString arg1 = gsi::arg_reader() (args, heap); - ((QRadioDataControl_Adaptor *)cls)->emitter_QRadioDataControl_programTypeNameChanged_1148 (arg1); -} - - // QString QRadioDataControl::radioText() static void _init_cbs_radioText_c0_0 (qt_gsi::GenericMethod *decl) @@ -946,24 +947,6 @@ static void _set_callback_cbs_radioText_c0_0 (void *cls, const gsi::Callback &cb } -// emitter void QRadioDataControl::radioTextChanged(QString radioText) - -static void _init_emitter_radioTextChanged_1148 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("radioText"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_radioTextChanged_1148 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QString arg1 = gsi::arg_reader() (args, heap); - ((QRadioDataControl_Adaptor *)cls)->emitter_QRadioDataControl_radioTextChanged_1148 (arg1); -} - - // exposed int QRadioDataControl::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -1053,24 +1036,6 @@ static void _set_callback_cbs_stationId_c0_0 (void *cls, const gsi::Callback &cb } -// emitter void QRadioDataControl::stationIdChanged(QString stationId) - -static void _init_emitter_stationIdChanged_1148 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("stationId"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_stationIdChanged_1148 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QString arg1 = gsi::arg_reader() (args, heap); - ((QRadioDataControl_Adaptor *)cls)->emitter_QRadioDataControl_stationIdChanged_1148 (arg1); -} - - // QString QRadioDataControl::stationName() static void _init_cbs_stationName_c0_0 (qt_gsi::GenericMethod *decl) @@ -1090,24 +1055,6 @@ static void _set_callback_cbs_stationName_c0_0 (void *cls, const gsi::Callback & } -// emitter void QRadioDataControl::stationNameChanged(QString stationName) - -static void _init_emitter_stationNameChanged_1148 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("stationName"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_stationNameChanged_1148 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QString arg1 = gsi::arg_reader() (args, heap); - ((QRadioDataControl_Adaptor *)cls)->emitter_QRadioDataControl_stationNameChanged_1148 (arg1); -} - - // void QRadioDataControl::timerEvent(QTimerEvent *) static void _init_cbs_timerEvent_1730_0 (qt_gsi::GenericMethod *decl) @@ -1139,17 +1086,14 @@ gsi::Class &qtdecl_QRadioDataControl (); static gsi::Methods methods_QRadioDataControl_Adaptor () { gsi::Methods methods; - methods += new qt_gsi::GenericMethod ("emit_alternativeFrequenciesEnabledChanged", "@brief Emitter for signal void QRadioDataControl::alternativeFrequenciesEnabledChanged(bool enabled)\nCall this method to emit this signal.", false, &_init_emitter_alternativeFrequenciesEnabledChanged_864, &_call_emitter_alternativeFrequenciesEnabledChanged_864); methods += new qt_gsi::GenericMethod ("*childEvent", "@brief Virtual method void QRadioDataControl::childEvent(QChildEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QRadioDataControl::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); - methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QRadioDataControl::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QRadioDataControl::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("error", "@brief Virtual method QRadioData::Error QRadioDataControl::error()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_error_c0_0, &_call_cbs_error_c0_0); methods += new qt_gsi::GenericMethod ("error", "@hide", true, &_init_cbs_error_c0_0, &_call_cbs_error_c0_0, &_set_callback_cbs_error_c0_0); - methods += new qt_gsi::GenericMethod ("emit_error_sig", "@brief Emitter for signal void QRadioDataControl::error(QRadioData::Error err)\nCall this method to emit this signal.", false, &_init_emitter_error_2028, &_call_emitter_error_2028); methods += new qt_gsi::GenericMethod ("errorString", "@brief Virtual method QString QRadioDataControl::errorString()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_errorString_c0_0, &_call_cbs_errorString_c0_0); methods += new qt_gsi::GenericMethod ("errorString", "@hide", true, &_init_cbs_errorString_c0_0, &_call_cbs_errorString_c0_0, &_set_callback_cbs_errorString_c0_0); methods += new qt_gsi::GenericMethod ("event", "@brief Virtual method bool QRadioDataControl::event(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0); @@ -1161,13 +1105,10 @@ static gsi::Methods methods_QRadioDataControl_Adaptor () { methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QRadioDataControl::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); methods += new qt_gsi::GenericMethod ("programType", "@brief Virtual method QRadioData::ProgramType QRadioDataControl::programType()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_programType_c0_0, &_call_cbs_programType_c0_0); methods += new qt_gsi::GenericMethod ("programType", "@hide", true, &_init_cbs_programType_c0_0, &_call_cbs_programType_c0_0, &_set_callback_cbs_programType_c0_0); - methods += new qt_gsi::GenericMethod ("emit_programTypeChanged", "@brief Emitter for signal void QRadioDataControl::programTypeChanged(QRadioData::ProgramType programType)\nCall this method to emit this signal.", false, &_init_emitter_programTypeChanged_2652, &_call_emitter_programTypeChanged_2652); methods += new qt_gsi::GenericMethod ("programTypeName", "@brief Virtual method QString QRadioDataControl::programTypeName()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_programTypeName_c0_0, &_call_cbs_programTypeName_c0_0); methods += new qt_gsi::GenericMethod ("programTypeName", "@hide", true, &_init_cbs_programTypeName_c0_0, &_call_cbs_programTypeName_c0_0, &_set_callback_cbs_programTypeName_c0_0); - methods += new qt_gsi::GenericMethod ("emit_programTypeNameChanged", "@brief Emitter for signal void QRadioDataControl::programTypeNameChanged(QString programTypeName)\nCall this method to emit this signal.", false, &_init_emitter_programTypeNameChanged_1148, &_call_emitter_programTypeNameChanged_1148); methods += new qt_gsi::GenericMethod ("radioText", "@brief Virtual method QString QRadioDataControl::radioText()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_radioText_c0_0, &_call_cbs_radioText_c0_0); methods += new qt_gsi::GenericMethod ("radioText", "@hide", true, &_init_cbs_radioText_c0_0, &_call_cbs_radioText_c0_0, &_set_callback_cbs_radioText_c0_0); - methods += new qt_gsi::GenericMethod ("emit_radioTextChanged", "@brief Emitter for signal void QRadioDataControl::radioTextChanged(QString radioText)\nCall this method to emit this signal.", false, &_init_emitter_radioTextChanged_1148, &_call_emitter_radioTextChanged_1148); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QRadioDataControl::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QRadioDataControl::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QRadioDataControl::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); @@ -1175,10 +1116,8 @@ static gsi::Methods methods_QRadioDataControl_Adaptor () { methods += new qt_gsi::GenericMethod ("setAlternativeFrequenciesEnabled", "@hide", false, &_init_cbs_setAlternativeFrequenciesEnabled_864_0, &_call_cbs_setAlternativeFrequenciesEnabled_864_0, &_set_callback_cbs_setAlternativeFrequenciesEnabled_864_0); methods += new qt_gsi::GenericMethod ("stationId", "@brief Virtual method QString QRadioDataControl::stationId()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_stationId_c0_0, &_call_cbs_stationId_c0_0); methods += new qt_gsi::GenericMethod ("stationId", "@hide", true, &_init_cbs_stationId_c0_0, &_call_cbs_stationId_c0_0, &_set_callback_cbs_stationId_c0_0); - methods += new qt_gsi::GenericMethod ("emit_stationIdChanged", "@brief Emitter for signal void QRadioDataControl::stationIdChanged(QString stationId)\nCall this method to emit this signal.", false, &_init_emitter_stationIdChanged_1148, &_call_emitter_stationIdChanged_1148); methods += new qt_gsi::GenericMethod ("stationName", "@brief Virtual method QString QRadioDataControl::stationName()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_stationName_c0_0, &_call_cbs_stationName_c0_0); methods += new qt_gsi::GenericMethod ("stationName", "@hide", true, &_init_cbs_stationName_c0_0, &_call_cbs_stationName_c0_0, &_set_callback_cbs_stationName_c0_0); - methods += new qt_gsi::GenericMethod ("emit_stationNameChanged", "@brief Emitter for signal void QRadioDataControl::stationNameChanged(QString stationName)\nCall this method to emit this signal.", false, &_init_emitter_stationNameChanged_1148, &_call_emitter_stationNameChanged_1148); methods += new qt_gsi::GenericMethod ("*timerEvent", "@brief Virtual method void QRadioDataControl::timerEvent(QTimerEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_timerEvent_1730_0, &_call_cbs_timerEvent_1730_0); methods += new qt_gsi::GenericMethod ("*timerEvent", "@hide", false, &_init_cbs_timerEvent_1730_0, &_call_cbs_timerEvent_1730_0, &_set_callback_cbs_timerEvent_1730_0); return methods; diff --git a/src/gsiqt/qt5/QtMultimedia/gsiDeclQRadioTuner.cc b/src/gsiqt/qt5/QtMultimedia/gsiDeclQRadioTuner.cc index 9f264f825..bd7938f3d 100644 --- a/src/gsiqt/qt5/QtMultimedia/gsiDeclQRadioTuner.cc +++ b/src/gsiqt/qt5/QtMultimedia/gsiDeclQRadioTuner.cc @@ -57,6 +57,26 @@ static void _call_smo (const qt_gsi::GenericStaticMethod *, gsi::SerialArgs &, g } +// void QRadioTuner::antennaConnectedChanged(bool connectionStatus) + + +static void _init_f_antennaConnectedChanged_864 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("connectionStatus"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_antennaConnectedChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + bool arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QRadioTuner *)cls)->antennaConnectedChanged (arg1); +} + + // QMultimedia::AvailabilityStatus QRadioTuner::availability() @@ -87,6 +107,26 @@ static void _call_f_band_c0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, } +// void QRadioTuner::bandChanged(QRadioTuner::Band band) + + +static void _init_f_bandChanged_2027 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("band"); + decl->add_arg::target_type & > (argspec_0); + decl->set_return (); +} + +static void _call_f_bandChanged_2027 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QRadioTuner *)cls)->bandChanged (qt_gsi::QtToCppAdaptor(arg1).cref()); +} + + // void QRadioTuner::cancelSearch() @@ -118,6 +158,26 @@ static void _call_f_error_c0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, } +// void QRadioTuner::error(QRadioTuner::Error error) + + +static void _init_f_error_2176 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("error"); + decl->add_arg::target_type & > (argspec_0); + decl->set_return (); +} + +static void _call_f_error_2176 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QRadioTuner *)cls)->error (qt_gsi::QtToCppAdaptor(arg1).cref()); +} + + // QString QRadioTuner::errorString() @@ -148,6 +208,26 @@ static void _call_f_frequency_c0 (const qt_gsi::GenericMethod * /*decl*/, void * } +// void QRadioTuner::frequencyChanged(int frequency) + + +static void _init_f_frequencyChanged_767 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("frequency"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_frequencyChanged_767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + int arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QRadioTuner *)cls)->frequencyChanged (arg1); +} + + // QPair QRadioTuner::frequencyRange(QRadioTuner::Band band) @@ -265,6 +345,26 @@ static void _call_f_isStereo_c0 (const qt_gsi::GenericMethod * /*decl*/, void *c } +// void QRadioTuner::mutedChanged(bool muted) + + +static void _init_f_mutedChanged_864 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("muted"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_mutedChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + bool arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QRadioTuner *)cls)->mutedChanged (arg1); +} + + // QRadioData *QRadioTuner::radioData() @@ -332,6 +432,26 @@ static void _call_f_searchForward_0 (const qt_gsi::GenericMethod * /*decl*/, voi } +// void QRadioTuner::searchingChanged(bool searching) + + +static void _init_f_searchingChanged_864 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("searching"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_searchingChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + bool arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QRadioTuner *)cls)->searchingChanged (arg1); +} + + // void QRadioTuner::setBand(QRadioTuner::Band band) @@ -447,6 +567,26 @@ static void _call_f_signalStrength_c0 (const qt_gsi::GenericMethod * /*decl*/, v } +// void QRadioTuner::signalStrengthChanged(int signalStrength) + + +static void _init_f_signalStrengthChanged_767 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("signalStrength"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_signalStrengthChanged_767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + int arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QRadioTuner *)cls)->signalStrengthChanged (arg1); +} + + // void QRadioTuner::start() @@ -478,6 +618,49 @@ static void _call_f_state_c0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, } +// void QRadioTuner::stateChanged(QRadioTuner::State state) + + +static void _init_f_stateChanged_2167 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("state"); + decl->add_arg::target_type & > (argspec_0); + decl->set_return (); +} + +static void _call_f_stateChanged_2167 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QRadioTuner *)cls)->stateChanged (qt_gsi::QtToCppAdaptor(arg1).cref()); +} + + +// void QRadioTuner::stationFound(int frequency, QString stationId) + + +static void _init_f_stationFound_1807 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("frequency"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("stationId"); + decl->add_arg (argspec_1); + decl->set_return (); +} + +static void _call_f_stationFound_1807 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + int arg1 = gsi::arg_reader() (args, heap); + QString arg2 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QRadioTuner *)cls)->stationFound (arg1, arg2); +} + + // QRadioTuner::StereoMode QRadioTuner::stereoMode() @@ -493,6 +676,26 @@ static void _call_f_stereoMode_c0 (const qt_gsi::GenericMethod * /*decl*/, void } +// void QRadioTuner::stereoStatusChanged(bool stereo) + + +static void _init_f_stereoStatusChanged_864 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("stereo"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_stereoStatusChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + bool arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QRadioTuner *)cls)->stereoStatusChanged (arg1); +} + + // void QRadioTuner::stop() @@ -524,6 +727,26 @@ static void _call_f_volume_c0 (const qt_gsi::GenericMethod * /*decl*/, void *cls } +// void QRadioTuner::volumeChanged(int volume) + + +static void _init_f_volumeChanged_767 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("volume"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_volumeChanged_767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + int arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QRadioTuner *)cls)->volumeChanged (arg1); +} + + // static QString QRadioTuner::tr(const char *s, const char *c, int n) @@ -580,12 +803,16 @@ namespace gsi static gsi::Methods methods_QRadioTuner () { gsi::Methods methods; methods += new qt_gsi::GenericStaticMethod ("staticMetaObject", "@brief Obtains the static MetaObject for this class.", &_init_smo, &_call_smo); + methods += new qt_gsi::GenericMethod ("antennaConnectedChanged", "@brief Method void QRadioTuner::antennaConnectedChanged(bool connectionStatus)\n", false, &_init_f_antennaConnectedChanged_864, &_call_f_antennaConnectedChanged_864); methods += new qt_gsi::GenericMethod ("availability", "@brief Method QMultimedia::AvailabilityStatus QRadioTuner::availability()\nThis is a reimplementation of QMediaObject::availability", true, &_init_f_availability_c0, &_call_f_availability_c0); methods += new qt_gsi::GenericMethod (":band", "@brief Method QRadioTuner::Band QRadioTuner::band()\n", true, &_init_f_band_c0, &_call_f_band_c0); + methods += new qt_gsi::GenericMethod ("bandChanged", "@brief Method void QRadioTuner::bandChanged(QRadioTuner::Band band)\n", false, &_init_f_bandChanged_2027, &_call_f_bandChanged_2027); methods += new qt_gsi::GenericMethod ("cancelSearch", "@brief Method void QRadioTuner::cancelSearch()\n", false, &_init_f_cancelSearch_0, &_call_f_cancelSearch_0); methods += new qt_gsi::GenericMethod ("error", "@brief Method QRadioTuner::Error QRadioTuner::error()\n", true, &_init_f_error_c0, &_call_f_error_c0); + methods += new qt_gsi::GenericMethod ("error_sig", "@brief Method void QRadioTuner::error(QRadioTuner::Error error)\n", false, &_init_f_error_2176, &_call_f_error_2176); methods += new qt_gsi::GenericMethod ("errorString", "@brief Method QString QRadioTuner::errorString()\n", true, &_init_f_errorString_c0, &_call_f_errorString_c0); methods += new qt_gsi::GenericMethod (":frequency", "@brief Method int QRadioTuner::frequency()\n", true, &_init_f_frequency_c0, &_call_f_frequency_c0); + methods += new qt_gsi::GenericMethod ("frequencyChanged", "@brief Method void QRadioTuner::frequencyChanged(int frequency)\n", false, &_init_f_frequencyChanged_767, &_call_f_frequencyChanged_767); methods += new qt_gsi::GenericMethod ("frequencyRange", "@brief Method QPair QRadioTuner::frequencyRange(QRadioTuner::Band band)\n", true, &_init_f_frequencyRange_c2027, &_call_f_frequencyRange_c2027); methods += new qt_gsi::GenericMethod ("frequencyStep", "@brief Method int QRadioTuner::frequencyStep(QRadioTuner::Band band)\n", true, &_init_f_frequencyStep_c2027, &_call_f_frequencyStep_c2027); methods += new qt_gsi::GenericMethod ("isAntennaConnected?|:antennaConnected", "@brief Method bool QRadioTuner::isAntennaConnected()\n", true, &_init_f_isAntennaConnected_c0, &_call_f_isAntennaConnected_c0); @@ -593,39 +820,28 @@ static gsi::Methods methods_QRadioTuner () { methods += new qt_gsi::GenericMethod ("isMuted?|:muted", "@brief Method bool QRadioTuner::isMuted()\n", true, &_init_f_isMuted_c0, &_call_f_isMuted_c0); methods += new qt_gsi::GenericMethod ("isSearching?|:searching", "@brief Method bool QRadioTuner::isSearching()\n", true, &_init_f_isSearching_c0, &_call_f_isSearching_c0); methods += new qt_gsi::GenericMethod ("isStereo?|:stereo", "@brief Method bool QRadioTuner::isStereo()\n", true, &_init_f_isStereo_c0, &_call_f_isStereo_c0); + methods += new qt_gsi::GenericMethod ("mutedChanged", "@brief Method void QRadioTuner::mutedChanged(bool muted)\n", false, &_init_f_mutedChanged_864, &_call_f_mutedChanged_864); methods += new qt_gsi::GenericMethod (":radioData", "@brief Method QRadioData *QRadioTuner::radioData()\n", true, &_init_f_radioData_c0, &_call_f_radioData_c0); methods += new qt_gsi::GenericMethod ("searchAllStations", "@brief Method void QRadioTuner::searchAllStations(QRadioTuner::SearchMode searchMode)\n", false, &_init_f_searchAllStations_2641, &_call_f_searchAllStations_2641); methods += new qt_gsi::GenericMethod ("searchBackward", "@brief Method void QRadioTuner::searchBackward()\n", false, &_init_f_searchBackward_0, &_call_f_searchBackward_0); methods += new qt_gsi::GenericMethod ("searchForward", "@brief Method void QRadioTuner::searchForward()\n", false, &_init_f_searchForward_0, &_call_f_searchForward_0); + methods += new qt_gsi::GenericMethod ("searchingChanged", "@brief Method void QRadioTuner::searchingChanged(bool searching)\n", false, &_init_f_searchingChanged_864, &_call_f_searchingChanged_864); methods += new qt_gsi::GenericMethod ("setBand|band=", "@brief Method void QRadioTuner::setBand(QRadioTuner::Band band)\n", false, &_init_f_setBand_2027, &_call_f_setBand_2027); methods += new qt_gsi::GenericMethod ("setFrequency|frequency=", "@brief Method void QRadioTuner::setFrequency(int frequency)\n", false, &_init_f_setFrequency_767, &_call_f_setFrequency_767); methods += new qt_gsi::GenericMethod ("setMuted|muted=", "@brief Method void QRadioTuner::setMuted(bool muted)\n", false, &_init_f_setMuted_864, &_call_f_setMuted_864); methods += new qt_gsi::GenericMethod ("setStereoMode|stereoMode=", "@brief Method void QRadioTuner::setStereoMode(QRadioTuner::StereoMode mode)\n", false, &_init_f_setStereoMode_2669, &_call_f_setStereoMode_2669); methods += new qt_gsi::GenericMethod ("setVolume|volume=", "@brief Method void QRadioTuner::setVolume(int volume)\n", false, &_init_f_setVolume_767, &_call_f_setVolume_767); methods += new qt_gsi::GenericMethod (":signalStrength", "@brief Method int QRadioTuner::signalStrength()\n", true, &_init_f_signalStrength_c0, &_call_f_signalStrength_c0); + methods += new qt_gsi::GenericMethod ("signalStrengthChanged", "@brief Method void QRadioTuner::signalStrengthChanged(int signalStrength)\n", false, &_init_f_signalStrengthChanged_767, &_call_f_signalStrengthChanged_767); methods += new qt_gsi::GenericMethod ("start", "@brief Method void QRadioTuner::start()\n", false, &_init_f_start_0, &_call_f_start_0); methods += new qt_gsi::GenericMethod (":state", "@brief Method QRadioTuner::State QRadioTuner::state()\n", true, &_init_f_state_c0, &_call_f_state_c0); + methods += new qt_gsi::GenericMethod ("stateChanged", "@brief Method void QRadioTuner::stateChanged(QRadioTuner::State state)\n", false, &_init_f_stateChanged_2167, &_call_f_stateChanged_2167); + methods += new qt_gsi::GenericMethod ("stationFound", "@brief Method void QRadioTuner::stationFound(int frequency, QString stationId)\n", false, &_init_f_stationFound_1807, &_call_f_stationFound_1807); methods += new qt_gsi::GenericMethod (":stereoMode", "@brief Method QRadioTuner::StereoMode QRadioTuner::stereoMode()\n", true, &_init_f_stereoMode_c0, &_call_f_stereoMode_c0); + methods += new qt_gsi::GenericMethod ("stereoStatusChanged", "@brief Method void QRadioTuner::stereoStatusChanged(bool stereo)\n", false, &_init_f_stereoStatusChanged_864, &_call_f_stereoStatusChanged_864); methods += new qt_gsi::GenericMethod ("stop", "@brief Method void QRadioTuner::stop()\n", false, &_init_f_stop_0, &_call_f_stop_0); methods += new qt_gsi::GenericMethod (":volume", "@brief Method int QRadioTuner::volume()\n", true, &_init_f_volume_c0, &_call_f_volume_c0); - methods += gsi::qt_signal ("antennaConnectedChanged(bool)", "antennaConnectedChanged", gsi::arg("connectionStatus"), "@brief Signal declaration for QRadioTuner::antennaConnectedChanged(bool connectionStatus)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("availabilityChanged(bool)", "availabilityChanged_bool", gsi::arg("available"), "@brief Signal declaration for QRadioTuner::availabilityChanged(bool available)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal::target_type & > ("availabilityChanged(QMultimedia::AvailabilityStatus)", "availabilityChanged_status", gsi::arg("availability"), "@brief Signal declaration for QRadioTuner::availabilityChanged(QMultimedia::AvailabilityStatus availability)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal::target_type & > ("bandChanged(QRadioTuner::Band)", "bandChanged", gsi::arg("band"), "@brief Signal declaration for QRadioTuner::bandChanged(QRadioTuner::Band band)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QRadioTuner::destroyed(QObject *)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal::target_type & > ("error(QRadioTuner::Error)", "error_sig", gsi::arg("error"), "@brief Signal declaration for QRadioTuner::error(QRadioTuner::Error error)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("frequencyChanged(int)", "frequencyChanged", gsi::arg("frequency"), "@brief Signal declaration for QRadioTuner::frequencyChanged(int frequency)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("metaDataAvailableChanged(bool)", "metaDataAvailableChanged", gsi::arg("available"), "@brief Signal declaration for QRadioTuner::metaDataAvailableChanged(bool available)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("metaDataChanged()", "metaDataChanged", "@brief Signal declaration for QRadioTuner::metaDataChanged()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("metaDataChanged(const QString &, const QVariant &)", "metaDataChanged_kv", gsi::arg("key"), gsi::arg("value"), "@brief Signal declaration for QRadioTuner::metaDataChanged(const QString &key, const QVariant &value)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("mutedChanged(bool)", "mutedChanged", gsi::arg("muted"), "@brief Signal declaration for QRadioTuner::mutedChanged(bool muted)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("notifyIntervalChanged(int)", "notifyIntervalChanged", gsi::arg("milliSeconds"), "@brief Signal declaration for QRadioTuner::notifyIntervalChanged(int milliSeconds)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("searchingChanged(bool)", "searchingChanged", gsi::arg("searching"), "@brief Signal declaration for QRadioTuner::searchingChanged(bool searching)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("signalStrengthChanged(int)", "signalStrengthChanged", gsi::arg("signalStrength"), "@brief Signal declaration for QRadioTuner::signalStrengthChanged(int signalStrength)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal::target_type & > ("stateChanged(QRadioTuner::State)", "stateChanged", gsi::arg("state"), "@brief Signal declaration for QRadioTuner::stateChanged(QRadioTuner::State state)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("stationFound(int, QString)", "stationFound", gsi::arg("frequency"), gsi::arg("stationId"), "@brief Signal declaration for QRadioTuner::stationFound(int frequency, QString stationId)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("stereoStatusChanged(bool)", "stereoStatusChanged", gsi::arg("stereo"), "@brief Signal declaration for QRadioTuner::stereoStatusChanged(bool stereo)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("volumeChanged(int)", "volumeChanged", gsi::arg("volume"), "@brief Signal declaration for QRadioTuner::volumeChanged(int volume)\nYou can bind a procedure to this signal."); + methods += new qt_gsi::GenericMethod ("volumeChanged", "@brief Method void QRadioTuner::volumeChanged(int volume)\n", false, &_init_f_volumeChanged_767, &_call_f_volumeChanged_767); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QRadioTuner::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QRadioTuner::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -690,12 +906,6 @@ public: return QRadioTuner::senderSignalIndex(); } - // [emitter impl] void QRadioTuner::antennaConnectedChanged(bool connectionStatus) - void emitter_QRadioTuner_antennaConnectedChanged_864(bool connectionStatus) - { - emit QRadioTuner::antennaConnectedChanged(connectionStatus); - } - // [adaptor impl] QMultimedia::AvailabilityStatus QRadioTuner::availability() qt_gsi::Converter::target_type cbs_availability_c0_0() const { @@ -711,24 +921,6 @@ public: } } - // [emitter impl] void QRadioTuner::availabilityChanged(bool available) - void emitter_QRadioTuner_availabilityChanged_864(bool available) - { - emit QRadioTuner::availabilityChanged(available); - } - - // [emitter impl] void QRadioTuner::availabilityChanged(QMultimedia::AvailabilityStatus availability) - void emitter_QRadioTuner_availabilityChanged_3555(QMultimedia::AvailabilityStatus availability) - { - emit QRadioTuner::availabilityChanged(availability); - } - - // [emitter impl] void QRadioTuner::bandChanged(QRadioTuner::Band band) - void emitter_QRadioTuner_bandChanged_2027(QRadioTuner::Band band) - { - emit QRadioTuner::bandChanged(band); - } - // [adaptor impl] bool QRadioTuner::bind(QObject *) bool cbs_bind_1302_0(QObject *arg1) { @@ -744,18 +936,6 @@ public: } } - // [emitter impl] void QRadioTuner::destroyed(QObject *) - void emitter_QRadioTuner_destroyed_1302(QObject *arg1) - { - emit QRadioTuner::destroyed(arg1); - } - - // [emitter impl] void QRadioTuner::error(QRadioTuner::Error error) - void emitter_QRadioTuner_error_2176(QRadioTuner::Error _error) - { - emit QRadioTuner::error(_error); - } - // [adaptor impl] bool QRadioTuner::event(QEvent *) bool cbs_event_1217_0(QEvent *arg1) { @@ -786,12 +966,6 @@ public: } } - // [emitter impl] void QRadioTuner::frequencyChanged(int frequency) - void emitter_QRadioTuner_frequencyChanged_767(int frequency) - { - emit QRadioTuner::frequencyChanged(frequency); - } - // [adaptor impl] bool QRadioTuner::isAvailable() bool cbs_isAvailable_c0_0() const { @@ -807,42 +981,6 @@ public: } } - // [emitter impl] void QRadioTuner::metaDataAvailableChanged(bool available) - void emitter_QRadioTuner_metaDataAvailableChanged_864(bool available) - { - emit QRadioTuner::metaDataAvailableChanged(available); - } - - // [emitter impl] void QRadioTuner::metaDataChanged() - void emitter_QRadioTuner_metaDataChanged_0() - { - emit QRadioTuner::metaDataChanged(); - } - - // [emitter impl] void QRadioTuner::metaDataChanged(const QString &key, const QVariant &value) - void emitter_QRadioTuner_metaDataChanged_4036(const QString &key, const QVariant &value) - { - emit QRadioTuner::metaDataChanged(key, value); - } - - // [emitter impl] void QRadioTuner::mutedChanged(bool muted) - void emitter_QRadioTuner_mutedChanged_864(bool muted) - { - emit QRadioTuner::mutedChanged(muted); - } - - // [emitter impl] void QRadioTuner::notifyIntervalChanged(int milliSeconds) - void emitter_QRadioTuner_notifyIntervalChanged_767(int milliSeconds) - { - emit QRadioTuner::notifyIntervalChanged(milliSeconds); - } - - // [emitter impl] void QRadioTuner::searchingChanged(bool searching) - void emitter_QRadioTuner_searchingChanged_864(bool searching) - { - emit QRadioTuner::searchingChanged(searching); - } - // [adaptor impl] QMediaService *QRadioTuner::service() QMediaService * cbs_service_c0_0() const { @@ -858,30 +996,6 @@ public: } } - // [emitter impl] void QRadioTuner::signalStrengthChanged(int signalStrength) - void emitter_QRadioTuner_signalStrengthChanged_767(int signalStrength) - { - emit QRadioTuner::signalStrengthChanged(signalStrength); - } - - // [emitter impl] void QRadioTuner::stateChanged(QRadioTuner::State state) - void emitter_QRadioTuner_stateChanged_2167(QRadioTuner::State state) - { - emit QRadioTuner::stateChanged(state); - } - - // [emitter impl] void QRadioTuner::stationFound(int frequency, QString stationId) - void emitter_QRadioTuner_stationFound_1807(int frequency, QString stationId) - { - emit QRadioTuner::stationFound(frequency, stationId); - } - - // [emitter impl] void QRadioTuner::stereoStatusChanged(bool stereo) - void emitter_QRadioTuner_stereoStatusChanged_864(bool stereo) - { - emit QRadioTuner::stereoStatusChanged(stereo); - } - // [adaptor impl] void QRadioTuner::unbind(QObject *) void cbs_unbind_1302_0(QObject *arg1) { @@ -897,12 +1011,6 @@ public: } } - // [emitter impl] void QRadioTuner::volumeChanged(int volume) - void emitter_QRadioTuner_volumeChanged_767(int volume) - { - emit QRadioTuner::volumeChanged(volume); - } - // [adaptor impl] void QRadioTuner::childEvent(QChildEvent *) void cbs_childEvent_1701_0(QChildEvent *arg1) { @@ -1015,24 +1123,6 @@ static void _call_fp_addPropertyWatch_2309 (const qt_gsi::GenericMethod * /*decl } -// emitter void QRadioTuner::antennaConnectedChanged(bool connectionStatus) - -static void _init_emitter_antennaConnectedChanged_864 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("connectionStatus"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_antennaConnectedChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - bool arg1 = gsi::arg_reader() (args, heap); - ((QRadioTuner_Adaptor *)cls)->emitter_QRadioTuner_antennaConnectedChanged_864 (arg1); -} - - // QMultimedia::AvailabilityStatus QRadioTuner::availability() static void _init_cbs_availability_c0_0 (qt_gsi::GenericMethod *decl) @@ -1052,60 +1142,6 @@ static void _set_callback_cbs_availability_c0_0 (void *cls, const gsi::Callback } -// emitter void QRadioTuner::availabilityChanged(bool available) - -static void _init_emitter_availabilityChanged_864 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("available"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_availabilityChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - bool arg1 = gsi::arg_reader() (args, heap); - ((QRadioTuner_Adaptor *)cls)->emitter_QRadioTuner_availabilityChanged_864 (arg1); -} - - -// emitter void QRadioTuner::availabilityChanged(QMultimedia::AvailabilityStatus availability) - -static void _init_emitter_availabilityChanged_3555 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("availability"); - decl->add_arg::target_type & > (argspec_0); - decl->set_return (); -} - -static void _call_emitter_availabilityChanged_3555 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); - ((QRadioTuner_Adaptor *)cls)->emitter_QRadioTuner_availabilityChanged_3555 (arg1); -} - - -// emitter void QRadioTuner::bandChanged(QRadioTuner::Band band) - -static void _init_emitter_bandChanged_2027 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("band"); - decl->add_arg::target_type & > (argspec_0); - decl->set_return (); -} - -static void _call_emitter_bandChanged_2027 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); - ((QRadioTuner_Adaptor *)cls)->emitter_QRadioTuner_bandChanged_2027 (arg1); -} - - // bool QRadioTuner::bind(QObject *) static void _init_cbs_bind_1302_0 (qt_gsi::GenericMethod *decl) @@ -1177,24 +1213,6 @@ static void _set_callback_cbs_customEvent_1217_0 (void *cls, const gsi::Callback } -// emitter void QRadioTuner::destroyed(QObject *) - -static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - ((QRadioTuner_Adaptor *)cls)->emitter_QRadioTuner_destroyed_1302 (arg1); -} - - // void QRadioTuner::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -1219,24 +1237,6 @@ static void _set_callback_cbs_disconnectNotify_2394_0 (void *cls, const gsi::Cal } -// emitter void QRadioTuner::error(QRadioTuner::Error error) - -static void _init_emitter_error_2176 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("error"); - decl->add_arg::target_type & > (argspec_0); - decl->set_return (); -} - -static void _call_emitter_error_2176 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); - ((QRadioTuner_Adaptor *)cls)->emitter_QRadioTuner_error_2176 (arg1); -} - - // bool QRadioTuner::event(QEvent *) static void _init_cbs_event_1217_0 (qt_gsi::GenericMethod *decl) @@ -1286,24 +1286,6 @@ static void _set_callback_cbs_eventFilter_2411_0 (void *cls, const gsi::Callback } -// emitter void QRadioTuner::frequencyChanged(int frequency) - -static void _init_emitter_frequencyChanged_767 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("frequency"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_frequencyChanged_767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - int arg1 = gsi::arg_reader() (args, heap); - ((QRadioTuner_Adaptor *)cls)->emitter_QRadioTuner_frequencyChanged_767 (arg1); -} - - // bool QRadioTuner::isAvailable() static void _init_cbs_isAvailable_c0_0 (qt_gsi::GenericMethod *decl) @@ -1341,95 +1323,6 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } -// emitter void QRadioTuner::metaDataAvailableChanged(bool available) - -static void _init_emitter_metaDataAvailableChanged_864 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("available"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_metaDataAvailableChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - bool arg1 = gsi::arg_reader() (args, heap); - ((QRadioTuner_Adaptor *)cls)->emitter_QRadioTuner_metaDataAvailableChanged_864 (arg1); -} - - -// emitter void QRadioTuner::metaDataChanged() - -static void _init_emitter_metaDataChanged_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_metaDataChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QRadioTuner_Adaptor *)cls)->emitter_QRadioTuner_metaDataChanged_0 (); -} - - -// emitter void QRadioTuner::metaDataChanged(const QString &key, const QVariant &value) - -static void _init_emitter_metaDataChanged_4036 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("key"); - decl->add_arg (argspec_0); - static gsi::ArgSpecBase argspec_1 ("value"); - decl->add_arg (argspec_1); - decl->set_return (); -} - -static void _call_emitter_metaDataChanged_4036 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const QString &arg1 = gsi::arg_reader() (args, heap); - const QVariant &arg2 = gsi::arg_reader() (args, heap); - ((QRadioTuner_Adaptor *)cls)->emitter_QRadioTuner_metaDataChanged_4036 (arg1, arg2); -} - - -// emitter void QRadioTuner::mutedChanged(bool muted) - -static void _init_emitter_mutedChanged_864 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("muted"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_mutedChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - bool arg1 = gsi::arg_reader() (args, heap); - ((QRadioTuner_Adaptor *)cls)->emitter_QRadioTuner_mutedChanged_864 (arg1); -} - - -// emitter void QRadioTuner::notifyIntervalChanged(int milliSeconds) - -static void _init_emitter_notifyIntervalChanged_767 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("milliSeconds"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_notifyIntervalChanged_767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - int arg1 = gsi::arg_reader() (args, heap); - ((QRadioTuner_Adaptor *)cls)->emitter_QRadioTuner_notifyIntervalChanged_767 (arg1); -} - - // exposed int QRadioTuner::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -1467,24 +1360,6 @@ static void _call_fp_removePropertyWatch_2309 (const qt_gsi::GenericMethod * /*d } -// emitter void QRadioTuner::searchingChanged(bool searching) - -static void _init_emitter_searchingChanged_864 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("searching"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_searchingChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - bool arg1 = gsi::arg_reader() (args, heap); - ((QRadioTuner_Adaptor *)cls)->emitter_QRadioTuner_searchingChanged_864 (arg1); -} - - // exposed QObject *QRadioTuner::sender() static void _init_fp_sender_c0 (qt_gsi::GenericMethod *decl) @@ -1532,81 +1407,6 @@ static void _set_callback_cbs_service_c0_0 (void *cls, const gsi::Callback &cb) } -// emitter void QRadioTuner::signalStrengthChanged(int signalStrength) - -static void _init_emitter_signalStrengthChanged_767 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("signalStrength"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_signalStrengthChanged_767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - int arg1 = gsi::arg_reader() (args, heap); - ((QRadioTuner_Adaptor *)cls)->emitter_QRadioTuner_signalStrengthChanged_767 (arg1); -} - - -// emitter void QRadioTuner::stateChanged(QRadioTuner::State state) - -static void _init_emitter_stateChanged_2167 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("state"); - decl->add_arg::target_type & > (argspec_0); - decl->set_return (); -} - -static void _call_emitter_stateChanged_2167 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); - ((QRadioTuner_Adaptor *)cls)->emitter_QRadioTuner_stateChanged_2167 (arg1); -} - - -// emitter void QRadioTuner::stationFound(int frequency, QString stationId) - -static void _init_emitter_stationFound_1807 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("frequency"); - decl->add_arg (argspec_0); - static gsi::ArgSpecBase argspec_1 ("stationId"); - decl->add_arg (argspec_1); - decl->set_return (); -} - -static void _call_emitter_stationFound_1807 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - int arg1 = gsi::arg_reader() (args, heap); - QString arg2 = gsi::arg_reader() (args, heap); - ((QRadioTuner_Adaptor *)cls)->emitter_QRadioTuner_stationFound_1807 (arg1, arg2); -} - - -// emitter void QRadioTuner::stereoStatusChanged(bool stereo) - -static void _init_emitter_stereoStatusChanged_864 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("stereo"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_stereoStatusChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - bool arg1 = gsi::arg_reader() (args, heap); - ((QRadioTuner_Adaptor *)cls)->emitter_QRadioTuner_stereoStatusChanged_864 (arg1); -} - - // void QRadioTuner::timerEvent(QTimerEvent *) static void _init_cbs_timerEvent_1730_0 (qt_gsi::GenericMethod *decl) @@ -1655,24 +1455,6 @@ static void _set_callback_cbs_unbind_1302_0 (void *cls, const gsi::Callback &cb) } -// emitter void QRadioTuner::volumeChanged(int volume) - -static void _init_emitter_volumeChanged_767 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("volume"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_volumeChanged_767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - int arg1 = gsi::arg_reader() (args, heap); - ((QRadioTuner_Adaptor *)cls)->emitter_QRadioTuner_volumeChanged_767 (arg1); -} - - namespace gsi { @@ -1682,51 +1464,33 @@ static gsi::Methods methods_QRadioTuner_Adaptor () { gsi::Methods methods; methods += new qt_gsi::GenericStaticMethod ("new", "@brief Constructor QRadioTuner::QRadioTuner(QObject *parent)\nThis method creates an object of class QRadioTuner.", &_init_ctor_QRadioTuner_Adaptor_1302, &_call_ctor_QRadioTuner_Adaptor_1302); methods += new qt_gsi::GenericMethod ("*addPropertyWatch", "@brief Method void QRadioTuner::addPropertyWatch(QByteArray const &name)\nThis method is protected and can only be called from inside a derived class.", false, &_init_fp_addPropertyWatch_2309, &_call_fp_addPropertyWatch_2309); - methods += new qt_gsi::GenericMethod ("emit_antennaConnectedChanged", "@brief Emitter for signal void QRadioTuner::antennaConnectedChanged(bool connectionStatus)\nCall this method to emit this signal.", false, &_init_emitter_antennaConnectedChanged_864, &_call_emitter_antennaConnectedChanged_864); methods += new qt_gsi::GenericMethod ("availability", "@brief Virtual method QMultimedia::AvailabilityStatus QRadioTuner::availability()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_availability_c0_0, &_call_cbs_availability_c0_0); methods += new qt_gsi::GenericMethod ("availability", "@hide", true, &_init_cbs_availability_c0_0, &_call_cbs_availability_c0_0, &_set_callback_cbs_availability_c0_0); - methods += new qt_gsi::GenericMethod ("emit_availabilityChanged_bool", "@brief Emitter for signal void QRadioTuner::availabilityChanged(bool available)\nCall this method to emit this signal.", false, &_init_emitter_availabilityChanged_864, &_call_emitter_availabilityChanged_864); - methods += new qt_gsi::GenericMethod ("emit_availabilityChanged_status", "@brief Emitter for signal void QRadioTuner::availabilityChanged(QMultimedia::AvailabilityStatus availability)\nCall this method to emit this signal.", false, &_init_emitter_availabilityChanged_3555, &_call_emitter_availabilityChanged_3555); - methods += new qt_gsi::GenericMethod ("emit_bandChanged", "@brief Emitter for signal void QRadioTuner::bandChanged(QRadioTuner::Band band)\nCall this method to emit this signal.", false, &_init_emitter_bandChanged_2027, &_call_emitter_bandChanged_2027); methods += new qt_gsi::GenericMethod ("bind", "@brief Virtual method bool QRadioTuner::bind(QObject *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_bind_1302_0, &_call_cbs_bind_1302_0); methods += new qt_gsi::GenericMethod ("bind", "@hide", false, &_init_cbs_bind_1302_0, &_call_cbs_bind_1302_0, &_set_callback_cbs_bind_1302_0); methods += new qt_gsi::GenericMethod ("*childEvent", "@brief Virtual method void QRadioTuner::childEvent(QChildEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QRadioTuner::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); - methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QRadioTuner::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QRadioTuner::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); - methods += new qt_gsi::GenericMethod ("emit_error_sig", "@brief Emitter for signal void QRadioTuner::error(QRadioTuner::Error error)\nCall this method to emit this signal.", false, &_init_emitter_error_2176, &_call_emitter_error_2176); methods += new qt_gsi::GenericMethod ("event", "@brief Virtual method bool QRadioTuner::event(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0); methods += new qt_gsi::GenericMethod ("event", "@hide", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0, &_set_callback_cbs_event_1217_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QRadioTuner::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); - methods += new qt_gsi::GenericMethod ("emit_frequencyChanged", "@brief Emitter for signal void QRadioTuner::frequencyChanged(int frequency)\nCall this method to emit this signal.", false, &_init_emitter_frequencyChanged_767, &_call_emitter_frequencyChanged_767); methods += new qt_gsi::GenericMethod ("isAvailable", "@brief Virtual method bool QRadioTuner::isAvailable()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_isAvailable_c0_0, &_call_cbs_isAvailable_c0_0); methods += new qt_gsi::GenericMethod ("isAvailable", "@hide", true, &_init_cbs_isAvailable_c0_0, &_call_cbs_isAvailable_c0_0, &_set_callback_cbs_isAvailable_c0_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QRadioTuner::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); - methods += new qt_gsi::GenericMethod ("emit_metaDataAvailableChanged", "@brief Emitter for signal void QRadioTuner::metaDataAvailableChanged(bool available)\nCall this method to emit this signal.", false, &_init_emitter_metaDataAvailableChanged_864, &_call_emitter_metaDataAvailableChanged_864); - methods += new qt_gsi::GenericMethod ("emit_metaDataChanged", "@brief Emitter for signal void QRadioTuner::metaDataChanged()\nCall this method to emit this signal.", false, &_init_emitter_metaDataChanged_0, &_call_emitter_metaDataChanged_0); - methods += new qt_gsi::GenericMethod ("emit_metaDataChanged_kv", "@brief Emitter for signal void QRadioTuner::metaDataChanged(const QString &key, const QVariant &value)\nCall this method to emit this signal.", false, &_init_emitter_metaDataChanged_4036, &_call_emitter_metaDataChanged_4036); - methods += new qt_gsi::GenericMethod ("emit_mutedChanged", "@brief Emitter for signal void QRadioTuner::mutedChanged(bool muted)\nCall this method to emit this signal.", false, &_init_emitter_mutedChanged_864, &_call_emitter_mutedChanged_864); - methods += new qt_gsi::GenericMethod ("emit_notifyIntervalChanged", "@brief Emitter for signal void QRadioTuner::notifyIntervalChanged(int milliSeconds)\nCall this method to emit this signal.", false, &_init_emitter_notifyIntervalChanged_767, &_call_emitter_notifyIntervalChanged_767); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QRadioTuner::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*removePropertyWatch", "@brief Method void QRadioTuner::removePropertyWatch(QByteArray const &name)\nThis method is protected and can only be called from inside a derived class.", false, &_init_fp_removePropertyWatch_2309, &_call_fp_removePropertyWatch_2309); - methods += new qt_gsi::GenericMethod ("emit_searchingChanged", "@brief Emitter for signal void QRadioTuner::searchingChanged(bool searching)\nCall this method to emit this signal.", false, &_init_emitter_searchingChanged_864, &_call_emitter_searchingChanged_864); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QRadioTuner::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QRadioTuner::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); methods += new qt_gsi::GenericMethod ("service", "@brief Virtual method QMediaService *QRadioTuner::service()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_service_c0_0, &_call_cbs_service_c0_0); methods += new qt_gsi::GenericMethod ("service", "@hide", true, &_init_cbs_service_c0_0, &_call_cbs_service_c0_0, &_set_callback_cbs_service_c0_0); - methods += new qt_gsi::GenericMethod ("emit_signalStrengthChanged", "@brief Emitter for signal void QRadioTuner::signalStrengthChanged(int signalStrength)\nCall this method to emit this signal.", false, &_init_emitter_signalStrengthChanged_767, &_call_emitter_signalStrengthChanged_767); - methods += new qt_gsi::GenericMethod ("emit_stateChanged", "@brief Emitter for signal void QRadioTuner::stateChanged(QRadioTuner::State state)\nCall this method to emit this signal.", false, &_init_emitter_stateChanged_2167, &_call_emitter_stateChanged_2167); - methods += new qt_gsi::GenericMethod ("emit_stationFound", "@brief Emitter for signal void QRadioTuner::stationFound(int frequency, QString stationId)\nCall this method to emit this signal.", false, &_init_emitter_stationFound_1807, &_call_emitter_stationFound_1807); - methods += new qt_gsi::GenericMethod ("emit_stereoStatusChanged", "@brief Emitter for signal void QRadioTuner::stereoStatusChanged(bool stereo)\nCall this method to emit this signal.", false, &_init_emitter_stereoStatusChanged_864, &_call_emitter_stereoStatusChanged_864); methods += new qt_gsi::GenericMethod ("*timerEvent", "@brief Virtual method void QRadioTuner::timerEvent(QTimerEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_timerEvent_1730_0, &_call_cbs_timerEvent_1730_0); methods += new qt_gsi::GenericMethod ("*timerEvent", "@hide", false, &_init_cbs_timerEvent_1730_0, &_call_cbs_timerEvent_1730_0, &_set_callback_cbs_timerEvent_1730_0); methods += new qt_gsi::GenericMethod ("unbind", "@brief Virtual method void QRadioTuner::unbind(QObject *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_unbind_1302_0, &_call_cbs_unbind_1302_0); methods += new qt_gsi::GenericMethod ("unbind", "@hide", false, &_init_cbs_unbind_1302_0, &_call_cbs_unbind_1302_0, &_set_callback_cbs_unbind_1302_0); - methods += new qt_gsi::GenericMethod ("emit_volumeChanged", "@brief Emitter for signal void QRadioTuner::volumeChanged(int volume)\nCall this method to emit this signal.", false, &_init_emitter_volumeChanged_767, &_call_emitter_volumeChanged_767); return methods; } diff --git a/src/gsiqt/qt5/QtMultimedia/gsiDeclQRadioTunerControl.cc b/src/gsiqt/qt5/QtMultimedia/gsiDeclQRadioTunerControl.cc index 19683f846..f430f7ae9 100644 --- a/src/gsiqt/qt5/QtMultimedia/gsiDeclQRadioTunerControl.cc +++ b/src/gsiqt/qt5/QtMultimedia/gsiDeclQRadioTunerControl.cc @@ -55,6 +55,26 @@ static void _call_smo (const qt_gsi::GenericStaticMethod *, gsi::SerialArgs &, g } +// void QRadioTunerControl::antennaConnectedChanged(bool connectionStatus) + + +static void _init_f_antennaConnectedChanged_864 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("connectionStatus"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_antennaConnectedChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + bool arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QRadioTunerControl *)cls)->antennaConnectedChanged (arg1); +} + + // QRadioTuner::Band QRadioTunerControl::band() @@ -70,6 +90,26 @@ static void _call_f_band_c0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, } +// void QRadioTunerControl::bandChanged(QRadioTuner::Band band) + + +static void _init_f_bandChanged_2027 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("band"); + decl->add_arg::target_type & > (argspec_0); + decl->set_return (); +} + +static void _call_f_bandChanged_2027 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QRadioTunerControl *)cls)->bandChanged (qt_gsi::QtToCppAdaptor(arg1).cref()); +} + + // void QRadioTunerControl::cancelSearch() @@ -101,6 +141,26 @@ static void _call_f_error_c0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, } +// void QRadioTunerControl::error(QRadioTuner::Error err) + + +static void _init_f_error_2176 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("err"); + decl->add_arg::target_type & > (argspec_0); + decl->set_return (); +} + +static void _call_f_error_2176 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QRadioTunerControl *)cls)->error (qt_gsi::QtToCppAdaptor(arg1).cref()); +} + + // QString QRadioTunerControl::errorString() @@ -131,6 +191,26 @@ static void _call_f_frequency_c0 (const qt_gsi::GenericMethod * /*decl*/, void * } +// void QRadioTunerControl::frequencyChanged(int frequency) + + +static void _init_f_frequencyChanged_767 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("frequency"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_frequencyChanged_767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + int arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QRadioTunerControl *)cls)->frequencyChanged (arg1); +} + + // QPair QRadioTunerControl::frequencyRange(QRadioTuner::Band b) @@ -248,6 +328,26 @@ static void _call_f_isStereo_c0 (const qt_gsi::GenericMethod * /*decl*/, void *c } +// void QRadioTunerControl::mutedChanged(bool muted) + + +static void _init_f_mutedChanged_864 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("muted"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_mutedChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + bool arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QRadioTunerControl *)cls)->mutedChanged (arg1); +} + + // void QRadioTunerControl::searchAllStations(QRadioTuner::SearchMode searchMode) @@ -300,6 +400,26 @@ static void _call_f_searchForward_0 (const qt_gsi::GenericMethod * /*decl*/, voi } +// void QRadioTunerControl::searchingChanged(bool searching) + + +static void _init_f_searchingChanged_864 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("searching"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_searchingChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + bool arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QRadioTunerControl *)cls)->searchingChanged (arg1); +} + + // void QRadioTunerControl::setBand(QRadioTuner::Band b) @@ -415,6 +535,26 @@ static void _call_f_signalStrength_c0 (const qt_gsi::GenericMethod * /*decl*/, v } +// void QRadioTunerControl::signalStrengthChanged(int signalStrength) + + +static void _init_f_signalStrengthChanged_767 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("signalStrength"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_signalStrengthChanged_767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + int arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QRadioTunerControl *)cls)->signalStrengthChanged (arg1); +} + + // void QRadioTunerControl::start() @@ -446,6 +586,49 @@ static void _call_f_state_c0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, } +// void QRadioTunerControl::stateChanged(QRadioTuner::State state) + + +static void _init_f_stateChanged_2167 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("state"); + decl->add_arg::target_type & > (argspec_0); + decl->set_return (); +} + +static void _call_f_stateChanged_2167 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QRadioTunerControl *)cls)->stateChanged (qt_gsi::QtToCppAdaptor(arg1).cref()); +} + + +// void QRadioTunerControl::stationFound(int frequency, QString stationId) + + +static void _init_f_stationFound_1807 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("frequency"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("stationId"); + decl->add_arg (argspec_1); + decl->set_return (); +} + +static void _call_f_stationFound_1807 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + int arg1 = gsi::arg_reader() (args, heap); + QString arg2 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QRadioTunerControl *)cls)->stationFound (arg1, arg2); +} + + // QRadioTuner::StereoMode QRadioTunerControl::stereoMode() @@ -461,6 +644,26 @@ static void _call_f_stereoMode_c0 (const qt_gsi::GenericMethod * /*decl*/, void } +// void QRadioTunerControl::stereoStatusChanged(bool stereo) + + +static void _init_f_stereoStatusChanged_864 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("stereo"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_stereoStatusChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + bool arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QRadioTunerControl *)cls)->stereoStatusChanged (arg1); +} + + // void QRadioTunerControl::stop() @@ -492,6 +695,26 @@ static void _call_f_volume_c0 (const qt_gsi::GenericMethod * /*decl*/, void *cls } +// void QRadioTunerControl::volumeChanged(int volume) + + +static void _init_f_volumeChanged_767 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("volume"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_volumeChanged_767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + int arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QRadioTunerControl *)cls)->volumeChanged (arg1); +} + + // static QString QRadioTunerControl::tr(const char *s, const char *c, int n) @@ -548,11 +771,15 @@ namespace gsi static gsi::Methods methods_QRadioTunerControl () { gsi::Methods methods; methods += new qt_gsi::GenericStaticMethod ("staticMetaObject", "@brief Obtains the static MetaObject for this class.", &_init_smo, &_call_smo); + methods += new qt_gsi::GenericMethod ("antennaConnectedChanged", "@brief Method void QRadioTunerControl::antennaConnectedChanged(bool connectionStatus)\n", false, &_init_f_antennaConnectedChanged_864, &_call_f_antennaConnectedChanged_864); methods += new qt_gsi::GenericMethod (":band", "@brief Method QRadioTuner::Band QRadioTunerControl::band()\n", true, &_init_f_band_c0, &_call_f_band_c0); + methods += new qt_gsi::GenericMethod ("bandChanged", "@brief Method void QRadioTunerControl::bandChanged(QRadioTuner::Band band)\n", false, &_init_f_bandChanged_2027, &_call_f_bandChanged_2027); methods += new qt_gsi::GenericMethod ("cancelSearch", "@brief Method void QRadioTunerControl::cancelSearch()\n", false, &_init_f_cancelSearch_0, &_call_f_cancelSearch_0); methods += new qt_gsi::GenericMethod ("error", "@brief Method QRadioTuner::Error QRadioTunerControl::error()\n", true, &_init_f_error_c0, &_call_f_error_c0); + methods += new qt_gsi::GenericMethod ("error_sig", "@brief Method void QRadioTunerControl::error(QRadioTuner::Error err)\n", false, &_init_f_error_2176, &_call_f_error_2176); methods += new qt_gsi::GenericMethod ("errorString", "@brief Method QString QRadioTunerControl::errorString()\n", true, &_init_f_errorString_c0, &_call_f_errorString_c0); methods += new qt_gsi::GenericMethod (":frequency", "@brief Method int QRadioTunerControl::frequency()\n", true, &_init_f_frequency_c0, &_call_f_frequency_c0); + methods += new qt_gsi::GenericMethod ("frequencyChanged", "@brief Method void QRadioTunerControl::frequencyChanged(int frequency)\n", false, &_init_f_frequencyChanged_767, &_call_f_frequencyChanged_767); methods += new qt_gsi::GenericMethod ("frequencyRange", "@brief Method QPair QRadioTunerControl::frequencyRange(QRadioTuner::Band b)\n", true, &_init_f_frequencyRange_c2027, &_call_f_frequencyRange_c2027); methods += new qt_gsi::GenericMethod ("frequencyStep", "@brief Method int QRadioTunerControl::frequencyStep(QRadioTuner::Band b)\n", true, &_init_f_frequencyStep_c2027, &_call_f_frequencyStep_c2027); methods += new qt_gsi::GenericMethod ("isAntennaConnected?", "@brief Method bool QRadioTunerControl::isAntennaConnected()\n", true, &_init_f_isAntennaConnected_c0, &_call_f_isAntennaConnected_c0); @@ -560,32 +787,27 @@ static gsi::Methods methods_QRadioTunerControl () { methods += new qt_gsi::GenericMethod ("isMuted?|:muted", "@brief Method bool QRadioTunerControl::isMuted()\n", true, &_init_f_isMuted_c0, &_call_f_isMuted_c0); methods += new qt_gsi::GenericMethod ("isSearching?", "@brief Method bool QRadioTunerControl::isSearching()\n", true, &_init_f_isSearching_c0, &_call_f_isSearching_c0); methods += new qt_gsi::GenericMethod ("isStereo?", "@brief Method bool QRadioTunerControl::isStereo()\n", true, &_init_f_isStereo_c0, &_call_f_isStereo_c0); + methods += new qt_gsi::GenericMethod ("mutedChanged", "@brief Method void QRadioTunerControl::mutedChanged(bool muted)\n", false, &_init_f_mutedChanged_864, &_call_f_mutedChanged_864); methods += new qt_gsi::GenericMethod ("searchAllStations", "@brief Method void QRadioTunerControl::searchAllStations(QRadioTuner::SearchMode searchMode)\n", false, &_init_f_searchAllStations_2641, &_call_f_searchAllStations_2641); methods += new qt_gsi::GenericMethod ("searchBackward", "@brief Method void QRadioTunerControl::searchBackward()\n", false, &_init_f_searchBackward_0, &_call_f_searchBackward_0); methods += new qt_gsi::GenericMethod ("searchForward", "@brief Method void QRadioTunerControl::searchForward()\n", false, &_init_f_searchForward_0, &_call_f_searchForward_0); + methods += new qt_gsi::GenericMethod ("searchingChanged", "@brief Method void QRadioTunerControl::searchingChanged(bool searching)\n", false, &_init_f_searchingChanged_864, &_call_f_searchingChanged_864); methods += new qt_gsi::GenericMethod ("setBand|band=", "@brief Method void QRadioTunerControl::setBand(QRadioTuner::Band b)\n", false, &_init_f_setBand_2027, &_call_f_setBand_2027); methods += new qt_gsi::GenericMethod ("setFrequency|frequency=", "@brief Method void QRadioTunerControl::setFrequency(int frequency)\n", false, &_init_f_setFrequency_767, &_call_f_setFrequency_767); methods += new qt_gsi::GenericMethod ("setMuted|muted=", "@brief Method void QRadioTunerControl::setMuted(bool muted)\n", false, &_init_f_setMuted_864, &_call_f_setMuted_864); methods += new qt_gsi::GenericMethod ("setStereoMode|stereoMode=", "@brief Method void QRadioTunerControl::setStereoMode(QRadioTuner::StereoMode mode)\n", false, &_init_f_setStereoMode_2669, &_call_f_setStereoMode_2669); methods += new qt_gsi::GenericMethod ("setVolume|volume=", "@brief Method void QRadioTunerControl::setVolume(int volume)\n", false, &_init_f_setVolume_767, &_call_f_setVolume_767); methods += new qt_gsi::GenericMethod ("signalStrength", "@brief Method int QRadioTunerControl::signalStrength()\n", true, &_init_f_signalStrength_c0, &_call_f_signalStrength_c0); + methods += new qt_gsi::GenericMethod ("signalStrengthChanged", "@brief Method void QRadioTunerControl::signalStrengthChanged(int signalStrength)\n", false, &_init_f_signalStrengthChanged_767, &_call_f_signalStrengthChanged_767); methods += new qt_gsi::GenericMethod ("start", "@brief Method void QRadioTunerControl::start()\n", false, &_init_f_start_0, &_call_f_start_0); methods += new qt_gsi::GenericMethod ("state", "@brief Method QRadioTuner::State QRadioTunerControl::state()\n", true, &_init_f_state_c0, &_call_f_state_c0); + methods += new qt_gsi::GenericMethod ("stateChanged", "@brief Method void QRadioTunerControl::stateChanged(QRadioTuner::State state)\n", false, &_init_f_stateChanged_2167, &_call_f_stateChanged_2167); + methods += new qt_gsi::GenericMethod ("stationFound", "@brief Method void QRadioTunerControl::stationFound(int frequency, QString stationId)\n", false, &_init_f_stationFound_1807, &_call_f_stationFound_1807); methods += new qt_gsi::GenericMethod (":stereoMode", "@brief Method QRadioTuner::StereoMode QRadioTunerControl::stereoMode()\n", true, &_init_f_stereoMode_c0, &_call_f_stereoMode_c0); + methods += new qt_gsi::GenericMethod ("stereoStatusChanged", "@brief Method void QRadioTunerControl::stereoStatusChanged(bool stereo)\n", false, &_init_f_stereoStatusChanged_864, &_call_f_stereoStatusChanged_864); methods += new qt_gsi::GenericMethod ("stop", "@brief Method void QRadioTunerControl::stop()\n", false, &_init_f_stop_0, &_call_f_stop_0); methods += new qt_gsi::GenericMethod (":volume", "@brief Method int QRadioTunerControl::volume()\n", true, &_init_f_volume_c0, &_call_f_volume_c0); - methods += gsi::qt_signal ("antennaConnectedChanged(bool)", "antennaConnectedChanged", gsi::arg("connectionStatus"), "@brief Signal declaration for QRadioTunerControl::antennaConnectedChanged(bool connectionStatus)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal::target_type & > ("bandChanged(QRadioTuner::Band)", "bandChanged", gsi::arg("band"), "@brief Signal declaration for QRadioTunerControl::bandChanged(QRadioTuner::Band band)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QRadioTunerControl::destroyed(QObject *)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal::target_type & > ("error(QRadioTuner::Error)", "error_sig", gsi::arg("err"), "@brief Signal declaration for QRadioTunerControl::error(QRadioTuner::Error err)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("frequencyChanged(int)", "frequencyChanged", gsi::arg("frequency"), "@brief Signal declaration for QRadioTunerControl::frequencyChanged(int frequency)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("mutedChanged(bool)", "mutedChanged", gsi::arg("muted"), "@brief Signal declaration for QRadioTunerControl::mutedChanged(bool muted)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("searchingChanged(bool)", "searchingChanged", gsi::arg("searching"), "@brief Signal declaration for QRadioTunerControl::searchingChanged(bool searching)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("signalStrengthChanged(int)", "signalStrengthChanged", gsi::arg("signalStrength"), "@brief Signal declaration for QRadioTunerControl::signalStrengthChanged(int signalStrength)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal::target_type & > ("stateChanged(QRadioTuner::State)", "stateChanged", gsi::arg("state"), "@brief Signal declaration for QRadioTunerControl::stateChanged(QRadioTuner::State state)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("stationFound(int, QString)", "stationFound", gsi::arg("frequency"), gsi::arg("stationId"), "@brief Signal declaration for QRadioTunerControl::stationFound(int frequency, QString stationId)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("stereoStatusChanged(bool)", "stereoStatusChanged", gsi::arg("stereo"), "@brief Signal declaration for QRadioTunerControl::stereoStatusChanged(bool stereo)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("volumeChanged(int)", "volumeChanged", gsi::arg("volume"), "@brief Signal declaration for QRadioTunerControl::volumeChanged(int volume)\nYou can bind a procedure to this signal."); + methods += new qt_gsi::GenericMethod ("volumeChanged", "@brief Method void QRadioTunerControl::volumeChanged(int volume)\n", false, &_init_f_volumeChanged_767, &_call_f_volumeChanged_767); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QRadioTunerControl::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QRadioTunerControl::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -628,12 +850,6 @@ public: return QRadioTunerControl::senderSignalIndex(); } - // [emitter impl] void QRadioTunerControl::antennaConnectedChanged(bool connectionStatus) - void emitter_QRadioTunerControl_antennaConnectedChanged_864(bool connectionStatus) - { - emit QRadioTunerControl::antennaConnectedChanged(connectionStatus); - } - // [adaptor impl] QRadioTuner::Band QRadioTunerControl::band() qt_gsi::Converter::target_type cbs_band_c0_0() const { @@ -649,12 +865,6 @@ public: } } - // [emitter impl] void QRadioTunerControl::bandChanged(QRadioTuner::Band band) - void emitter_QRadioTunerControl_bandChanged_2027(QRadioTuner::Band band) - { - emit QRadioTunerControl::bandChanged(band); - } - // [adaptor impl] void QRadioTunerControl::cancelSearch() void cbs_cancelSearch_0_0() { @@ -670,12 +880,6 @@ public: } } - // [emitter impl] void QRadioTunerControl::destroyed(QObject *) - void emitter_QRadioTunerControl_destroyed_1302(QObject *arg1) - { - emit QRadioTunerControl::destroyed(arg1); - } - // [adaptor impl] QRadioTuner::Error QRadioTunerControl::error() qt_gsi::Converter::target_type cbs_error_c0_0() const { @@ -691,12 +895,6 @@ public: } } - // [emitter impl] void QRadioTunerControl::error(QRadioTuner::Error err) - void emitter_QRadioTunerControl_error_2176(QRadioTuner::Error err) - { - emit QRadioTunerControl::error(err); - } - // [adaptor impl] QString QRadioTunerControl::errorString() QString cbs_errorString_c0_0() const { @@ -757,12 +955,6 @@ public: } } - // [emitter impl] void QRadioTunerControl::frequencyChanged(int frequency) - void emitter_QRadioTunerControl_frequencyChanged_767(int frequency) - { - emit QRadioTunerControl::frequencyChanged(frequency); - } - // [adaptor impl] QPair QRadioTunerControl::frequencyRange(QRadioTuner::Band b) QPair cbs_frequencyRange_c2027_0(const qt_gsi::Converter::target_type & b) const { @@ -871,12 +1063,6 @@ public: } } - // [emitter impl] void QRadioTunerControl::mutedChanged(bool muted) - void emitter_QRadioTunerControl_mutedChanged_864(bool muted) - { - emit QRadioTunerControl::mutedChanged(muted); - } - // [adaptor impl] void QRadioTunerControl::searchAllStations(QRadioTuner::SearchMode searchMode) void cbs_searchAllStations_2641_1(const qt_gsi::Converter::target_type & searchMode) { @@ -923,12 +1109,6 @@ public: } } - // [emitter impl] void QRadioTunerControl::searchingChanged(bool searching) - void emitter_QRadioTunerControl_searchingChanged_864(bool searching) - { - emit QRadioTunerControl::searchingChanged(searching); - } - // [adaptor impl] void QRadioTunerControl::setBand(QRadioTuner::Band b) void cbs_setBand_2027_0(const qt_gsi::Converter::target_type & b) { @@ -1024,12 +1204,6 @@ public: } } - // [emitter impl] void QRadioTunerControl::signalStrengthChanged(int signalStrength) - void emitter_QRadioTunerControl_signalStrengthChanged_767(int signalStrength) - { - emit QRadioTunerControl::signalStrengthChanged(signalStrength); - } - // [adaptor impl] void QRadioTunerControl::start() void cbs_start_0_0() { @@ -1060,18 +1234,6 @@ public: } } - // [emitter impl] void QRadioTunerControl::stateChanged(QRadioTuner::State state) - void emitter_QRadioTunerControl_stateChanged_2167(QRadioTuner::State state) - { - emit QRadioTunerControl::stateChanged(state); - } - - // [emitter impl] void QRadioTunerControl::stationFound(int frequency, QString stationId) - void emitter_QRadioTunerControl_stationFound_1807(int frequency, QString stationId) - { - emit QRadioTunerControl::stationFound(frequency, stationId); - } - // [adaptor impl] QRadioTuner::StereoMode QRadioTunerControl::stereoMode() qt_gsi::Converter::target_type cbs_stereoMode_c0_0() const { @@ -1087,12 +1249,6 @@ public: } } - // [emitter impl] void QRadioTunerControl::stereoStatusChanged(bool stereo) - void emitter_QRadioTunerControl_stereoStatusChanged_864(bool stereo) - { - emit QRadioTunerControl::stereoStatusChanged(stereo); - } - // [adaptor impl] void QRadioTunerControl::stop() void cbs_stop_0_0() { @@ -1123,12 +1279,6 @@ public: } } - // [emitter impl] void QRadioTunerControl::volumeChanged(int volume) - void emitter_QRadioTunerControl_volumeChanged_767(int volume) - { - emit QRadioTunerControl::volumeChanged(volume); - } - // [adaptor impl] void QRadioTunerControl::childEvent(QChildEvent *) void cbs_childEvent_1701_0(QChildEvent *arg1) { @@ -1225,24 +1375,6 @@ public: QRadioTunerControl_Adaptor::~QRadioTunerControl_Adaptor() { } -// emitter void QRadioTunerControl::antennaConnectedChanged(bool connectionStatus) - -static void _init_emitter_antennaConnectedChanged_864 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("connectionStatus"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_antennaConnectedChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - bool arg1 = gsi::arg_reader() (args, heap); - ((QRadioTunerControl_Adaptor *)cls)->emitter_QRadioTunerControl_antennaConnectedChanged_864 (arg1); -} - - // QRadioTuner::Band QRadioTunerControl::band() static void _init_cbs_band_c0_0 (qt_gsi::GenericMethod *decl) @@ -1262,24 +1394,6 @@ static void _set_callback_cbs_band_c0_0 (void *cls, const gsi::Callback &cb) } -// emitter void QRadioTunerControl::bandChanged(QRadioTuner::Band band) - -static void _init_emitter_bandChanged_2027 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("band"); - decl->add_arg::target_type & > (argspec_0); - decl->set_return (); -} - -static void _call_emitter_bandChanged_2027 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); - ((QRadioTunerControl_Adaptor *)cls)->emitter_QRadioTunerControl_bandChanged_2027 (arg1); -} - - // void QRadioTunerControl::cancelSearch() static void _init_cbs_cancelSearch_0_0 (qt_gsi::GenericMethod *decl) @@ -1348,24 +1462,6 @@ static void _set_callback_cbs_customEvent_1217_0 (void *cls, const gsi::Callback } -// emitter void QRadioTunerControl::destroyed(QObject *) - -static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - ((QRadioTunerControl_Adaptor *)cls)->emitter_QRadioTunerControl_destroyed_1302 (arg1); -} - - // void QRadioTunerControl::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -1409,24 +1505,6 @@ static void _set_callback_cbs_error_c0_0 (void *cls, const gsi::Callback &cb) } -// emitter void QRadioTunerControl::error(QRadioTuner::Error err) - -static void _init_emitter_error_2176 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("err"); - decl->add_arg::target_type & > (argspec_0); - decl->set_return (); -} - -static void _call_emitter_error_2176 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); - ((QRadioTunerControl_Adaptor *)cls)->emitter_QRadioTunerControl_error_2176 (arg1); -} - - // QString QRadioTunerControl::errorString() static void _init_cbs_errorString_c0_0 (qt_gsi::GenericMethod *decl) @@ -1514,24 +1592,6 @@ static void _set_callback_cbs_frequency_c0_0 (void *cls, const gsi::Callback &cb } -// emitter void QRadioTunerControl::frequencyChanged(int frequency) - -static void _init_emitter_frequencyChanged_767 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("frequency"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_frequencyChanged_767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - int arg1 = gsi::arg_reader() (args, heap); - ((QRadioTunerControl_Adaptor *)cls)->emitter_QRadioTunerControl_frequencyChanged_767 (arg1); -} - - // QPair QRadioTunerControl::frequencyRange(QRadioTuner::Band b) static void _init_cbs_frequencyRange_c2027_0 (qt_gsi::GenericMethod *decl) @@ -1695,24 +1755,6 @@ static void _set_callback_cbs_isStereo_c0_0 (void *cls, const gsi::Callback &cb) } -// emitter void QRadioTunerControl::mutedChanged(bool muted) - -static void _init_emitter_mutedChanged_864 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("muted"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_mutedChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - bool arg1 = gsi::arg_reader() (args, heap); - ((QRadioTunerControl_Adaptor *)cls)->emitter_QRadioTunerControl_mutedChanged_864 (arg1); -} - - // exposed int QRadioTunerControl::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -1795,24 +1837,6 @@ static void _set_callback_cbs_searchForward_0_0 (void *cls, const gsi::Callback } -// emitter void QRadioTunerControl::searchingChanged(bool searching) - -static void _init_emitter_searchingChanged_864 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("searching"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_searchingChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - bool arg1 = gsi::arg_reader() (args, heap); - ((QRadioTunerControl_Adaptor *)cls)->emitter_QRadioTunerControl_searchingChanged_864 (arg1); -} - - // exposed QObject *QRadioTunerControl::sender() static void _init_fp_sender_c0 (qt_gsi::GenericMethod *decl) @@ -1980,24 +2004,6 @@ static void _set_callback_cbs_signalStrength_c0_0 (void *cls, const gsi::Callbac } -// emitter void QRadioTunerControl::signalStrengthChanged(int signalStrength) - -static void _init_emitter_signalStrengthChanged_767 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("signalStrength"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_signalStrengthChanged_767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - int arg1 = gsi::arg_reader() (args, heap); - ((QRadioTunerControl_Adaptor *)cls)->emitter_QRadioTunerControl_signalStrengthChanged_767 (arg1); -} - - // void QRadioTunerControl::start() static void _init_cbs_start_0_0 (qt_gsi::GenericMethod *decl) @@ -2037,45 +2043,6 @@ static void _set_callback_cbs_state_c0_0 (void *cls, const gsi::Callback &cb) } -// emitter void QRadioTunerControl::stateChanged(QRadioTuner::State state) - -static void _init_emitter_stateChanged_2167 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("state"); - decl->add_arg::target_type & > (argspec_0); - decl->set_return (); -} - -static void _call_emitter_stateChanged_2167 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const qt_gsi::Converter::target_type & arg1 = gsi::arg_reader::target_type & >() (args, heap); - ((QRadioTunerControl_Adaptor *)cls)->emitter_QRadioTunerControl_stateChanged_2167 (arg1); -} - - -// emitter void QRadioTunerControl::stationFound(int frequency, QString stationId) - -static void _init_emitter_stationFound_1807 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("frequency"); - decl->add_arg (argspec_0); - static gsi::ArgSpecBase argspec_1 ("stationId"); - decl->add_arg (argspec_1); - decl->set_return (); -} - -static void _call_emitter_stationFound_1807 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - int arg1 = gsi::arg_reader() (args, heap); - QString arg2 = gsi::arg_reader() (args, heap); - ((QRadioTunerControl_Adaptor *)cls)->emitter_QRadioTunerControl_stationFound_1807 (arg1, arg2); -} - - // QRadioTuner::StereoMode QRadioTunerControl::stereoMode() static void _init_cbs_stereoMode_c0_0 (qt_gsi::GenericMethod *decl) @@ -2095,24 +2062,6 @@ static void _set_callback_cbs_stereoMode_c0_0 (void *cls, const gsi::Callback &c } -// emitter void QRadioTunerControl::stereoStatusChanged(bool stereo) - -static void _init_emitter_stereoStatusChanged_864 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("stereo"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_stereoStatusChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - bool arg1 = gsi::arg_reader() (args, heap); - ((QRadioTunerControl_Adaptor *)cls)->emitter_QRadioTunerControl_stereoStatusChanged_864 (arg1); -} - - // void QRadioTunerControl::stop() static void _init_cbs_stop_0_0 (qt_gsi::GenericMethod *decl) @@ -2176,24 +2125,6 @@ static void _set_callback_cbs_volume_c0_0 (void *cls, const gsi::Callback &cb) } -// emitter void QRadioTunerControl::volumeChanged(int volume) - -static void _init_emitter_volumeChanged_767 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("volume"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_volumeChanged_767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - int arg1 = gsi::arg_reader() (args, heap); - ((QRadioTunerControl_Adaptor *)cls)->emitter_QRadioTunerControl_volumeChanged_767 (arg1); -} - - namespace gsi { @@ -2201,22 +2132,18 @@ gsi::Class &qtdecl_QRadioTunerControl (); static gsi::Methods methods_QRadioTunerControl_Adaptor () { gsi::Methods methods; - methods += new qt_gsi::GenericMethod ("emit_antennaConnectedChanged", "@brief Emitter for signal void QRadioTunerControl::antennaConnectedChanged(bool connectionStatus)\nCall this method to emit this signal.", false, &_init_emitter_antennaConnectedChanged_864, &_call_emitter_antennaConnectedChanged_864); methods += new qt_gsi::GenericMethod ("band", "@brief Virtual method QRadioTuner::Band QRadioTunerControl::band()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_band_c0_0, &_call_cbs_band_c0_0); methods += new qt_gsi::GenericMethod ("band", "@hide", true, &_init_cbs_band_c0_0, &_call_cbs_band_c0_0, &_set_callback_cbs_band_c0_0); - methods += new qt_gsi::GenericMethod ("emit_bandChanged", "@brief Emitter for signal void QRadioTunerControl::bandChanged(QRadioTuner::Band band)\nCall this method to emit this signal.", false, &_init_emitter_bandChanged_2027, &_call_emitter_bandChanged_2027); methods += new qt_gsi::GenericMethod ("cancelSearch", "@brief Virtual method void QRadioTunerControl::cancelSearch()\nThis method can be reimplemented in a derived class.", false, &_init_cbs_cancelSearch_0_0, &_call_cbs_cancelSearch_0_0); methods += new qt_gsi::GenericMethod ("cancelSearch", "@hide", false, &_init_cbs_cancelSearch_0_0, &_call_cbs_cancelSearch_0_0, &_set_callback_cbs_cancelSearch_0_0); methods += new qt_gsi::GenericMethod ("*childEvent", "@brief Virtual method void QRadioTunerControl::childEvent(QChildEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QRadioTunerControl::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); - methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QRadioTunerControl::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QRadioTunerControl::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("error", "@brief Virtual method QRadioTuner::Error QRadioTunerControl::error()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_error_c0_0, &_call_cbs_error_c0_0); methods += new qt_gsi::GenericMethod ("error", "@hide", true, &_init_cbs_error_c0_0, &_call_cbs_error_c0_0, &_set_callback_cbs_error_c0_0); - methods += new qt_gsi::GenericMethod ("emit_error_sig", "@brief Emitter for signal void QRadioTunerControl::error(QRadioTuner::Error err)\nCall this method to emit this signal.", false, &_init_emitter_error_2176, &_call_emitter_error_2176); methods += new qt_gsi::GenericMethod ("errorString", "@brief Virtual method QString QRadioTunerControl::errorString()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_errorString_c0_0, &_call_cbs_errorString_c0_0); methods += new qt_gsi::GenericMethod ("errorString", "@hide", true, &_init_cbs_errorString_c0_0, &_call_cbs_errorString_c0_0, &_set_callback_cbs_errorString_c0_0); methods += new qt_gsi::GenericMethod ("event", "@brief Virtual method bool QRadioTunerControl::event(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0); @@ -2225,7 +2152,6 @@ static gsi::Methods methods_QRadioTunerControl_Adaptor () { methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("frequency", "@brief Virtual method int QRadioTunerControl::frequency()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_frequency_c0_0, &_call_cbs_frequency_c0_0); methods += new qt_gsi::GenericMethod ("frequency", "@hide", true, &_init_cbs_frequency_c0_0, &_call_cbs_frequency_c0_0, &_set_callback_cbs_frequency_c0_0); - methods += new qt_gsi::GenericMethod ("emit_frequencyChanged", "@brief Emitter for signal void QRadioTunerControl::frequencyChanged(int frequency)\nCall this method to emit this signal.", false, &_init_emitter_frequencyChanged_767, &_call_emitter_frequencyChanged_767); methods += new qt_gsi::GenericMethod ("frequencyRange", "@brief Virtual method QPair QRadioTunerControl::frequencyRange(QRadioTuner::Band b)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_frequencyRange_c2027_0, &_call_cbs_frequencyRange_c2027_0); methods += new qt_gsi::GenericMethod ("frequencyRange", "@hide", true, &_init_cbs_frequencyRange_c2027_0, &_call_cbs_frequencyRange_c2027_0, &_set_callback_cbs_frequencyRange_c2027_0); methods += new qt_gsi::GenericMethod ("frequencyStep", "@brief Virtual method int QRadioTunerControl::frequencyStep(QRadioTuner::Band b)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_frequencyStep_c2027_0, &_call_cbs_frequencyStep_c2027_0); @@ -2241,7 +2167,6 @@ static gsi::Methods methods_QRadioTunerControl_Adaptor () { methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QRadioTunerControl::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); methods += new qt_gsi::GenericMethod ("isStereo", "@brief Virtual method bool QRadioTunerControl::isStereo()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_isStereo_c0_0, &_call_cbs_isStereo_c0_0); methods += new qt_gsi::GenericMethod ("isStereo", "@hide", true, &_init_cbs_isStereo_c0_0, &_call_cbs_isStereo_c0_0, &_set_callback_cbs_isStereo_c0_0); - methods += new qt_gsi::GenericMethod ("emit_mutedChanged", "@brief Emitter for signal void QRadioTunerControl::mutedChanged(bool muted)\nCall this method to emit this signal.", false, &_init_emitter_mutedChanged_864, &_call_emitter_mutedChanged_864); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QRadioTunerControl::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("searchAllStations", "@brief Virtual method void QRadioTunerControl::searchAllStations(QRadioTuner::SearchMode searchMode)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_searchAllStations_2641_1, &_call_cbs_searchAllStations_2641_1); methods += new qt_gsi::GenericMethod ("searchAllStations", "@hide", false, &_init_cbs_searchAllStations_2641_1, &_call_cbs_searchAllStations_2641_1, &_set_callback_cbs_searchAllStations_2641_1); @@ -2249,7 +2174,6 @@ static gsi::Methods methods_QRadioTunerControl_Adaptor () { methods += new qt_gsi::GenericMethod ("searchBackward", "@hide", false, &_init_cbs_searchBackward_0_0, &_call_cbs_searchBackward_0_0, &_set_callback_cbs_searchBackward_0_0); methods += new qt_gsi::GenericMethod ("searchForward", "@brief Virtual method void QRadioTunerControl::searchForward()\nThis method can be reimplemented in a derived class.", false, &_init_cbs_searchForward_0_0, &_call_cbs_searchForward_0_0); methods += new qt_gsi::GenericMethod ("searchForward", "@hide", false, &_init_cbs_searchForward_0_0, &_call_cbs_searchForward_0_0, &_set_callback_cbs_searchForward_0_0); - methods += new qt_gsi::GenericMethod ("emit_searchingChanged", "@brief Emitter for signal void QRadioTunerControl::searchingChanged(bool searching)\nCall this method to emit this signal.", false, &_init_emitter_searchingChanged_864, &_call_emitter_searchingChanged_864); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QRadioTunerControl::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QRadioTunerControl::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); methods += new qt_gsi::GenericMethod ("setBand", "@brief Virtual method void QRadioTunerControl::setBand(QRadioTuner::Band b)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_setBand_2027_0, &_call_cbs_setBand_2027_0); @@ -2264,23 +2188,18 @@ static gsi::Methods methods_QRadioTunerControl_Adaptor () { methods += new qt_gsi::GenericMethod ("setVolume", "@hide", false, &_init_cbs_setVolume_767_0, &_call_cbs_setVolume_767_0, &_set_callback_cbs_setVolume_767_0); methods += new qt_gsi::GenericMethod ("signalStrength", "@brief Virtual method int QRadioTunerControl::signalStrength()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_signalStrength_c0_0, &_call_cbs_signalStrength_c0_0); methods += new qt_gsi::GenericMethod ("signalStrength", "@hide", true, &_init_cbs_signalStrength_c0_0, &_call_cbs_signalStrength_c0_0, &_set_callback_cbs_signalStrength_c0_0); - methods += new qt_gsi::GenericMethod ("emit_signalStrengthChanged", "@brief Emitter for signal void QRadioTunerControl::signalStrengthChanged(int signalStrength)\nCall this method to emit this signal.", false, &_init_emitter_signalStrengthChanged_767, &_call_emitter_signalStrengthChanged_767); methods += new qt_gsi::GenericMethod ("start", "@brief Virtual method void QRadioTunerControl::start()\nThis method can be reimplemented in a derived class.", false, &_init_cbs_start_0_0, &_call_cbs_start_0_0); methods += new qt_gsi::GenericMethod ("start", "@hide", false, &_init_cbs_start_0_0, &_call_cbs_start_0_0, &_set_callback_cbs_start_0_0); methods += new qt_gsi::GenericMethod ("state", "@brief Virtual method QRadioTuner::State QRadioTunerControl::state()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_state_c0_0, &_call_cbs_state_c0_0); methods += new qt_gsi::GenericMethod ("state", "@hide", true, &_init_cbs_state_c0_0, &_call_cbs_state_c0_0, &_set_callback_cbs_state_c0_0); - methods += new qt_gsi::GenericMethod ("emit_stateChanged", "@brief Emitter for signal void QRadioTunerControl::stateChanged(QRadioTuner::State state)\nCall this method to emit this signal.", false, &_init_emitter_stateChanged_2167, &_call_emitter_stateChanged_2167); - methods += new qt_gsi::GenericMethod ("emit_stationFound", "@brief Emitter for signal void QRadioTunerControl::stationFound(int frequency, QString stationId)\nCall this method to emit this signal.", false, &_init_emitter_stationFound_1807, &_call_emitter_stationFound_1807); methods += new qt_gsi::GenericMethod ("stereoMode", "@brief Virtual method QRadioTuner::StereoMode QRadioTunerControl::stereoMode()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_stereoMode_c0_0, &_call_cbs_stereoMode_c0_0); methods += new qt_gsi::GenericMethod ("stereoMode", "@hide", true, &_init_cbs_stereoMode_c0_0, &_call_cbs_stereoMode_c0_0, &_set_callback_cbs_stereoMode_c0_0); - methods += new qt_gsi::GenericMethod ("emit_stereoStatusChanged", "@brief Emitter for signal void QRadioTunerControl::stereoStatusChanged(bool stereo)\nCall this method to emit this signal.", false, &_init_emitter_stereoStatusChanged_864, &_call_emitter_stereoStatusChanged_864); methods += new qt_gsi::GenericMethod ("stop", "@brief Virtual method void QRadioTunerControl::stop()\nThis method can be reimplemented in a derived class.", false, &_init_cbs_stop_0_0, &_call_cbs_stop_0_0); methods += new qt_gsi::GenericMethod ("stop", "@hide", false, &_init_cbs_stop_0_0, &_call_cbs_stop_0_0, &_set_callback_cbs_stop_0_0); methods += new qt_gsi::GenericMethod ("*timerEvent", "@brief Virtual method void QRadioTunerControl::timerEvent(QTimerEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_timerEvent_1730_0, &_call_cbs_timerEvent_1730_0); methods += new qt_gsi::GenericMethod ("*timerEvent", "@hide", false, &_init_cbs_timerEvent_1730_0, &_call_cbs_timerEvent_1730_0, &_set_callback_cbs_timerEvent_1730_0); methods += new qt_gsi::GenericMethod ("volume", "@brief Virtual method int QRadioTunerControl::volume()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_volume_c0_0, &_call_cbs_volume_c0_0); methods += new qt_gsi::GenericMethod ("volume", "@hide", true, &_init_cbs_volume_c0_0, &_call_cbs_volume_c0_0, &_set_callback_cbs_volume_c0_0); - methods += new qt_gsi::GenericMethod ("emit_volumeChanged", "@brief Emitter for signal void QRadioTunerControl::volumeChanged(int volume)\nCall this method to emit this signal.", false, &_init_emitter_volumeChanged_767, &_call_emitter_volumeChanged_767); return methods; } diff --git a/src/gsiqt/qt5/QtMultimedia/gsiDeclQSound.cc b/src/gsiqt/qt5/QtMultimedia/gsiDeclQSound.cc index 93d65eea9..9ed2f48c5 100644 --- a/src/gsiqt/qt5/QtMultimedia/gsiDeclQSound.cc +++ b/src/gsiqt/qt5/QtMultimedia/gsiDeclQSound.cc @@ -250,7 +250,6 @@ static gsi::Methods methods_QSound () { methods += new qt_gsi::GenericMethod ("play", "@brief Method void QSound::play()\n", false, &_init_f_play_0, &_call_f_play_0); methods += new qt_gsi::GenericMethod ("setLoops|loops=", "@brief Method void QSound::setLoops(int)\n", false, &_init_f_setLoops_767, &_call_f_setLoops_767); methods += new qt_gsi::GenericMethod ("stop", "@brief Method void QSound::stop()\n", false, &_init_f_stop_0, &_call_f_stop_0); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QSound::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("play", "@brief Static method void QSound::play(const QString &filename)\nThis method is static and can be called without an instance.", &_init_f_play_2025, &_call_f_play_2025); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QSound::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QSound::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); @@ -306,12 +305,6 @@ public: return QSound::senderSignalIndex(); } - // [emitter impl] void QSound::destroyed(QObject *) - void emitter_QSound_destroyed_1302(QObject *arg1) - { - emit QSound::destroyed(arg1); - } - // [adaptor impl] bool QSound::event(QEvent *) bool cbs_event_1217_0(QEvent *arg1) { @@ -481,24 +474,6 @@ static void _set_callback_cbs_customEvent_1217_0 (void *cls, const gsi::Callback } -// emitter void QSound::destroyed(QObject *) - -static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - ((QSound_Adaptor *)cls)->emitter_QSound_destroyed_1302 (arg1); -} - - // void QSound::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -672,7 +647,6 @@ static gsi::Methods methods_QSound_Adaptor () { methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QSound::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); - methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QSound::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QSound::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("event", "@brief Virtual method bool QSound::event(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0); diff --git a/src/gsiqt/qt5/QtMultimedia/gsiDeclQSoundEffect.cc b/src/gsiqt/qt5/QtMultimedia/gsiDeclQSoundEffect.cc index 5eb9a8ca8..ecd1349ba 100644 --- a/src/gsiqt/qt5/QtMultimedia/gsiDeclQSoundEffect.cc +++ b/src/gsiqt/qt5/QtMultimedia/gsiDeclQSoundEffect.cc @@ -71,6 +71,22 @@ static void _call_f_category_c0 (const qt_gsi::GenericMethod * /*decl*/, void *c } +// void QSoundEffect::categoryChanged() + + +static void _init_f_categoryChanged_0 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_f_categoryChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + __SUPPRESS_UNUSED_WARNING(ret); + ((QSoundEffect *)cls)->categoryChanged (); +} + + // bool QSoundEffect::isLoaded() @@ -116,6 +132,22 @@ static void _call_f_isPlaying_c0 (const qt_gsi::GenericMethod * /*decl*/, void * } +// void QSoundEffect::loadedChanged() + + +static void _init_f_loadedChanged_0 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_f_loadedChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + __SUPPRESS_UNUSED_WARNING(ret); + ((QSoundEffect *)cls)->loadedChanged (); +} + + // int QSoundEffect::loopCount() @@ -131,6 +163,22 @@ static void _call_f_loopCount_c0 (const qt_gsi::GenericMethod * /*decl*/, void * } +// void QSoundEffect::loopCountChanged() + + +static void _init_f_loopCountChanged_0 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_f_loopCountChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + __SUPPRESS_UNUSED_WARNING(ret); + ((QSoundEffect *)cls)->loopCountChanged (); +} + + // int QSoundEffect::loopsRemaining() @@ -146,6 +194,38 @@ static void _call_f_loopsRemaining_c0 (const qt_gsi::GenericMethod * /*decl*/, v } +// void QSoundEffect::loopsRemainingChanged() + + +static void _init_f_loopsRemainingChanged_0 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_f_loopsRemainingChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + __SUPPRESS_UNUSED_WARNING(ret); + ((QSoundEffect *)cls)->loopsRemainingChanged (); +} + + +// void QSoundEffect::mutedChanged() + + +static void _init_f_mutedChanged_0 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_f_mutedChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + __SUPPRESS_UNUSED_WARNING(ret); + ((QSoundEffect *)cls)->mutedChanged (); +} + + // void QSoundEffect::play() @@ -162,6 +242,22 @@ static void _call_f_play_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, g } +// void QSoundEffect::playingChanged() + + +static void _init_f_playingChanged_0 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_f_playingChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + __SUPPRESS_UNUSED_WARNING(ret); + ((QSoundEffect *)cls)->playingChanged (); +} + + // void QSoundEffect::setCategory(const QString &category) @@ -277,6 +373,22 @@ static void _call_f_source_c0 (const qt_gsi::GenericMethod * /*decl*/, void *cls } +// void QSoundEffect::sourceChanged() + + +static void _init_f_sourceChanged_0 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_f_sourceChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + __SUPPRESS_UNUSED_WARNING(ret); + ((QSoundEffect *)cls)->sourceChanged (); +} + + // QSoundEffect::Status QSoundEffect::status() @@ -292,6 +404,22 @@ static void _call_f_status_c0 (const qt_gsi::GenericMethod * /*decl*/, void *cls } +// void QSoundEffect::statusChanged() + + +static void _init_f_statusChanged_0 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_f_statusChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + __SUPPRESS_UNUSED_WARNING(ret); + ((QSoundEffect *)cls)->statusChanged (); +} + + // void QSoundEffect::stop() @@ -323,6 +451,22 @@ static void _call_f_volume_c0 (const qt_gsi::GenericMethod * /*decl*/, void *cls } +// void QSoundEffect::volumeChanged() + + +static void _init_f_volumeChanged_0 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_f_volumeChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + __SUPPRESS_UNUSED_WARNING(ret); + ((QSoundEffect *)cls)->volumeChanged (); +} + + // static QStringList QSoundEffect::supportedMimeTypes() @@ -395,31 +539,30 @@ static gsi::Methods methods_QSoundEffect () { gsi::Methods methods; methods += new qt_gsi::GenericStaticMethod ("staticMetaObject", "@brief Obtains the static MetaObject for this class.", &_init_smo, &_call_smo); methods += new qt_gsi::GenericMethod (":category", "@brief Method QString QSoundEffect::category()\n", true, &_init_f_category_c0, &_call_f_category_c0); + methods += new qt_gsi::GenericMethod ("categoryChanged", "@brief Method void QSoundEffect::categoryChanged()\n", false, &_init_f_categoryChanged_0, &_call_f_categoryChanged_0); methods += new qt_gsi::GenericMethod ("isLoaded?", "@brief Method bool QSoundEffect::isLoaded()\n", true, &_init_f_isLoaded_c0, &_call_f_isLoaded_c0); methods += new qt_gsi::GenericMethod ("isMuted?|:muted", "@brief Method bool QSoundEffect::isMuted()\n", true, &_init_f_isMuted_c0, &_call_f_isMuted_c0); methods += new qt_gsi::GenericMethod ("isPlaying?|:playing", "@brief Method bool QSoundEffect::isPlaying()\n", true, &_init_f_isPlaying_c0, &_call_f_isPlaying_c0); + methods += new qt_gsi::GenericMethod ("loadedChanged", "@brief Method void QSoundEffect::loadedChanged()\n", false, &_init_f_loadedChanged_0, &_call_f_loadedChanged_0); methods += new qt_gsi::GenericMethod (":loopCount", "@brief Method int QSoundEffect::loopCount()\n", true, &_init_f_loopCount_c0, &_call_f_loopCount_c0); + methods += new qt_gsi::GenericMethod ("loopCountChanged", "@brief Method void QSoundEffect::loopCountChanged()\n", false, &_init_f_loopCountChanged_0, &_call_f_loopCountChanged_0); methods += new qt_gsi::GenericMethod (":loopsRemaining", "@brief Method int QSoundEffect::loopsRemaining()\n", true, &_init_f_loopsRemaining_c0, &_call_f_loopsRemaining_c0); + methods += new qt_gsi::GenericMethod ("loopsRemainingChanged", "@brief Method void QSoundEffect::loopsRemainingChanged()\n", false, &_init_f_loopsRemainingChanged_0, &_call_f_loopsRemainingChanged_0); + methods += new qt_gsi::GenericMethod ("mutedChanged", "@brief Method void QSoundEffect::mutedChanged()\n", false, &_init_f_mutedChanged_0, &_call_f_mutedChanged_0); methods += new qt_gsi::GenericMethod ("play", "@brief Method void QSoundEffect::play()\n", false, &_init_f_play_0, &_call_f_play_0); + methods += new qt_gsi::GenericMethod ("playingChanged", "@brief Method void QSoundEffect::playingChanged()\n", false, &_init_f_playingChanged_0, &_call_f_playingChanged_0); methods += new qt_gsi::GenericMethod ("setCategory|category=", "@brief Method void QSoundEffect::setCategory(const QString &category)\n", false, &_init_f_setCategory_2025, &_call_f_setCategory_2025); methods += new qt_gsi::GenericMethod ("setLoopCount|loopCount=", "@brief Method void QSoundEffect::setLoopCount(int loopCount)\n", false, &_init_f_setLoopCount_767, &_call_f_setLoopCount_767); methods += new qt_gsi::GenericMethod ("setMuted|muted=", "@brief Method void QSoundEffect::setMuted(bool muted)\n", false, &_init_f_setMuted_864, &_call_f_setMuted_864); methods += new qt_gsi::GenericMethod ("setSource|source=", "@brief Method void QSoundEffect::setSource(const QUrl &url)\n", false, &_init_f_setSource_1701, &_call_f_setSource_1701); methods += new qt_gsi::GenericMethod ("setVolume|volume=", "@brief Method void QSoundEffect::setVolume(double volume)\n", false, &_init_f_setVolume_1071, &_call_f_setVolume_1071); methods += new qt_gsi::GenericMethod (":source", "@brief Method QUrl QSoundEffect::source()\n", true, &_init_f_source_c0, &_call_f_source_c0); + methods += new qt_gsi::GenericMethod ("sourceChanged", "@brief Method void QSoundEffect::sourceChanged()\n", false, &_init_f_sourceChanged_0, &_call_f_sourceChanged_0); methods += new qt_gsi::GenericMethod (":status", "@brief Method QSoundEffect::Status QSoundEffect::status()\n", true, &_init_f_status_c0, &_call_f_status_c0); + methods += new qt_gsi::GenericMethod ("statusChanged", "@brief Method void QSoundEffect::statusChanged()\n", false, &_init_f_statusChanged_0, &_call_f_statusChanged_0); methods += new qt_gsi::GenericMethod ("stop", "@brief Method void QSoundEffect::stop()\n", false, &_init_f_stop_0, &_call_f_stop_0); methods += new qt_gsi::GenericMethod (":volume", "@brief Method double QSoundEffect::volume()\n", true, &_init_f_volume_c0, &_call_f_volume_c0); - methods += gsi::qt_signal ("categoryChanged()", "categoryChanged", "@brief Signal declaration for QSoundEffect::categoryChanged()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QSoundEffect::destroyed(QObject *)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("loadedChanged()", "loadedChanged", "@brief Signal declaration for QSoundEffect::loadedChanged()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("loopCountChanged()", "loopCountChanged", "@brief Signal declaration for QSoundEffect::loopCountChanged()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("loopsRemainingChanged()", "loopsRemainingChanged", "@brief Signal declaration for QSoundEffect::loopsRemainingChanged()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("mutedChanged()", "mutedChanged", "@brief Signal declaration for QSoundEffect::mutedChanged()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("playingChanged()", "playingChanged", "@brief Signal declaration for QSoundEffect::playingChanged()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("sourceChanged()", "sourceChanged", "@brief Signal declaration for QSoundEffect::sourceChanged()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("statusChanged()", "statusChanged", "@brief Signal declaration for QSoundEffect::statusChanged()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("volumeChanged()", "volumeChanged", "@brief Signal declaration for QSoundEffect::volumeChanged()\nYou can bind a procedure to this signal."); + methods += new qt_gsi::GenericMethod ("volumeChanged", "@brief Method void QSoundEffect::volumeChanged()\n", false, &_init_f_volumeChanged_0, &_call_f_volumeChanged_0); methods += new qt_gsi::GenericStaticMethod ("supportedMimeTypes", "@brief Static method QStringList QSoundEffect::supportedMimeTypes()\nThis method is static and can be called without an instance.", &_init_f_supportedMimeTypes_0, &_call_f_supportedMimeTypes_0); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QSoundEffect::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QSoundEffect::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); @@ -475,18 +618,6 @@ public: return QSoundEffect::senderSignalIndex(); } - // [emitter impl] void QSoundEffect::categoryChanged() - void emitter_QSoundEffect_categoryChanged_0() - { - emit QSoundEffect::categoryChanged(); - } - - // [emitter impl] void QSoundEffect::destroyed(QObject *) - void emitter_QSoundEffect_destroyed_1302(QObject *arg1) - { - emit QSoundEffect::destroyed(arg1); - } - // [adaptor impl] bool QSoundEffect::event(QEvent *) bool cbs_event_1217_0(QEvent *arg1) { @@ -517,54 +648,6 @@ public: } } - // [emitter impl] void QSoundEffect::loadedChanged() - void emitter_QSoundEffect_loadedChanged_0() - { - emit QSoundEffect::loadedChanged(); - } - - // [emitter impl] void QSoundEffect::loopCountChanged() - void emitter_QSoundEffect_loopCountChanged_0() - { - emit QSoundEffect::loopCountChanged(); - } - - // [emitter impl] void QSoundEffect::loopsRemainingChanged() - void emitter_QSoundEffect_loopsRemainingChanged_0() - { - emit QSoundEffect::loopsRemainingChanged(); - } - - // [emitter impl] void QSoundEffect::mutedChanged() - void emitter_QSoundEffect_mutedChanged_0() - { - emit QSoundEffect::mutedChanged(); - } - - // [emitter impl] void QSoundEffect::playingChanged() - void emitter_QSoundEffect_playingChanged_0() - { - emit QSoundEffect::playingChanged(); - } - - // [emitter impl] void QSoundEffect::sourceChanged() - void emitter_QSoundEffect_sourceChanged_0() - { - emit QSoundEffect::sourceChanged(); - } - - // [emitter impl] void QSoundEffect::statusChanged() - void emitter_QSoundEffect_statusChanged_0() - { - emit QSoundEffect::statusChanged(); - } - - // [emitter impl] void QSoundEffect::volumeChanged() - void emitter_QSoundEffect_volumeChanged_0() - { - emit QSoundEffect::volumeChanged(); - } - // [adaptor impl] void QSoundEffect::childEvent(QChildEvent *) void cbs_childEvent_1701_0(QChildEvent *arg1) { @@ -653,20 +736,6 @@ static void _call_ctor_QSoundEffect_Adaptor_1302 (const qt_gsi::GenericStaticMet } -// emitter void QSoundEffect::categoryChanged() - -static void _init_emitter_categoryChanged_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_categoryChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QSoundEffect_Adaptor *)cls)->emitter_QSoundEffect_categoryChanged_0 (); -} - - // void QSoundEffect::childEvent(QChildEvent *) static void _init_cbs_childEvent_1701_0 (qt_gsi::GenericMethod *decl) @@ -715,24 +784,6 @@ static void _set_callback_cbs_customEvent_1217_0 (void *cls, const gsi::Callback } -// emitter void QSoundEffect::destroyed(QObject *) - -static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - ((QSoundEffect_Adaptor *)cls)->emitter_QSoundEffect_destroyed_1302 (arg1); -} - - // void QSoundEffect::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -824,76 +875,6 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } -// emitter void QSoundEffect::loadedChanged() - -static void _init_emitter_loadedChanged_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_loadedChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QSoundEffect_Adaptor *)cls)->emitter_QSoundEffect_loadedChanged_0 (); -} - - -// emitter void QSoundEffect::loopCountChanged() - -static void _init_emitter_loopCountChanged_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_loopCountChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QSoundEffect_Adaptor *)cls)->emitter_QSoundEffect_loopCountChanged_0 (); -} - - -// emitter void QSoundEffect::loopsRemainingChanged() - -static void _init_emitter_loopsRemainingChanged_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_loopsRemainingChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QSoundEffect_Adaptor *)cls)->emitter_QSoundEffect_loopsRemainingChanged_0 (); -} - - -// emitter void QSoundEffect::mutedChanged() - -static void _init_emitter_mutedChanged_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_mutedChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QSoundEffect_Adaptor *)cls)->emitter_QSoundEffect_mutedChanged_0 (); -} - - -// emitter void QSoundEffect::playingChanged() - -static void _init_emitter_playingChanged_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_playingChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QSoundEffect_Adaptor *)cls)->emitter_QSoundEffect_playingChanged_0 (); -} - - // exposed int QSoundEffect::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -940,34 +921,6 @@ static void _call_fp_senderSignalIndex_c0 (const qt_gsi::GenericMethod * /*decl* } -// emitter void QSoundEffect::sourceChanged() - -static void _init_emitter_sourceChanged_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_sourceChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QSoundEffect_Adaptor *)cls)->emitter_QSoundEffect_sourceChanged_0 (); -} - - -// emitter void QSoundEffect::statusChanged() - -static void _init_emitter_statusChanged_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_statusChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QSoundEffect_Adaptor *)cls)->emitter_QSoundEffect_statusChanged_0 (); -} - - // void QSoundEffect::timerEvent(QTimerEvent *) static void _init_cbs_timerEvent_1730_0 (qt_gsi::GenericMethod *decl) @@ -992,20 +945,6 @@ static void _set_callback_cbs_timerEvent_1730_0 (void *cls, const gsi::Callback } -// emitter void QSoundEffect::volumeChanged() - -static void _init_emitter_volumeChanged_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_volumeChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QSoundEffect_Adaptor *)cls)->emitter_QSoundEffect_volumeChanged_0 (); -} - - namespace gsi { @@ -1014,12 +953,10 @@ gsi::Class &qtdecl_QSoundEffect (); static gsi::Methods methods_QSoundEffect_Adaptor () { gsi::Methods methods; methods += new qt_gsi::GenericStaticMethod ("new", "@brief Constructor QSoundEffect::QSoundEffect(QObject *parent)\nThis method creates an object of class QSoundEffect.", &_init_ctor_QSoundEffect_Adaptor_1302, &_call_ctor_QSoundEffect_Adaptor_1302); - methods += new qt_gsi::GenericMethod ("emit_categoryChanged", "@brief Emitter for signal void QSoundEffect::categoryChanged()\nCall this method to emit this signal.", false, &_init_emitter_categoryChanged_0, &_call_emitter_categoryChanged_0); methods += new qt_gsi::GenericMethod ("*childEvent", "@brief Virtual method void QSoundEffect::childEvent(QChildEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QSoundEffect::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); - methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QSoundEffect::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QSoundEffect::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("event", "@brief Virtual method bool QSoundEffect::event(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0); @@ -1027,19 +964,11 @@ static gsi::Methods methods_QSoundEffect_Adaptor () { methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QSoundEffect::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QSoundEffect::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); - methods += new qt_gsi::GenericMethod ("emit_loadedChanged", "@brief Emitter for signal void QSoundEffect::loadedChanged()\nCall this method to emit this signal.", false, &_init_emitter_loadedChanged_0, &_call_emitter_loadedChanged_0); - methods += new qt_gsi::GenericMethod ("emit_loopCountChanged", "@brief Emitter for signal void QSoundEffect::loopCountChanged()\nCall this method to emit this signal.", false, &_init_emitter_loopCountChanged_0, &_call_emitter_loopCountChanged_0); - methods += new qt_gsi::GenericMethod ("emit_loopsRemainingChanged", "@brief Emitter for signal void QSoundEffect::loopsRemainingChanged()\nCall this method to emit this signal.", false, &_init_emitter_loopsRemainingChanged_0, &_call_emitter_loopsRemainingChanged_0); - methods += new qt_gsi::GenericMethod ("emit_mutedChanged", "@brief Emitter for signal void QSoundEffect::mutedChanged()\nCall this method to emit this signal.", false, &_init_emitter_mutedChanged_0, &_call_emitter_mutedChanged_0); - methods += new qt_gsi::GenericMethod ("emit_playingChanged", "@brief Emitter for signal void QSoundEffect::playingChanged()\nCall this method to emit this signal.", false, &_init_emitter_playingChanged_0, &_call_emitter_playingChanged_0); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QSoundEffect::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QSoundEffect::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QSoundEffect::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); - methods += new qt_gsi::GenericMethod ("emit_sourceChanged", "@brief Emitter for signal void QSoundEffect::sourceChanged()\nCall this method to emit this signal.", false, &_init_emitter_sourceChanged_0, &_call_emitter_sourceChanged_0); - methods += new qt_gsi::GenericMethod ("emit_statusChanged", "@brief Emitter for signal void QSoundEffect::statusChanged()\nCall this method to emit this signal.", false, &_init_emitter_statusChanged_0, &_call_emitter_statusChanged_0); methods += new qt_gsi::GenericMethod ("*timerEvent", "@brief Virtual method void QSoundEffect::timerEvent(QTimerEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_timerEvent_1730_0, &_call_cbs_timerEvent_1730_0); methods += new qt_gsi::GenericMethod ("*timerEvent", "@hide", false, &_init_cbs_timerEvent_1730_0, &_call_cbs_timerEvent_1730_0, &_set_callback_cbs_timerEvent_1730_0); - methods += new qt_gsi::GenericMethod ("emit_volumeChanged", "@brief Emitter for signal void QSoundEffect::volumeChanged()\nCall this method to emit this signal.", false, &_init_emitter_volumeChanged_0, &_call_emitter_volumeChanged_0); return methods; } diff --git a/src/gsiqt/qt5/QtMultimedia/gsiDeclQVideoDeviceSelectorControl.cc b/src/gsiqt/qt5/QtMultimedia/gsiDeclQVideoDeviceSelectorControl.cc index 773f4f29e..9898263d0 100644 --- a/src/gsiqt/qt5/QtMultimedia/gsiDeclQVideoDeviceSelectorControl.cc +++ b/src/gsiqt/qt5/QtMultimedia/gsiDeclQVideoDeviceSelectorControl.cc @@ -123,6 +123,22 @@ static void _call_f_deviceName_c767 (const qt_gsi::GenericMethod * /*decl*/, voi } +// void QVideoDeviceSelectorControl::devicesChanged() + + +static void _init_f_devicesChanged_0 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_f_devicesChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + __SUPPRESS_UNUSED_WARNING(ret); + ((QVideoDeviceSelectorControl *)cls)->devicesChanged (); +} + + // int QVideoDeviceSelectorControl::selectedDevice() @@ -138,6 +154,46 @@ static void _call_f_selectedDevice_c0 (const qt_gsi::GenericMethod * /*decl*/, v } +// void QVideoDeviceSelectorControl::selectedDeviceChanged(int index) + + +static void _init_f_selectedDeviceChanged_767 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("index"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_selectedDeviceChanged_767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + int arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QVideoDeviceSelectorControl *)cls)->selectedDeviceChanged (arg1); +} + + +// void QVideoDeviceSelectorControl::selectedDeviceChanged(const QString &deviceName) + + +static void _init_f_selectedDeviceChanged_2025 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("deviceName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_selectedDeviceChanged_2025 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QVideoDeviceSelectorControl *)cls)->selectedDeviceChanged (arg1); +} + + // void QVideoDeviceSelectorControl::setSelectedDevice(int index) @@ -218,12 +274,11 @@ static gsi::Methods methods_QVideoDeviceSelectorControl () { methods += new qt_gsi::GenericMethod ("deviceCount", "@brief Method int QVideoDeviceSelectorControl::deviceCount()\n", true, &_init_f_deviceCount_c0, &_call_f_deviceCount_c0); methods += new qt_gsi::GenericMethod ("deviceDescription", "@brief Method QString QVideoDeviceSelectorControl::deviceDescription(int index)\n", true, &_init_f_deviceDescription_c767, &_call_f_deviceDescription_c767); methods += new qt_gsi::GenericMethod ("deviceName", "@brief Method QString QVideoDeviceSelectorControl::deviceName(int index)\n", true, &_init_f_deviceName_c767, &_call_f_deviceName_c767); + methods += new qt_gsi::GenericMethod ("devicesChanged", "@brief Method void QVideoDeviceSelectorControl::devicesChanged()\n", false, &_init_f_devicesChanged_0, &_call_f_devicesChanged_0); methods += new qt_gsi::GenericMethod (":selectedDevice", "@brief Method int QVideoDeviceSelectorControl::selectedDevice()\n", true, &_init_f_selectedDevice_c0, &_call_f_selectedDevice_c0); + methods += new qt_gsi::GenericMethod ("selectedDeviceChanged_int", "@brief Method void QVideoDeviceSelectorControl::selectedDeviceChanged(int index)\n", false, &_init_f_selectedDeviceChanged_767, &_call_f_selectedDeviceChanged_767); + methods += new qt_gsi::GenericMethod ("selectedDeviceChanged_string", "@brief Method void QVideoDeviceSelectorControl::selectedDeviceChanged(const QString &deviceName)\n", false, &_init_f_selectedDeviceChanged_2025, &_call_f_selectedDeviceChanged_2025); methods += new qt_gsi::GenericMethod ("setSelectedDevice|selectedDevice=", "@brief Method void QVideoDeviceSelectorControl::setSelectedDevice(int index)\n", false, &_init_f_setSelectedDevice_767, &_call_f_setSelectedDevice_767); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QVideoDeviceSelectorControl::destroyed(QObject *)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("devicesChanged()", "devicesChanged", "@brief Signal declaration for QVideoDeviceSelectorControl::devicesChanged()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("selectedDeviceChanged(int)", "selectedDeviceChanged_int", gsi::arg("index"), "@brief Signal declaration for QVideoDeviceSelectorControl::selectedDeviceChanged(int index)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("selectedDeviceChanged(const QString &)", "selectedDeviceChanged_string", gsi::arg("deviceName"), "@brief Signal declaration for QVideoDeviceSelectorControl::selectedDeviceChanged(const QString &deviceName)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QVideoDeviceSelectorControl::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QVideoDeviceSelectorControl::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -287,12 +342,6 @@ public: } } - // [emitter impl] void QVideoDeviceSelectorControl::destroyed(QObject *) - void emitter_QVideoDeviceSelectorControl_destroyed_1302(QObject *arg1) - { - emit QVideoDeviceSelectorControl::destroyed(arg1); - } - // [adaptor impl] int QVideoDeviceSelectorControl::deviceCount() int cbs_deviceCount_c0_0() const { @@ -340,12 +389,6 @@ public: } } - // [emitter impl] void QVideoDeviceSelectorControl::devicesChanged() - void emitter_QVideoDeviceSelectorControl_devicesChanged_0() - { - emit QVideoDeviceSelectorControl::devicesChanged(); - } - // [adaptor impl] bool QVideoDeviceSelectorControl::event(QEvent *) bool cbs_event_1217_0(QEvent *arg1) { @@ -391,18 +434,6 @@ public: } } - // [emitter impl] void QVideoDeviceSelectorControl::selectedDeviceChanged(int index) - void emitter_QVideoDeviceSelectorControl_selectedDeviceChanged_767(int index) - { - emit QVideoDeviceSelectorControl::selectedDeviceChanged(index); - } - - // [emitter impl] void QVideoDeviceSelectorControl::selectedDeviceChanged(const QString &deviceName) - void emitter_QVideoDeviceSelectorControl_selectedDeviceChanged_2025(const QString &deviceName) - { - emit QVideoDeviceSelectorControl::selectedDeviceChanged(deviceName); - } - // [adaptor impl] void QVideoDeviceSelectorControl::setSelectedDevice(int index) void cbs_setSelectedDevice_767_0(int index) { @@ -576,24 +607,6 @@ static void _set_callback_cbs_defaultDevice_c0_0 (void *cls, const gsi::Callback } -// emitter void QVideoDeviceSelectorControl::destroyed(QObject *) - -static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - ((QVideoDeviceSelectorControl_Adaptor *)cls)->emitter_QVideoDeviceSelectorControl_destroyed_1302 (arg1); -} - - // int QVideoDeviceSelectorControl::deviceCount() static void _init_cbs_deviceCount_c0_0 (qt_gsi::GenericMethod *decl) @@ -659,20 +672,6 @@ static void _set_callback_cbs_deviceName_c767_0 (void *cls, const gsi::Callback } -// emitter void QVideoDeviceSelectorControl::devicesChanged() - -static void _init_emitter_devicesChanged_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_devicesChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QVideoDeviceSelectorControl_Adaptor *)cls)->emitter_QVideoDeviceSelectorControl_devicesChanged_0 (); -} - - // void QVideoDeviceSelectorControl::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -801,42 +800,6 @@ static void _set_callback_cbs_selectedDevice_c0_0 (void *cls, const gsi::Callbac } -// emitter void QVideoDeviceSelectorControl::selectedDeviceChanged(int index) - -static void _init_emitter_selectedDeviceChanged_767 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("index"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_selectedDeviceChanged_767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - int arg1 = gsi::arg_reader() (args, heap); - ((QVideoDeviceSelectorControl_Adaptor *)cls)->emitter_QVideoDeviceSelectorControl_selectedDeviceChanged_767 (arg1); -} - - -// emitter void QVideoDeviceSelectorControl::selectedDeviceChanged(const QString &deviceName) - -static void _init_emitter_selectedDeviceChanged_2025 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("deviceName"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_selectedDeviceChanged_2025 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const QString &arg1 = gsi::arg_reader() (args, heap); - ((QVideoDeviceSelectorControl_Adaptor *)cls)->emitter_QVideoDeviceSelectorControl_selectedDeviceChanged_2025 (arg1); -} - - // exposed QObject *QVideoDeviceSelectorControl::sender() static void _init_fp_sender_c0 (qt_gsi::GenericMethod *decl) @@ -927,14 +890,12 @@ static gsi::Methods methods_QVideoDeviceSelectorControl_Adaptor () { methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("defaultDevice", "@brief Virtual method int QVideoDeviceSelectorControl::defaultDevice()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_defaultDevice_c0_0, &_call_cbs_defaultDevice_c0_0); methods += new qt_gsi::GenericMethod ("defaultDevice", "@hide", true, &_init_cbs_defaultDevice_c0_0, &_call_cbs_defaultDevice_c0_0, &_set_callback_cbs_defaultDevice_c0_0); - methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QVideoDeviceSelectorControl::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("deviceCount", "@brief Virtual method int QVideoDeviceSelectorControl::deviceCount()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_deviceCount_c0_0, &_call_cbs_deviceCount_c0_0); methods += new qt_gsi::GenericMethod ("deviceCount", "@hide", true, &_init_cbs_deviceCount_c0_0, &_call_cbs_deviceCount_c0_0, &_set_callback_cbs_deviceCount_c0_0); methods += new qt_gsi::GenericMethod ("deviceDescription", "@brief Virtual method QString QVideoDeviceSelectorControl::deviceDescription(int index)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_deviceDescription_c767_0, &_call_cbs_deviceDescription_c767_0); methods += new qt_gsi::GenericMethod ("deviceDescription", "@hide", true, &_init_cbs_deviceDescription_c767_0, &_call_cbs_deviceDescription_c767_0, &_set_callback_cbs_deviceDescription_c767_0); methods += new qt_gsi::GenericMethod ("deviceName", "@brief Virtual method QString QVideoDeviceSelectorControl::deviceName(int index)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_deviceName_c767_0, &_call_cbs_deviceName_c767_0); methods += new qt_gsi::GenericMethod ("deviceName", "@hide", true, &_init_cbs_deviceName_c767_0, &_call_cbs_deviceName_c767_0, &_set_callback_cbs_deviceName_c767_0); - methods += new qt_gsi::GenericMethod ("emit_devicesChanged", "@brief Emitter for signal void QVideoDeviceSelectorControl::devicesChanged()\nCall this method to emit this signal.", false, &_init_emitter_devicesChanged_0, &_call_emitter_devicesChanged_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QVideoDeviceSelectorControl::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("event", "@brief Virtual method bool QVideoDeviceSelectorControl::event(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0); @@ -945,8 +906,6 @@ static gsi::Methods methods_QVideoDeviceSelectorControl_Adaptor () { methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QVideoDeviceSelectorControl::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("selectedDevice", "@brief Virtual method int QVideoDeviceSelectorControl::selectedDevice()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_selectedDevice_c0_0, &_call_cbs_selectedDevice_c0_0); methods += new qt_gsi::GenericMethod ("selectedDevice", "@hide", true, &_init_cbs_selectedDevice_c0_0, &_call_cbs_selectedDevice_c0_0, &_set_callback_cbs_selectedDevice_c0_0); - methods += new qt_gsi::GenericMethod ("emit_selectedDeviceChanged_int", "@brief Emitter for signal void QVideoDeviceSelectorControl::selectedDeviceChanged(int index)\nCall this method to emit this signal.", false, &_init_emitter_selectedDeviceChanged_767, &_call_emitter_selectedDeviceChanged_767); - methods += new qt_gsi::GenericMethod ("emit_selectedDeviceChanged_string", "@brief Emitter for signal void QVideoDeviceSelectorControl::selectedDeviceChanged(const QString &deviceName)\nCall this method to emit this signal.", false, &_init_emitter_selectedDeviceChanged_2025, &_call_emitter_selectedDeviceChanged_2025); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QVideoDeviceSelectorControl::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QVideoDeviceSelectorControl::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); methods += new qt_gsi::GenericMethod ("setSelectedDevice", "@brief Virtual method void QVideoDeviceSelectorControl::setSelectedDevice(int index)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_setSelectedDevice_767_0, &_call_cbs_setSelectedDevice_767_0); diff --git a/src/gsiqt/qt5/QtMultimedia/gsiDeclQVideoEncoderSettingsControl.cc b/src/gsiqt/qt5/QtMultimedia/gsiDeclQVideoEncoderSettingsControl.cc index f3131c253..b3f19e3cb 100644 --- a/src/gsiqt/qt5/QtMultimedia/gsiDeclQVideoEncoderSettingsControl.cc +++ b/src/gsiqt/qt5/QtMultimedia/gsiDeclQVideoEncoderSettingsControl.cc @@ -232,7 +232,6 @@ static gsi::Methods methods_QVideoEncoderSettingsControl () { methods += new qt_gsi::GenericMethod ("supportedVideoCodecs", "@brief Method QStringList QVideoEncoderSettingsControl::supportedVideoCodecs()\n", true, &_init_f_supportedVideoCodecs_c0, &_call_f_supportedVideoCodecs_c0); methods += new qt_gsi::GenericMethod ("videoCodecDescription", "@brief Method QString QVideoEncoderSettingsControl::videoCodecDescription(const QString &codecName)\n", true, &_init_f_videoCodecDescription_c2025, &_call_f_videoCodecDescription_c2025); methods += new qt_gsi::GenericMethod (":videoSettings", "@brief Method QVideoEncoderSettings QVideoEncoderSettingsControl::videoSettings()\n", true, &_init_f_videoSettings_c0, &_call_f_videoSettings_c0); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QVideoEncoderSettingsControl::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QVideoEncoderSettingsControl::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QVideoEncoderSettingsControl::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -281,12 +280,6 @@ public: return QVideoEncoderSettingsControl::senderSignalIndex(); } - // [emitter impl] void QVideoEncoderSettingsControl::destroyed(QObject *) - void emitter_QVideoEncoderSettingsControl_destroyed_1302(QObject *arg1) - { - emit QVideoEncoderSettingsControl::destroyed(arg1); - } - // [adaptor impl] bool QVideoEncoderSettingsControl::event(QEvent *) bool cbs_event_1217_0(QEvent *arg1) { @@ -551,24 +544,6 @@ static void _set_callback_cbs_customEvent_1217_0 (void *cls, const gsi::Callback } -// emitter void QVideoEncoderSettingsControl::destroyed(QObject *) - -static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - ((QVideoEncoderSettingsControl_Adaptor *)cls)->emitter_QVideoEncoderSettingsControl_destroyed_1302 (arg1); -} - - // void QVideoEncoderSettingsControl::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -879,7 +854,6 @@ static gsi::Methods methods_QVideoEncoderSettingsControl_Adaptor () { methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QVideoEncoderSettingsControl::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); - methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QVideoEncoderSettingsControl::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QVideoEncoderSettingsControl::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("event", "@brief Virtual method bool QVideoEncoderSettingsControl::event(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0); diff --git a/src/gsiqt/qt5/QtMultimedia/gsiDeclQVideoProbe.cc b/src/gsiqt/qt5/QtMultimedia/gsiDeclQVideoProbe.cc index 793aaa900..8318d50b1 100644 --- a/src/gsiqt/qt5/QtMultimedia/gsiDeclQVideoProbe.cc +++ b/src/gsiqt/qt5/QtMultimedia/gsiDeclQVideoProbe.cc @@ -58,6 +58,22 @@ static void _call_smo (const qt_gsi::GenericStaticMethod *, gsi::SerialArgs &, g } +// void QVideoProbe::flush() + + +static void _init_f_flush_0 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_f_flush_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + __SUPPRESS_UNUSED_WARNING(ret); + ((QVideoProbe *)cls)->flush (); +} + + // bool QVideoProbe::isActive() @@ -111,6 +127,26 @@ static void _call_f_setSource_2005 (const qt_gsi::GenericMethod * /*decl*/, void } +// void QVideoProbe::videoFrameProbed(const QVideoFrame &videoFrame) + + +static void _init_f_videoFrameProbed_2388 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("videoFrame"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_videoFrameProbed_2388 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QVideoFrame &arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QVideoProbe *)cls)->videoFrameProbed (arg1); +} + + // static QString QVideoProbe::tr(const char *s, const char *c, int n) @@ -167,12 +203,11 @@ namespace gsi static gsi::Methods methods_QVideoProbe () { gsi::Methods methods; methods += new qt_gsi::GenericStaticMethod ("staticMetaObject", "@brief Obtains the static MetaObject for this class.", &_init_smo, &_call_smo); + methods += new qt_gsi::GenericMethod ("flush", "@brief Method void QVideoProbe::flush()\n", false, &_init_f_flush_0, &_call_f_flush_0); methods += new qt_gsi::GenericMethod ("isActive?", "@brief Method bool QVideoProbe::isActive()\n", true, &_init_f_isActive_c0, &_call_f_isActive_c0); methods += new qt_gsi::GenericMethod ("setSource", "@brief Method bool QVideoProbe::setSource(QMediaObject *source)\n", false, &_init_f_setSource_1782, &_call_f_setSource_1782); methods += new qt_gsi::GenericMethod ("setSource", "@brief Method bool QVideoProbe::setSource(QMediaRecorder *source)\n", false, &_init_f_setSource_2005, &_call_f_setSource_2005); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QVideoProbe::destroyed(QObject *)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("flush()", "flush", "@brief Signal declaration for QVideoProbe::flush()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("videoFrameProbed(const QVideoFrame &)", "videoFrameProbed", gsi::arg("videoFrame"), "@brief Signal declaration for QVideoProbe::videoFrameProbed(const QVideoFrame &videoFrame)\nYou can bind a procedure to this signal."); + methods += new qt_gsi::GenericMethod ("videoFrameProbed", "@brief Method void QVideoProbe::videoFrameProbed(const QVideoFrame &videoFrame)\n", false, &_init_f_videoFrameProbed_2388, &_call_f_videoFrameProbed_2388); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QVideoProbe::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QVideoProbe::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -227,12 +262,6 @@ public: return QVideoProbe::senderSignalIndex(); } - // [emitter impl] void QVideoProbe::destroyed(QObject *) - void emitter_QVideoProbe_destroyed_1302(QObject *arg1) - { - emit QVideoProbe::destroyed(arg1); - } - // [adaptor impl] bool QVideoProbe::event(QEvent *) bool cbs_event_1217_0(QEvent *arg1) { @@ -263,18 +292,6 @@ public: } } - // [emitter impl] void QVideoProbe::flush() - void emitter_QVideoProbe_flush_0() - { - emit QVideoProbe::flush(); - } - - // [emitter impl] void QVideoProbe::videoFrameProbed(const QVideoFrame &videoFrame) - void emitter_QVideoProbe_videoFrameProbed_2388(const QVideoFrame &videoFrame) - { - emit QVideoProbe::videoFrameProbed(videoFrame); - } - // [adaptor impl] void QVideoProbe::childEvent(QChildEvent *) void cbs_childEvent_1701_0(QChildEvent *arg1) { @@ -411,24 +428,6 @@ static void _set_callback_cbs_customEvent_1217_0 (void *cls, const gsi::Callback } -// emitter void QVideoProbe::destroyed(QObject *) - -static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - ((QVideoProbe_Adaptor *)cls)->emitter_QVideoProbe_destroyed_1302 (arg1); -} - - // void QVideoProbe::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -502,20 +501,6 @@ static void _set_callback_cbs_eventFilter_2411_0 (void *cls, const gsi::Callback } -// emitter void QVideoProbe::flush() - -static void _init_emitter_flush_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_flush_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QVideoProbe_Adaptor *)cls)->emitter_QVideoProbe_flush_0 (); -} - - // exposed bool QVideoProbe::isSignalConnected(const QMetaMethod &signal) static void _init_fp_isSignalConnected_c2394 (qt_gsi::GenericMethod *decl) @@ -604,24 +589,6 @@ static void _set_callback_cbs_timerEvent_1730_0 (void *cls, const gsi::Callback } -// emitter void QVideoProbe::videoFrameProbed(const QVideoFrame &videoFrame) - -static void _init_emitter_videoFrameProbed_2388 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("videoFrame"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_videoFrameProbed_2388 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const QVideoFrame &arg1 = gsi::arg_reader() (args, heap); - ((QVideoProbe_Adaptor *)cls)->emitter_QVideoProbe_videoFrameProbed_2388 (arg1); -} - - namespace gsi { @@ -634,21 +601,18 @@ static gsi::Methods methods_QVideoProbe_Adaptor () { methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QVideoProbe::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); - methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QVideoProbe::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QVideoProbe::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("event", "@brief Virtual method bool QVideoProbe::event(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0); methods += new qt_gsi::GenericMethod ("event", "@hide", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0, &_set_callback_cbs_event_1217_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QVideoProbe::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); - methods += new qt_gsi::GenericMethod ("emit_flush", "@brief Emitter for signal void QVideoProbe::flush()\nCall this method to emit this signal.", false, &_init_emitter_flush_0, &_call_emitter_flush_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QVideoProbe::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QVideoProbe::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QVideoProbe::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QVideoProbe::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); methods += new qt_gsi::GenericMethod ("*timerEvent", "@brief Virtual method void QVideoProbe::timerEvent(QTimerEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_timerEvent_1730_0, &_call_cbs_timerEvent_1730_0); methods += new qt_gsi::GenericMethod ("*timerEvent", "@hide", false, &_init_cbs_timerEvent_1730_0, &_call_cbs_timerEvent_1730_0, &_set_callback_cbs_timerEvent_1730_0); - methods += new qt_gsi::GenericMethod ("emit_videoFrameProbed", "@brief Emitter for signal void QVideoProbe::videoFrameProbed(const QVideoFrame &videoFrame)\nCall this method to emit this signal.", false, &_init_emitter_videoFrameProbed_2388, &_call_emitter_videoFrameProbed_2388); return methods; } diff --git a/src/gsiqt/qt5/QtMultimedia/gsiDeclQVideoRendererControl.cc b/src/gsiqt/qt5/QtMultimedia/gsiDeclQVideoRendererControl.cc index 5bd40eaab..36913589a 100644 --- a/src/gsiqt/qt5/QtMultimedia/gsiDeclQVideoRendererControl.cc +++ b/src/gsiqt/qt5/QtMultimedia/gsiDeclQVideoRendererControl.cc @@ -149,7 +149,6 @@ static gsi::Methods methods_QVideoRendererControl () { methods += new qt_gsi::GenericStaticMethod ("staticMetaObject", "@brief Obtains the static MetaObject for this class.", &_init_smo, &_call_smo); methods += new qt_gsi::GenericMethod ("setSurface|surface=", "@brief Method void QVideoRendererControl::setSurface(QAbstractVideoSurface *surface)\n", false, &_init_f_setSurface_2739, &_call_f_setSurface_2739); methods += new qt_gsi::GenericMethod (":surface", "@brief Method QAbstractVideoSurface *QVideoRendererControl::surface()\n", true, &_init_f_surface_c0, &_call_f_surface_c0); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QVideoRendererControl::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QVideoRendererControl::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QVideoRendererControl::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -198,12 +197,6 @@ public: return QVideoRendererControl::senderSignalIndex(); } - // [emitter impl] void QVideoRendererControl::destroyed(QObject *) - void emitter_QVideoRendererControl_destroyed_1302(QObject *arg1) - { - emit QVideoRendererControl::destroyed(arg1); - } - // [adaptor impl] bool QVideoRendererControl::event(QEvent *) bool cbs_event_1217_0(QEvent *arg1) { @@ -399,24 +392,6 @@ static void _set_callback_cbs_customEvent_1217_0 (void *cls, const gsi::Callback } -// emitter void QVideoRendererControl::destroyed(QObject *) - -static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - ((QVideoRendererControl_Adaptor *)cls)->emitter_QVideoRendererControl_destroyed_1302 (arg1); -} - - // void QVideoRendererControl::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -633,7 +608,6 @@ static gsi::Methods methods_QVideoRendererControl_Adaptor () { methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QVideoRendererControl::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); - methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QVideoRendererControl::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QVideoRendererControl::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("event", "@brief Virtual method bool QVideoRendererControl::event(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0); diff --git a/src/gsiqt/qt5/QtMultimedia/gsiDeclQVideoWidget.cc b/src/gsiqt/qt5/QtMultimedia/gsiDeclQVideoWidget.cc index a273b5cd4..2094b1db2 100644 --- a/src/gsiqt/qt5/QtMultimedia/gsiDeclQVideoWidget.cc +++ b/src/gsiqt/qt5/QtMultimedia/gsiDeclQVideoWidget.cc @@ -131,6 +131,26 @@ static void _call_f_brightness_c0 (const qt_gsi::GenericMethod * /*decl*/, void } +// void QVideoWidget::brightnessChanged(int brightness) + + +static void _init_f_brightnessChanged_767 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("brightness"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_brightnessChanged_767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + int arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QVideoWidget *)cls)->brightnessChanged (arg1); +} + + // int QVideoWidget::contrast() @@ -146,6 +166,46 @@ static void _call_f_contrast_c0 (const qt_gsi::GenericMethod * /*decl*/, void *c } +// void QVideoWidget::contrastChanged(int contrast) + + +static void _init_f_contrastChanged_767 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("contrast"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_contrastChanged_767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + int arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QVideoWidget *)cls)->contrastChanged (arg1); +} + + +// void QVideoWidget::fullScreenChanged(bool fullScreen) + + +static void _init_f_fullScreenChanged_864 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("fullScreen"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_fullScreenChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + bool arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QVideoWidget *)cls)->fullScreenChanged (arg1); +} + + // int QVideoWidget::hue() @@ -161,6 +221,26 @@ static void _call_f_hue_c0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, g } +// void QVideoWidget::hueChanged(int hue) + + +static void _init_f_hueChanged_767 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("hue"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_hueChanged_767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + int arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QVideoWidget *)cls)->hueChanged (arg1); +} + + // QMediaObject *QVideoWidget::mediaObject() @@ -191,6 +271,26 @@ static void _call_f_saturation_c0 (const qt_gsi::GenericMethod * /*decl*/, void } +// void QVideoWidget::saturationChanged(int saturation) + + +static void _init_f_saturationChanged_767 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("saturation"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_saturationChanged_767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + int arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QVideoWidget *)cls)->saturationChanged (arg1); +} + + // void QVideoWidget::setAspectRatioMode(Qt::AspectRatioMode mode) @@ -429,10 +529,15 @@ static gsi::Methods methods_QVideoWidget () { methods += new qt_gsi::GenericStaticMethod ("staticMetaObject", "@brief Obtains the static MetaObject for this class.", &_init_smo, &_call_smo); methods += new qt_gsi::GenericMethod (":aspectRatioMode", "@brief Method Qt::AspectRatioMode QVideoWidget::aspectRatioMode()\n", true, &_init_f_aspectRatioMode_c0, &_call_f_aspectRatioMode_c0); methods += new qt_gsi::GenericMethod (":brightness", "@brief Method int QVideoWidget::brightness()\n", true, &_init_f_brightness_c0, &_call_f_brightness_c0); + methods += new qt_gsi::GenericMethod ("brightnessChanged", "@brief Method void QVideoWidget::brightnessChanged(int brightness)\n", false, &_init_f_brightnessChanged_767, &_call_f_brightnessChanged_767); methods += new qt_gsi::GenericMethod (":contrast", "@brief Method int QVideoWidget::contrast()\n", true, &_init_f_contrast_c0, &_call_f_contrast_c0); + methods += new qt_gsi::GenericMethod ("contrastChanged", "@brief Method void QVideoWidget::contrastChanged(int contrast)\n", false, &_init_f_contrastChanged_767, &_call_f_contrastChanged_767); + methods += new qt_gsi::GenericMethod ("fullScreenChanged", "@brief Method void QVideoWidget::fullScreenChanged(bool fullScreen)\n", false, &_init_f_fullScreenChanged_864, &_call_f_fullScreenChanged_864); methods += new qt_gsi::GenericMethod (":hue", "@brief Method int QVideoWidget::hue()\n", true, &_init_f_hue_c0, &_call_f_hue_c0); + methods += new qt_gsi::GenericMethod ("hueChanged", "@brief Method void QVideoWidget::hueChanged(int hue)\n", false, &_init_f_hueChanged_767, &_call_f_hueChanged_767); methods += new qt_gsi::GenericMethod (":mediaObject", "@brief Method QMediaObject *QVideoWidget::mediaObject()\nThis is a reimplementation of QMediaBindableInterface::mediaObject", true, &_init_f_mediaObject_c0, &_call_f_mediaObject_c0); methods += new qt_gsi::GenericMethod (":saturation", "@brief Method int QVideoWidget::saturation()\n", true, &_init_f_saturation_c0, &_call_f_saturation_c0); + methods += new qt_gsi::GenericMethod ("saturationChanged", "@brief Method void QVideoWidget::saturationChanged(int saturation)\n", false, &_init_f_saturationChanged_767, &_call_f_saturationChanged_767); methods += new qt_gsi::GenericMethod ("setAspectRatioMode|aspectRatioMode=", "@brief Method void QVideoWidget::setAspectRatioMode(Qt::AspectRatioMode mode)\n", false, &_init_f_setAspectRatioMode_2257, &_call_f_setAspectRatioMode_2257); methods += new qt_gsi::GenericMethod ("setBrightness|brightness=", "@brief Method void QVideoWidget::setBrightness(int brightness)\n", false, &_init_f_setBrightness_767, &_call_f_setBrightness_767); methods += new qt_gsi::GenericMethod ("setContrast|contrast=", "@brief Method void QVideoWidget::setContrast(int contrast)\n", false, &_init_f_setContrast_767, &_call_f_setContrast_767); @@ -440,16 +545,6 @@ static gsi::Methods methods_QVideoWidget () { methods += new qt_gsi::GenericMethod ("setHue|hue=", "@brief Method void QVideoWidget::setHue(int hue)\n", false, &_init_f_setHue_767, &_call_f_setHue_767); methods += new qt_gsi::GenericMethod ("setSaturation|saturation=", "@brief Method void QVideoWidget::setSaturation(int saturation)\n", false, &_init_f_setSaturation_767, &_call_f_setSaturation_767); methods += new qt_gsi::GenericMethod (":sizeHint", "@brief Method QSize QVideoWidget::sizeHint()\nThis is a reimplementation of QWidget::sizeHint", true, &_init_f_sizeHint_c0, &_call_f_sizeHint_c0); - methods += gsi::qt_signal ("brightnessChanged(int)", "brightnessChanged", gsi::arg("brightness"), "@brief Signal declaration for QVideoWidget::brightnessChanged(int brightness)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("contrastChanged(int)", "contrastChanged", gsi::arg("contrast"), "@brief Signal declaration for QVideoWidget::contrastChanged(int contrast)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("customContextMenuRequested(const QPoint &)", "customContextMenuRequested", gsi::arg("pos"), "@brief Signal declaration for QVideoWidget::customContextMenuRequested(const QPoint &pos)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QVideoWidget::destroyed(QObject *)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("fullScreenChanged(bool)", "fullScreenChanged", gsi::arg("fullScreen"), "@brief Signal declaration for QVideoWidget::fullScreenChanged(bool fullScreen)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("hueChanged(int)", "hueChanged", gsi::arg("hue"), "@brief Signal declaration for QVideoWidget::hueChanged(int hue)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("saturationChanged(int)", "saturationChanged", gsi::arg("saturation"), "@brief Signal declaration for QVideoWidget::saturationChanged(int saturation)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("windowIconChanged(const QIcon &)", "windowIconChanged", gsi::arg("icon"), "@brief Signal declaration for QVideoWidget::windowIconChanged(const QIcon &icon)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("windowIconTextChanged(const QString &)", "windowIconTextChanged", gsi::arg("iconText"), "@brief Signal declaration for QVideoWidget::windowIconTextChanged(const QString &iconText)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("windowTitleChanged(const QString &)", "windowTitleChanged", gsi::arg("title"), "@brief Signal declaration for QVideoWidget::windowTitleChanged(const QString &title)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QVideoWidget::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QVideoWidget::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); methods += new qt_gsi::GenericMethod ("asQWidget", "@brief Delivers the base class interface QWidget of QVideoWidget\nClass QVideoWidget is derived from multiple base classes. This method delivers the QWidget base class aspect.", false, &_init_f_QVideoWidget_as_QWidget, &_call_f_QVideoWidget_as_QWidget); @@ -533,30 +628,6 @@ public: QVideoWidget::updateMicroFocus(); } - // [emitter impl] void QVideoWidget::brightnessChanged(int brightness) - void emitter_QVideoWidget_brightnessChanged_767(int brightness) - { - emit QVideoWidget::brightnessChanged(brightness); - } - - // [emitter impl] void QVideoWidget::contrastChanged(int contrast) - void emitter_QVideoWidget_contrastChanged_767(int contrast) - { - emit QVideoWidget::contrastChanged(contrast); - } - - // [emitter impl] void QVideoWidget::customContextMenuRequested(const QPoint &pos) - void emitter_QVideoWidget_customContextMenuRequested_1916(const QPoint &pos) - { - emit QVideoWidget::customContextMenuRequested(pos); - } - - // [emitter impl] void QVideoWidget::destroyed(QObject *) - void emitter_QVideoWidget_destroyed_1302(QObject *arg1) - { - emit QVideoWidget::destroyed(arg1); - } - // [adaptor impl] bool QVideoWidget::eventFilter(QObject *, QEvent *) bool cbs_eventFilter_2411_0(QObject *arg1, QEvent *arg2) { @@ -572,12 +643,6 @@ public: } } - // [emitter impl] void QVideoWidget::fullScreenChanged(bool fullScreen) - void emitter_QVideoWidget_fullScreenChanged_864(bool fullScreen) - { - emit QVideoWidget::fullScreenChanged(fullScreen); - } - // [adaptor impl] bool QVideoWidget::hasHeightForWidth() bool cbs_hasHeightForWidth_c0_0() const { @@ -608,12 +673,6 @@ public: } } - // [emitter impl] void QVideoWidget::hueChanged(int hue) - void emitter_QVideoWidget_hueChanged_767(int hue) - { - emit QVideoWidget::hueChanged(hue); - } - // [adaptor impl] QVariant QVideoWidget::inputMethodQuery(Qt::InputMethodQuery) QVariant cbs_inputMethodQuery_c2420_0(const qt_gsi::Converter::target_type & arg1) const { @@ -674,12 +733,6 @@ public: } } - // [emitter impl] void QVideoWidget::saturationChanged(int saturation) - void emitter_QVideoWidget_saturationChanged_767(int saturation) - { - emit QVideoWidget::saturationChanged(saturation); - } - // [adaptor impl] void QVideoWidget::setVisible(bool visible) void cbs_setVisible_864_0(bool visible) { @@ -710,24 +763,6 @@ public: } } - // [emitter impl] void QVideoWidget::windowIconChanged(const QIcon &icon) - void emitter_QVideoWidget_windowIconChanged_1787(const QIcon &icon) - { - emit QVideoWidget::windowIconChanged(icon); - } - - // [emitter impl] void QVideoWidget::windowIconTextChanged(const QString &iconText) - void emitter_QVideoWidget_windowIconTextChanged_2025(const QString &iconText) - { - emit QVideoWidget::windowIconTextChanged(iconText); - } - - // [emitter impl] void QVideoWidget::windowTitleChanged(const QString &title) - void emitter_QVideoWidget_windowTitleChanged_2025(const QString &title) - { - emit QVideoWidget::windowTitleChanged(title); - } - // [adaptor impl] void QVideoWidget::actionEvent(QActionEvent *) void cbs_actionEvent_1823_0(QActionEvent *arg1) { @@ -1391,24 +1426,6 @@ static void _set_callback_cbs_actionEvent_1823_0 (void *cls, const gsi::Callback } -// emitter void QVideoWidget::brightnessChanged(int brightness) - -static void _init_emitter_brightnessChanged_767 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("brightness"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_brightnessChanged_767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - int arg1 = gsi::arg_reader() (args, heap); - ((QVideoWidget_Adaptor *)cls)->emitter_QVideoWidget_brightnessChanged_767 (arg1); -} - - // void QVideoWidget::changeEvent(QEvent *) static void _init_cbs_changeEvent_1217_0 (qt_gsi::GenericMethod *decl) @@ -1505,24 +1522,6 @@ static void _set_callback_cbs_contextMenuEvent_2363_0 (void *cls, const gsi::Cal } -// emitter void QVideoWidget::contrastChanged(int contrast) - -static void _init_emitter_contrastChanged_767 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("contrast"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_contrastChanged_767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - int arg1 = gsi::arg_reader() (args, heap); - ((QVideoWidget_Adaptor *)cls)->emitter_QVideoWidget_contrastChanged_767 (arg1); -} - - // exposed void QVideoWidget::create(WId, bool initializeWindow, bool destroyOldWindow) static void _init_fp_create_2208 (qt_gsi::GenericMethod *decl) @@ -1548,24 +1547,6 @@ static void _call_fp_create_2208 (const qt_gsi::GenericMethod * /*decl*/, void * } -// emitter void QVideoWidget::customContextMenuRequested(const QPoint &pos) - -static void _init_emitter_customContextMenuRequested_1916 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("pos"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_customContextMenuRequested_1916 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const QPoint &arg1 = gsi::arg_reader() (args, heap); - ((QVideoWidget_Adaptor *)cls)->emitter_QVideoWidget_customContextMenuRequested_1916 (arg1); -} - - // void QVideoWidget::customEvent(QEvent *) static void _init_cbs_customEvent_1217_0 (qt_gsi::GenericMethod *decl) @@ -1612,24 +1593,6 @@ static void _call_fp_destroy_1620 (const qt_gsi::GenericMethod * /*decl*/, void } -// emitter void QVideoWidget::destroyed(QObject *) - -static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - ((QVideoWidget_Adaptor *)cls)->emitter_QVideoWidget_destroyed_1302 (arg1); -} - - // void QVideoWidget::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -1922,24 +1885,6 @@ static void _call_fp_focusPreviousChild_0 (const qt_gsi::GenericMethod * /*decl* } -// emitter void QVideoWidget::fullScreenChanged(bool fullScreen) - -static void _init_emitter_fullScreenChanged_864 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("fullScreen"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_fullScreenChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - bool arg1 = gsi::arg_reader() (args, heap); - ((QVideoWidget_Adaptor *)cls)->emitter_QVideoWidget_fullScreenChanged_864 (arg1); -} - - // bool QVideoWidget::hasHeightForWidth() static void _init_cbs_hasHeightForWidth_c0_0 (qt_gsi::GenericMethod *decl) @@ -2006,24 +1951,6 @@ static void _set_callback_cbs_hideEvent_1595_0 (void *cls, const gsi::Callback & } -// emitter void QVideoWidget::hueChanged(int hue) - -static void _init_emitter_hueChanged_767 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("hue"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_hueChanged_767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - int arg1 = gsi::arg_reader() (args, heap); - ((QVideoWidget_Adaptor *)cls)->emitter_QVideoWidget_hueChanged_767 (arg1); -} - - // void QVideoWidget::initPainter(QPainter *painter) static void _init_cbs_initPainter_c1426_0 (qt_gsi::GenericMethod *decl) @@ -2503,24 +2430,6 @@ static void _set_callback_cbs_resizeEvent_1843_0 (void *cls, const gsi::Callback } -// emitter void QVideoWidget::saturationChanged(int saturation) - -static void _init_emitter_saturationChanged_767 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("saturation"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_saturationChanged_767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - int arg1 = gsi::arg_reader() (args, heap); - ((QVideoWidget_Adaptor *)cls)->emitter_QVideoWidget_saturationChanged_767 (arg1); -} - - // exposed QObject *QVideoWidget::sender() static void _init_fp_sender_c0 (qt_gsi::GenericMethod *decl) @@ -2745,60 +2654,6 @@ static void _set_callback_cbs_wheelEvent_1718_0 (void *cls, const gsi::Callback } -// emitter void QVideoWidget::windowIconChanged(const QIcon &icon) - -static void _init_emitter_windowIconChanged_1787 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("icon"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_windowIconChanged_1787 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const QIcon &arg1 = gsi::arg_reader() (args, heap); - ((QVideoWidget_Adaptor *)cls)->emitter_QVideoWidget_windowIconChanged_1787 (arg1); -} - - -// emitter void QVideoWidget::windowIconTextChanged(const QString &iconText) - -static void _init_emitter_windowIconTextChanged_2025 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("iconText"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_windowIconTextChanged_2025 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const QString &arg1 = gsi::arg_reader() (args, heap); - ((QVideoWidget_Adaptor *)cls)->emitter_QVideoWidget_windowIconTextChanged_2025 (arg1); -} - - -// emitter void QVideoWidget::windowTitleChanged(const QString &title) - -static void _init_emitter_windowTitleChanged_2025 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("title"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_windowTitleChanged_2025 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const QString &arg1 = gsi::arg_reader() (args, heap); - ((QVideoWidget_Adaptor *)cls)->emitter_QVideoWidget_windowTitleChanged_2025 (arg1); -} - - namespace gsi { @@ -2809,7 +2664,6 @@ static gsi::Methods methods_QVideoWidget_Adaptor () { methods += new qt_gsi::GenericStaticMethod ("new", "@brief Constructor QVideoWidget::QVideoWidget(QWidget *parent)\nThis method creates an object of class QVideoWidget.", &_init_ctor_QVideoWidget_Adaptor_1315, &_call_ctor_QVideoWidget_Adaptor_1315); methods += new qt_gsi::GenericMethod ("*actionEvent", "@brief Virtual method void QVideoWidget::actionEvent(QActionEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_actionEvent_1823_0, &_call_cbs_actionEvent_1823_0); methods += new qt_gsi::GenericMethod ("*actionEvent", "@hide", false, &_init_cbs_actionEvent_1823_0, &_call_cbs_actionEvent_1823_0, &_set_callback_cbs_actionEvent_1823_0); - methods += new qt_gsi::GenericMethod ("emit_brightnessChanged", "@brief Emitter for signal void QVideoWidget::brightnessChanged(int brightness)\nCall this method to emit this signal.", false, &_init_emitter_brightnessChanged_767, &_call_emitter_brightnessChanged_767); methods += new qt_gsi::GenericMethod ("*changeEvent", "@brief Virtual method void QVideoWidget::changeEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_changeEvent_1217_0, &_call_cbs_changeEvent_1217_0); methods += new qt_gsi::GenericMethod ("*changeEvent", "@hide", false, &_init_cbs_changeEvent_1217_0, &_call_cbs_changeEvent_1217_0, &_set_callback_cbs_changeEvent_1217_0); methods += new qt_gsi::GenericMethod ("*childEvent", "@brief Virtual method void QVideoWidget::childEvent(QChildEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0); @@ -2818,13 +2672,10 @@ static gsi::Methods methods_QVideoWidget_Adaptor () { methods += new qt_gsi::GenericMethod ("*closeEvent", "@hide", false, &_init_cbs_closeEvent_1719_0, &_call_cbs_closeEvent_1719_0, &_set_callback_cbs_closeEvent_1719_0); methods += new qt_gsi::GenericMethod ("*contextMenuEvent", "@brief Virtual method void QVideoWidget::contextMenuEvent(QContextMenuEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_contextMenuEvent_2363_0, &_call_cbs_contextMenuEvent_2363_0); methods += new qt_gsi::GenericMethod ("*contextMenuEvent", "@hide", false, &_init_cbs_contextMenuEvent_2363_0, &_call_cbs_contextMenuEvent_2363_0, &_set_callback_cbs_contextMenuEvent_2363_0); - methods += new qt_gsi::GenericMethod ("emit_contrastChanged", "@brief Emitter for signal void QVideoWidget::contrastChanged(int contrast)\nCall this method to emit this signal.", false, &_init_emitter_contrastChanged_767, &_call_emitter_contrastChanged_767); methods += new qt_gsi::GenericMethod ("*qt_create", "@brief Method void QVideoWidget::create(WId, bool initializeWindow, bool destroyOldWindow)\nThis method is protected and can only be called from inside a derived class.", false, &_init_fp_create_2208, &_call_fp_create_2208); - methods += new qt_gsi::GenericMethod ("emit_customContextMenuRequested", "@brief Emitter for signal void QVideoWidget::customContextMenuRequested(const QPoint &pos)\nCall this method to emit this signal.", false, &_init_emitter_customContextMenuRequested_1916, &_call_emitter_customContextMenuRequested_1916); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QVideoWidget::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*qt_destroy", "@brief Method void QVideoWidget::destroy(bool destroyWindow, bool destroySubWindows)\nThis method is protected and can only be called from inside a derived class.", false, &_init_fp_destroy_1620, &_call_fp_destroy_1620); - methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QVideoWidget::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QVideoWidget::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*dragEnterEvent", "@brief Virtual method void QVideoWidget::dragEnterEvent(QDragEnterEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_dragEnterEvent_2109_0, &_call_cbs_dragEnterEvent_2109_0); @@ -2849,14 +2700,12 @@ static gsi::Methods methods_QVideoWidget_Adaptor () { methods += new qt_gsi::GenericMethod ("*focusOutEvent", "@brief Virtual method void QVideoWidget::focusOutEvent(QFocusEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_focusOutEvent_1729_0, &_call_cbs_focusOutEvent_1729_0); methods += new qt_gsi::GenericMethod ("*focusOutEvent", "@hide", false, &_init_cbs_focusOutEvent_1729_0, &_call_cbs_focusOutEvent_1729_0, &_set_callback_cbs_focusOutEvent_1729_0); methods += new qt_gsi::GenericMethod ("*focusPreviousChild", "@brief Method bool QVideoWidget::focusPreviousChild()\nThis method is protected and can only be called from inside a derived class.", false, &_init_fp_focusPreviousChild_0, &_call_fp_focusPreviousChild_0); - methods += new qt_gsi::GenericMethod ("emit_fullScreenChanged", "@brief Emitter for signal void QVideoWidget::fullScreenChanged(bool fullScreen)\nCall this method to emit this signal.", false, &_init_emitter_fullScreenChanged_864, &_call_emitter_fullScreenChanged_864); methods += new qt_gsi::GenericMethod ("hasHeightForWidth", "@brief Virtual method bool QVideoWidget::hasHeightForWidth()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_hasHeightForWidth_c0_0, &_call_cbs_hasHeightForWidth_c0_0); methods += new qt_gsi::GenericMethod ("hasHeightForWidth", "@hide", true, &_init_cbs_hasHeightForWidth_c0_0, &_call_cbs_hasHeightForWidth_c0_0, &_set_callback_cbs_hasHeightForWidth_c0_0); methods += new qt_gsi::GenericMethod ("heightForWidth", "@brief Virtual method int QVideoWidget::heightForWidth(int)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_heightForWidth_c767_0, &_call_cbs_heightForWidth_c767_0); methods += new qt_gsi::GenericMethod ("heightForWidth", "@hide", true, &_init_cbs_heightForWidth_c767_0, &_call_cbs_heightForWidth_c767_0, &_set_callback_cbs_heightForWidth_c767_0); methods += new qt_gsi::GenericMethod ("*hideEvent", "@brief Virtual method void QVideoWidget::hideEvent(QHideEvent *event)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_hideEvent_1595_0, &_call_cbs_hideEvent_1595_0); methods += new qt_gsi::GenericMethod ("*hideEvent", "@hide", false, &_init_cbs_hideEvent_1595_0, &_call_cbs_hideEvent_1595_0, &_set_callback_cbs_hideEvent_1595_0); - methods += new qt_gsi::GenericMethod ("emit_hueChanged", "@brief Emitter for signal void QVideoWidget::hueChanged(int hue)\nCall this method to emit this signal.", false, &_init_emitter_hueChanged_767, &_call_emitter_hueChanged_767); methods += new qt_gsi::GenericMethod ("*initPainter", "@brief Virtual method void QVideoWidget::initPainter(QPainter *painter)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_initPainter_c1426_0, &_call_cbs_initPainter_c1426_0); methods += new qt_gsi::GenericMethod ("*initPainter", "@hide", true, &_init_cbs_initPainter_c1426_0, &_call_cbs_initPainter_c1426_0, &_set_callback_cbs_initPainter_c1426_0); methods += new qt_gsi::GenericMethod ("*inputMethodEvent", "@brief Virtual method void QVideoWidget::inputMethodEvent(QInputMethodEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_inputMethodEvent_2354_0, &_call_cbs_inputMethodEvent_2354_0); @@ -2897,7 +2746,6 @@ static gsi::Methods methods_QVideoWidget_Adaptor () { methods += new qt_gsi::GenericMethod ("*redirected", "@hide", true, &_init_cbs_redirected_c1225_0, &_call_cbs_redirected_c1225_0, &_set_callback_cbs_redirected_c1225_0); methods += new qt_gsi::GenericMethod ("*resizeEvent", "@brief Virtual method void QVideoWidget::resizeEvent(QResizeEvent *event)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_resizeEvent_1843_0, &_call_cbs_resizeEvent_1843_0); methods += new qt_gsi::GenericMethod ("*resizeEvent", "@hide", false, &_init_cbs_resizeEvent_1843_0, &_call_cbs_resizeEvent_1843_0, &_set_callback_cbs_resizeEvent_1843_0); - methods += new qt_gsi::GenericMethod ("emit_saturationChanged", "@brief Emitter for signal void QVideoWidget::saturationChanged(int saturation)\nCall this method to emit this signal.", false, &_init_emitter_saturationChanged_767, &_call_emitter_saturationChanged_767); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QVideoWidget::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QVideoWidget::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); methods += new qt_gsi::GenericMethod ("*setMediaObject", "@brief Virtual method bool QVideoWidget::setMediaObject(QMediaObject *object)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_setMediaObject_1782_0, &_call_cbs_setMediaObject_1782_0); @@ -2917,9 +2765,6 @@ static gsi::Methods methods_QVideoWidget_Adaptor () { methods += new qt_gsi::GenericMethod ("*updateMicroFocus", "@brief Method void QVideoWidget::updateMicroFocus()\nThis method is protected and can only be called from inside a derived class.", false, &_init_fp_updateMicroFocus_0, &_call_fp_updateMicroFocus_0); methods += new qt_gsi::GenericMethod ("*wheelEvent", "@brief Virtual method void QVideoWidget::wheelEvent(QWheelEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_wheelEvent_1718_0, &_call_cbs_wheelEvent_1718_0); methods += new qt_gsi::GenericMethod ("*wheelEvent", "@hide", false, &_init_cbs_wheelEvent_1718_0, &_call_cbs_wheelEvent_1718_0, &_set_callback_cbs_wheelEvent_1718_0); - methods += new qt_gsi::GenericMethod ("emit_windowIconChanged", "@brief Emitter for signal void QVideoWidget::windowIconChanged(const QIcon &icon)\nCall this method to emit this signal.", false, &_init_emitter_windowIconChanged_1787, &_call_emitter_windowIconChanged_1787); - methods += new qt_gsi::GenericMethod ("emit_windowIconTextChanged", "@brief Emitter for signal void QVideoWidget::windowIconTextChanged(const QString &iconText)\nCall this method to emit this signal.", false, &_init_emitter_windowIconTextChanged_2025, &_call_emitter_windowIconTextChanged_2025); - methods += new qt_gsi::GenericMethod ("emit_windowTitleChanged", "@brief Emitter for signal void QVideoWidget::windowTitleChanged(const QString &title)\nCall this method to emit this signal.", false, &_init_emitter_windowTitleChanged_2025, &_call_emitter_windowTitleChanged_2025); return methods; } diff --git a/src/gsiqt/qt5/QtMultimedia/gsiDeclQVideoWindowControl.cc b/src/gsiqt/qt5/QtMultimedia/gsiDeclQVideoWindowControl.cc index 038ab23c8..565c3eeea 100644 --- a/src/gsiqt/qt5/QtMultimedia/gsiDeclQVideoWindowControl.cc +++ b/src/gsiqt/qt5/QtMultimedia/gsiDeclQVideoWindowControl.cc @@ -87,6 +87,26 @@ static void _call_f_brightness_c0 (const qt_gsi::GenericMethod * /*decl*/, void } +// void QVideoWindowControl::brightnessChanged(int brightness) + + +static void _init_f_brightnessChanged_767 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("brightness"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_brightnessChanged_767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + int arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QVideoWindowControl *)cls)->brightnessChanged (arg1); +} + + // int QVideoWindowControl::contrast() @@ -102,6 +122,26 @@ static void _call_f_contrast_c0 (const qt_gsi::GenericMethod * /*decl*/, void *c } +// void QVideoWindowControl::contrastChanged(int contrast) + + +static void _init_f_contrastChanged_767 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("contrast"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_contrastChanged_767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + int arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QVideoWindowControl *)cls)->contrastChanged (arg1); +} + + // QRect QVideoWindowControl::displayRect() @@ -117,6 +157,26 @@ static void _call_f_displayRect_c0 (const qt_gsi::GenericMethod * /*decl*/, void } +// void QVideoWindowControl::fullScreenChanged(bool fullScreen) + + +static void _init_f_fullScreenChanged_864 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("fullScreen"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_fullScreenChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + bool arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QVideoWindowControl *)cls)->fullScreenChanged (arg1); +} + + // int QVideoWindowControl::hue() @@ -132,6 +192,26 @@ static void _call_f_hue_c0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, g } +// void QVideoWindowControl::hueChanged(int hue) + + +static void _init_f_hueChanged_767 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("hue"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_hueChanged_767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + int arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QVideoWindowControl *)cls)->hueChanged (arg1); +} + + // bool QVideoWindowControl::isFullScreen() @@ -162,6 +242,22 @@ static void _call_f_nativeSize_c0 (const qt_gsi::GenericMethod * /*decl*/, void } +// void QVideoWindowControl::nativeSizeChanged() + + +static void _init_f_nativeSizeChanged_0 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_f_nativeSizeChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + __SUPPRESS_UNUSED_WARNING(ret); + ((QVideoWindowControl *)cls)->nativeSizeChanged (); +} + + // void QVideoWindowControl::repaint() @@ -193,6 +289,26 @@ static void _call_f_saturation_c0 (const qt_gsi::GenericMethod * /*decl*/, void } +// void QVideoWindowControl::saturationChanged(int saturation) + + +static void _init_f_saturationChanged_767 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("saturation"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_saturationChanged_767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + int arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QVideoWindowControl *)cls)->saturationChanged (arg1); +} + + // void QVideoWindowControl::setAspectRatioMode(Qt::AspectRatioMode mode) @@ -426,13 +542,19 @@ static gsi::Methods methods_QVideoWindowControl () { methods += new qt_gsi::GenericStaticMethod ("staticMetaObject", "@brief Obtains the static MetaObject for this class.", &_init_smo, &_call_smo); methods += new qt_gsi::GenericMethod (":aspectRatioMode", "@brief Method Qt::AspectRatioMode QVideoWindowControl::aspectRatioMode()\n", true, &_init_f_aspectRatioMode_c0, &_call_f_aspectRatioMode_c0); methods += new qt_gsi::GenericMethod (":brightness", "@brief Method int QVideoWindowControl::brightness()\n", true, &_init_f_brightness_c0, &_call_f_brightness_c0); + methods += new qt_gsi::GenericMethod ("brightnessChanged", "@brief Method void QVideoWindowControl::brightnessChanged(int brightness)\n", false, &_init_f_brightnessChanged_767, &_call_f_brightnessChanged_767); methods += new qt_gsi::GenericMethod (":contrast", "@brief Method int QVideoWindowControl::contrast()\n", true, &_init_f_contrast_c0, &_call_f_contrast_c0); + methods += new qt_gsi::GenericMethod ("contrastChanged", "@brief Method void QVideoWindowControl::contrastChanged(int contrast)\n", false, &_init_f_contrastChanged_767, &_call_f_contrastChanged_767); methods += new qt_gsi::GenericMethod (":displayRect", "@brief Method QRect QVideoWindowControl::displayRect()\n", true, &_init_f_displayRect_c0, &_call_f_displayRect_c0); + methods += new qt_gsi::GenericMethod ("fullScreenChanged", "@brief Method void QVideoWindowControl::fullScreenChanged(bool fullScreen)\n", false, &_init_f_fullScreenChanged_864, &_call_f_fullScreenChanged_864); methods += new qt_gsi::GenericMethod (":hue", "@brief Method int QVideoWindowControl::hue()\n", true, &_init_f_hue_c0, &_call_f_hue_c0); + methods += new qt_gsi::GenericMethod ("hueChanged", "@brief Method void QVideoWindowControl::hueChanged(int hue)\n", false, &_init_f_hueChanged_767, &_call_f_hueChanged_767); methods += new qt_gsi::GenericMethod ("isFullScreen?|:fullScreen", "@brief Method bool QVideoWindowControl::isFullScreen()\n", true, &_init_f_isFullScreen_c0, &_call_f_isFullScreen_c0); methods += new qt_gsi::GenericMethod ("nativeSize", "@brief Method QSize QVideoWindowControl::nativeSize()\n", true, &_init_f_nativeSize_c0, &_call_f_nativeSize_c0); + methods += new qt_gsi::GenericMethod ("nativeSizeChanged", "@brief Method void QVideoWindowControl::nativeSizeChanged()\n", false, &_init_f_nativeSizeChanged_0, &_call_f_nativeSizeChanged_0); methods += new qt_gsi::GenericMethod ("repaint", "@brief Method void QVideoWindowControl::repaint()\n", false, &_init_f_repaint_0, &_call_f_repaint_0); methods += new qt_gsi::GenericMethod (":saturation", "@brief Method int QVideoWindowControl::saturation()\n", true, &_init_f_saturation_c0, &_call_f_saturation_c0); + methods += new qt_gsi::GenericMethod ("saturationChanged", "@brief Method void QVideoWindowControl::saturationChanged(int saturation)\n", false, &_init_f_saturationChanged_767, &_call_f_saturationChanged_767); methods += new qt_gsi::GenericMethod ("setAspectRatioMode|aspectRatioMode=", "@brief Method void QVideoWindowControl::setAspectRatioMode(Qt::AspectRatioMode mode)\n", false, &_init_f_setAspectRatioMode_2257, &_call_f_setAspectRatioMode_2257); methods += new qt_gsi::GenericMethod ("setBrightness|brightness=", "@brief Method void QVideoWindowControl::setBrightness(int brightness)\n", false, &_init_f_setBrightness_767, &_call_f_setBrightness_767); methods += new qt_gsi::GenericMethod ("setContrast|contrast=", "@brief Method void QVideoWindowControl::setContrast(int contrast)\n", false, &_init_f_setContrast_767, &_call_f_setContrast_767); @@ -442,13 +564,6 @@ static gsi::Methods methods_QVideoWindowControl () { methods += new qt_gsi::GenericMethod ("setSaturation|saturation=", "@brief Method void QVideoWindowControl::setSaturation(int saturation)\n", false, &_init_f_setSaturation_767, &_call_f_setSaturation_767); methods += new qt_gsi::GenericMethod ("setWinId|winId=", "@brief Method void QVideoWindowControl::setWinId(WId id)\n", false, &_init_f_setWinId_696, &_call_f_setWinId_696); methods += new qt_gsi::GenericMethod (":winId", "@brief Method WId QVideoWindowControl::winId()\n", true, &_init_f_winId_c0, &_call_f_winId_c0); - methods += gsi::qt_signal ("brightnessChanged(int)", "brightnessChanged", gsi::arg("brightness"), "@brief Signal declaration for QVideoWindowControl::brightnessChanged(int brightness)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("contrastChanged(int)", "contrastChanged", gsi::arg("contrast"), "@brief Signal declaration for QVideoWindowControl::contrastChanged(int contrast)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QVideoWindowControl::destroyed(QObject *)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("fullScreenChanged(bool)", "fullScreenChanged", gsi::arg("fullScreen"), "@brief Signal declaration for QVideoWindowControl::fullScreenChanged(bool fullScreen)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("hueChanged(int)", "hueChanged", gsi::arg("hue"), "@brief Signal declaration for QVideoWindowControl::hueChanged(int hue)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("nativeSizeChanged()", "nativeSizeChanged", "@brief Signal declaration for QVideoWindowControl::nativeSizeChanged()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("saturationChanged(int)", "saturationChanged", gsi::arg("saturation"), "@brief Signal declaration for QVideoWindowControl::saturationChanged(int saturation)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QVideoWindowControl::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QVideoWindowControl::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -527,12 +642,6 @@ public: } } - // [emitter impl] void QVideoWindowControl::brightnessChanged(int brightness) - void emitter_QVideoWindowControl_brightnessChanged_767(int brightness) - { - emit QVideoWindowControl::brightnessChanged(brightness); - } - // [adaptor impl] int QVideoWindowControl::contrast() int cbs_contrast_c0_0() const { @@ -548,18 +657,6 @@ public: } } - // [emitter impl] void QVideoWindowControl::contrastChanged(int contrast) - void emitter_QVideoWindowControl_contrastChanged_767(int contrast) - { - emit QVideoWindowControl::contrastChanged(contrast); - } - - // [emitter impl] void QVideoWindowControl::destroyed(QObject *) - void emitter_QVideoWindowControl_destroyed_1302(QObject *arg1) - { - emit QVideoWindowControl::destroyed(arg1); - } - // [adaptor impl] QRect QVideoWindowControl::displayRect() QRect cbs_displayRect_c0_0() const { @@ -605,12 +702,6 @@ public: } } - // [emitter impl] void QVideoWindowControl::fullScreenChanged(bool fullScreen) - void emitter_QVideoWindowControl_fullScreenChanged_864(bool fullScreen) - { - emit QVideoWindowControl::fullScreenChanged(fullScreen); - } - // [adaptor impl] int QVideoWindowControl::hue() int cbs_hue_c0_0() const { @@ -626,12 +717,6 @@ public: } } - // [emitter impl] void QVideoWindowControl::hueChanged(int hue) - void emitter_QVideoWindowControl_hueChanged_767(int hue) - { - emit QVideoWindowControl::hueChanged(hue); - } - // [adaptor impl] bool QVideoWindowControl::isFullScreen() bool cbs_isFullScreen_c0_0() const { @@ -662,12 +747,6 @@ public: } } - // [emitter impl] void QVideoWindowControl::nativeSizeChanged() - void emitter_QVideoWindowControl_nativeSizeChanged_0() - { - emit QVideoWindowControl::nativeSizeChanged(); - } - // [adaptor impl] void QVideoWindowControl::repaint() void cbs_repaint_0_0() { @@ -698,12 +777,6 @@ public: } } - // [emitter impl] void QVideoWindowControl::saturationChanged(int saturation) - void emitter_QVideoWindowControl_saturationChanged_767(int saturation) - { - emit QVideoWindowControl::saturationChanged(saturation); - } - // [adaptor impl] void QVideoWindowControl::setAspectRatioMode(Qt::AspectRatioMode mode) void cbs_setAspectRatioMode_2257_0(const qt_gsi::Converter::target_type & mode) { @@ -987,24 +1060,6 @@ static void _set_callback_cbs_brightness_c0_0 (void *cls, const gsi::Callback &c } -// emitter void QVideoWindowControl::brightnessChanged(int brightness) - -static void _init_emitter_brightnessChanged_767 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("brightness"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_brightnessChanged_767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - int arg1 = gsi::arg_reader() (args, heap); - ((QVideoWindowControl_Adaptor *)cls)->emitter_QVideoWindowControl_brightnessChanged_767 (arg1); -} - - // void QVideoWindowControl::childEvent(QChildEvent *) static void _init_cbs_childEvent_1701_0 (qt_gsi::GenericMethod *decl) @@ -1048,24 +1103,6 @@ static void _set_callback_cbs_contrast_c0_0 (void *cls, const gsi::Callback &cb) } -// emitter void QVideoWindowControl::contrastChanged(int contrast) - -static void _init_emitter_contrastChanged_767 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("contrast"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_contrastChanged_767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - int arg1 = gsi::arg_reader() (args, heap); - ((QVideoWindowControl_Adaptor *)cls)->emitter_QVideoWindowControl_contrastChanged_767 (arg1); -} - - // void QVideoWindowControl::customEvent(QEvent *) static void _init_cbs_customEvent_1217_0 (qt_gsi::GenericMethod *decl) @@ -1090,24 +1127,6 @@ static void _set_callback_cbs_customEvent_1217_0 (void *cls, const gsi::Callback } -// emitter void QVideoWindowControl::destroyed(QObject *) - -static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - ((QVideoWindowControl_Adaptor *)cls)->emitter_QVideoWindowControl_destroyed_1302 (arg1); -} - - // void QVideoWindowControl::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -1200,24 +1219,6 @@ static void _set_callback_cbs_eventFilter_2411_0 (void *cls, const gsi::Callback } -// emitter void QVideoWindowControl::fullScreenChanged(bool fullScreen) - -static void _init_emitter_fullScreenChanged_864 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("fullScreen"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_fullScreenChanged_864 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - bool arg1 = gsi::arg_reader() (args, heap); - ((QVideoWindowControl_Adaptor *)cls)->emitter_QVideoWindowControl_fullScreenChanged_864 (arg1); -} - - // int QVideoWindowControl::hue() static void _init_cbs_hue_c0_0 (qt_gsi::GenericMethod *decl) @@ -1237,24 +1238,6 @@ static void _set_callback_cbs_hue_c0_0 (void *cls, const gsi::Callback &cb) } -// emitter void QVideoWindowControl::hueChanged(int hue) - -static void _init_emitter_hueChanged_767 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("hue"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_hueChanged_767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - int arg1 = gsi::arg_reader() (args, heap); - ((QVideoWindowControl_Adaptor *)cls)->emitter_QVideoWindowControl_hueChanged_767 (arg1); -} - - // bool QVideoWindowControl::isFullScreen() static void _init_cbs_isFullScreen_c0_0 (qt_gsi::GenericMethod *decl) @@ -1311,20 +1294,6 @@ static void _set_callback_cbs_nativeSize_c0_0 (void *cls, const gsi::Callback &c } -// emitter void QVideoWindowControl::nativeSizeChanged() - -static void _init_emitter_nativeSizeChanged_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_nativeSizeChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QVideoWindowControl_Adaptor *)cls)->emitter_QVideoWindowControl_nativeSizeChanged_0 (); -} - - // exposed int QVideoWindowControl::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -1382,24 +1351,6 @@ static void _set_callback_cbs_saturation_c0_0 (void *cls, const gsi::Callback &c } -// emitter void QVideoWindowControl::saturationChanged(int saturation) - -static void _init_emitter_saturationChanged_767 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("saturation"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_saturationChanged_767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - int arg1 = gsi::arg_reader() (args, heap); - ((QVideoWindowControl_Adaptor *)cls)->emitter_QVideoWindowControl_saturationChanged_767 (arg1); -} - - // exposed QObject *QVideoWindowControl::sender() static void _init_fp_sender_c0 (qt_gsi::GenericMethod *decl) @@ -1675,15 +1626,12 @@ static gsi::Methods methods_QVideoWindowControl_Adaptor () { methods += new qt_gsi::GenericMethod ("aspectRatioMode", "@hide", true, &_init_cbs_aspectRatioMode_c0_0, &_call_cbs_aspectRatioMode_c0_0, &_set_callback_cbs_aspectRatioMode_c0_0); methods += new qt_gsi::GenericMethod ("brightness", "@brief Virtual method int QVideoWindowControl::brightness()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_brightness_c0_0, &_call_cbs_brightness_c0_0); methods += new qt_gsi::GenericMethod ("brightness", "@hide", true, &_init_cbs_brightness_c0_0, &_call_cbs_brightness_c0_0, &_set_callback_cbs_brightness_c0_0); - methods += new qt_gsi::GenericMethod ("emit_brightnessChanged", "@brief Emitter for signal void QVideoWindowControl::brightnessChanged(int brightness)\nCall this method to emit this signal.", false, &_init_emitter_brightnessChanged_767, &_call_emitter_brightnessChanged_767); methods += new qt_gsi::GenericMethod ("*childEvent", "@brief Virtual method void QVideoWindowControl::childEvent(QChildEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("contrast", "@brief Virtual method int QVideoWindowControl::contrast()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_contrast_c0_0, &_call_cbs_contrast_c0_0); methods += new qt_gsi::GenericMethod ("contrast", "@hide", true, &_init_cbs_contrast_c0_0, &_call_cbs_contrast_c0_0, &_set_callback_cbs_contrast_c0_0); - methods += new qt_gsi::GenericMethod ("emit_contrastChanged", "@brief Emitter for signal void QVideoWindowControl::contrastChanged(int contrast)\nCall this method to emit this signal.", false, &_init_emitter_contrastChanged_767, &_call_emitter_contrastChanged_767); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QVideoWindowControl::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); - methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QVideoWindowControl::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QVideoWindowControl::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("displayRect", "@brief Virtual method QRect QVideoWindowControl::displayRect()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_displayRect_c0_0, &_call_cbs_displayRect_c0_0); @@ -1692,22 +1640,18 @@ static gsi::Methods methods_QVideoWindowControl_Adaptor () { methods += new qt_gsi::GenericMethod ("event", "@hide", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0, &_set_callback_cbs_event_1217_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QVideoWindowControl::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); - methods += new qt_gsi::GenericMethod ("emit_fullScreenChanged", "@brief Emitter for signal void QVideoWindowControl::fullScreenChanged(bool fullScreen)\nCall this method to emit this signal.", false, &_init_emitter_fullScreenChanged_864, &_call_emitter_fullScreenChanged_864); methods += new qt_gsi::GenericMethod ("hue", "@brief Virtual method int QVideoWindowControl::hue()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_hue_c0_0, &_call_cbs_hue_c0_0); methods += new qt_gsi::GenericMethod ("hue", "@hide", true, &_init_cbs_hue_c0_0, &_call_cbs_hue_c0_0, &_set_callback_cbs_hue_c0_0); - methods += new qt_gsi::GenericMethod ("emit_hueChanged", "@brief Emitter for signal void QVideoWindowControl::hueChanged(int hue)\nCall this method to emit this signal.", false, &_init_emitter_hueChanged_767, &_call_emitter_hueChanged_767); methods += new qt_gsi::GenericMethod ("isFullScreen", "@brief Virtual method bool QVideoWindowControl::isFullScreen()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_isFullScreen_c0_0, &_call_cbs_isFullScreen_c0_0); methods += new qt_gsi::GenericMethod ("isFullScreen", "@hide", true, &_init_cbs_isFullScreen_c0_0, &_call_cbs_isFullScreen_c0_0, &_set_callback_cbs_isFullScreen_c0_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QVideoWindowControl::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); methods += new qt_gsi::GenericMethod ("nativeSize", "@brief Virtual method QSize QVideoWindowControl::nativeSize()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_nativeSize_c0_0, &_call_cbs_nativeSize_c0_0); methods += new qt_gsi::GenericMethod ("nativeSize", "@hide", true, &_init_cbs_nativeSize_c0_0, &_call_cbs_nativeSize_c0_0, &_set_callback_cbs_nativeSize_c0_0); - methods += new qt_gsi::GenericMethod ("emit_nativeSizeChanged", "@brief Emitter for signal void QVideoWindowControl::nativeSizeChanged()\nCall this method to emit this signal.", false, &_init_emitter_nativeSizeChanged_0, &_call_emitter_nativeSizeChanged_0); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QVideoWindowControl::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("repaint", "@brief Virtual method void QVideoWindowControl::repaint()\nThis method can be reimplemented in a derived class.", false, &_init_cbs_repaint_0_0, &_call_cbs_repaint_0_0); methods += new qt_gsi::GenericMethod ("repaint", "@hide", false, &_init_cbs_repaint_0_0, &_call_cbs_repaint_0_0, &_set_callback_cbs_repaint_0_0); methods += new qt_gsi::GenericMethod ("saturation", "@brief Virtual method int QVideoWindowControl::saturation()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_saturation_c0_0, &_call_cbs_saturation_c0_0); methods += new qt_gsi::GenericMethod ("saturation", "@hide", true, &_init_cbs_saturation_c0_0, &_call_cbs_saturation_c0_0, &_set_callback_cbs_saturation_c0_0); - methods += new qt_gsi::GenericMethod ("emit_saturationChanged", "@brief Emitter for signal void QVideoWindowControl::saturationChanged(int saturation)\nCall this method to emit this signal.", false, &_init_emitter_saturationChanged_767, &_call_emitter_saturationChanged_767); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QVideoWindowControl::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QVideoWindowControl::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); methods += new qt_gsi::GenericMethod ("setAspectRatioMode", "@brief Virtual method void QVideoWindowControl::setAspectRatioMode(Qt::AspectRatioMode mode)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_setAspectRatioMode_2257_0, &_call_cbs_setAspectRatioMode_2257_0); diff --git a/src/gsiqt/qt5/QtNetwork/gsiDeclQAbstractNetworkCache.cc b/src/gsiqt/qt5/QtNetwork/gsiDeclQAbstractNetworkCache.cc index 6ddc66c1a..df8c19b6d 100644 --- a/src/gsiqt/qt5/QtNetwork/gsiDeclQAbstractNetworkCache.cc +++ b/src/gsiqt/qt5/QtNetwork/gsiDeclQAbstractNetworkCache.cc @@ -270,6 +270,7 @@ static gsi::Methods methods_QAbstractNetworkCache () { methods += new qt_gsi::GenericMethod ("remove", "@brief Method bool QAbstractNetworkCache::remove(const QUrl &url)\n", false, &_init_f_remove_1701, &_call_f_remove_1701); methods += new qt_gsi::GenericMethod ("updateMetaData", "@brief Method void QAbstractNetworkCache::updateMetaData(const QNetworkCacheMetaData &metaData)\n", false, &_init_f_updateMetaData_3377, &_call_f_updateMetaData_3377); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QAbstractNetworkCache::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QAbstractNetworkCache::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QAbstractNetworkCache::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QAbstractNetworkCache::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -432,6 +433,13 @@ public: } } + // [emitter impl] void QAbstractNetworkCache::objectNameChanged(const QString &objectName) + void emitter_QAbstractNetworkCache_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QAbstractNetworkCache::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QIODevice *QAbstractNetworkCache::prepare(const QNetworkCacheMetaData &metaData) QIODevice * cbs_prepare_3377_0(const QNetworkCacheMetaData &metaData) { @@ -838,6 +846,24 @@ static void _set_callback_cbs_metaData_1701_0 (void *cls, const gsi::Callback &c } +// emitter void QAbstractNetworkCache::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QAbstractNetworkCache_Adaptor *)cls)->emitter_QAbstractNetworkCache_objectNameChanged_4567 (arg1); +} + + // QIODevice *QAbstractNetworkCache::prepare(const QNetworkCacheMetaData &metaData) static void _init_cbs_prepare_3377_0 (qt_gsi::GenericMethod *decl) @@ -1008,6 +1034,7 @@ static gsi::Methods methods_QAbstractNetworkCache_Adaptor () { methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QAbstractNetworkCache::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); methods += new qt_gsi::GenericMethod ("metaData", "@brief Virtual method QNetworkCacheMetaData QAbstractNetworkCache::metaData(const QUrl &url)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_metaData_1701_0, &_call_cbs_metaData_1701_0); methods += new qt_gsi::GenericMethod ("metaData", "@hide", false, &_init_cbs_metaData_1701_0, &_call_cbs_metaData_1701_0, &_set_callback_cbs_metaData_1701_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QAbstractNetworkCache::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("prepare", "@brief Virtual method QIODevice *QAbstractNetworkCache::prepare(const QNetworkCacheMetaData &metaData)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_prepare_3377_0, &_call_cbs_prepare_3377_0); methods += new qt_gsi::GenericMethod ("prepare", "@hide", false, &_init_cbs_prepare_3377_0, &_call_cbs_prepare_3377_0, &_set_callback_cbs_prepare_3377_0); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QAbstractNetworkCache::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); diff --git a/src/gsiqt/qt5/QtNetwork/gsiDeclQAbstractSocket.cc b/src/gsiqt/qt5/QtNetwork/gsiDeclQAbstractSocket.cc index c618c870e..12013503a 100644 --- a/src/gsiqt/qt5/QtNetwork/gsiDeclQAbstractSocket.cc +++ b/src/gsiqt/qt5/QtNetwork/gsiDeclQAbstractSocket.cc @@ -834,6 +834,7 @@ static gsi::Methods methods_QAbstractSocket () { methods += gsi::qt_signal ("disconnected()", "disconnected", "@brief Signal declaration for QAbstractSocket::disconnected()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal::target_type & > ("error(QAbstractSocket::SocketError)", "error_sig", gsi::arg("arg1"), "@brief Signal declaration for QAbstractSocket::error(QAbstractSocket::SocketError)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("hostFound()", "hostFound", "@brief Signal declaration for QAbstractSocket::hostFound()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QAbstractSocket::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("proxyAuthenticationRequired(const QNetworkProxy &, QAuthenticator *)", "proxyAuthenticationRequired", gsi::arg("proxy"), gsi::arg("authenticator"), "@brief Signal declaration for QAbstractSocket::proxyAuthenticationRequired(const QNetworkProxy &proxy, QAuthenticator *authenticator)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("readChannelFinished()", "readChannelFinished", "@brief Signal declaration for QAbstractSocket::readChannelFinished()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("readyRead()", "readyRead", "@brief Signal declaration for QAbstractSocket::readyRead()\nYou can bind a procedure to this signal."); diff --git a/src/gsiqt/qt5/QtNetwork/gsiDeclQDnsLookup.cc b/src/gsiqt/qt5/QtNetwork/gsiDeclQDnsLookup.cc index d3c65581c..819b2c52e 100644 --- a/src/gsiqt/qt5/QtNetwork/gsiDeclQDnsLookup.cc +++ b/src/gsiqt/qt5/QtNetwork/gsiDeclQDnsLookup.cc @@ -426,6 +426,7 @@ static gsi::Methods methods_QDnsLookup () { methods += gsi::qt_signal ("finished()", "finished", "@brief Signal declaration for QDnsLookup::finished()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("nameChanged(const QString &)", "nameChanged", gsi::arg("name"), "@brief Signal declaration for QDnsLookup::nameChanged(const QString &name)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("nameserverChanged(const QHostAddress &)", "nameserverChanged", gsi::arg("nameserver"), "@brief Signal declaration for QDnsLookup::nameserverChanged(const QHostAddress &nameserver)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QDnsLookup::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal::target_type & > ("typeChanged(QDnsLookup::Type)", "typeChanged", gsi::arg("type"), "@brief Signal declaration for QDnsLookup::typeChanged(QDnsLookup::Type type)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QDnsLookup::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QDnsLookup::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); @@ -559,6 +560,13 @@ public: emit QDnsLookup::nameserverChanged(nameserver); } + // [emitter impl] void QDnsLookup::objectNameChanged(const QString &objectName) + void emitter_QDnsLookup_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QDnsLookup::objectNameChanged(const QString &objectName)'"); + } + // [emitter impl] void QDnsLookup::typeChanged(QDnsLookup::Type type) void emitter_QDnsLookup_typeChanged_1978(QDnsLookup::Type type) { @@ -911,6 +919,24 @@ static void _call_emitter_nameserverChanged_2518 (const qt_gsi::GenericMethod * } +// emitter void QDnsLookup::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QDnsLookup_Adaptor *)cls)->emitter_QDnsLookup_objectNameChanged_4567 (arg1); +} + + // exposed int QDnsLookup::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -1024,6 +1050,7 @@ static gsi::Methods methods_QDnsLookup_Adaptor () { methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QDnsLookup::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); methods += new qt_gsi::GenericMethod ("emit_nameChanged", "@brief Emitter for signal void QDnsLookup::nameChanged(const QString &name)\nCall this method to emit this signal.", false, &_init_emitter_nameChanged_2025, &_call_emitter_nameChanged_2025); methods += new qt_gsi::GenericMethod ("emit_nameserverChanged", "@brief Emitter for signal void QDnsLookup::nameserverChanged(const QHostAddress &nameserver)\nCall this method to emit this signal.", false, &_init_emitter_nameserverChanged_2518, &_call_emitter_nameserverChanged_2518); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QDnsLookup::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QDnsLookup::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QDnsLookup::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QDnsLookup::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); diff --git a/src/gsiqt/qt5/QtNetwork/gsiDeclQHttpMultiPart.cc b/src/gsiqt/qt5/QtNetwork/gsiDeclQHttpMultiPart.cc index 238e53b26..7496bfbf1 100644 --- a/src/gsiqt/qt5/QtNetwork/gsiDeclQHttpMultiPart.cc +++ b/src/gsiqt/qt5/QtNetwork/gsiDeclQHttpMultiPart.cc @@ -192,6 +192,7 @@ static gsi::Methods methods_QHttpMultiPart () { methods += new qt_gsi::GenericMethod ("setBoundary|boundary=", "@brief Method void QHttpMultiPart::setBoundary(const QByteArray &boundary)\n", false, &_init_f_setBoundary_2309, &_call_f_setBoundary_2309); methods += new qt_gsi::GenericMethod ("setContentType", "@brief Method void QHttpMultiPart::setContentType(QHttpMultiPart::ContentType contentType)\n", false, &_init_f_setContentType_3128, &_call_f_setContentType_3128); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QHttpMultiPart::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QHttpMultiPart::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QHttpMultiPart::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QHttpMultiPart::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -294,6 +295,13 @@ public: } } + // [emitter impl] void QHttpMultiPart::objectNameChanged(const QString &objectName) + void emitter_QHttpMultiPart_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QHttpMultiPart::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] void QHttpMultiPart::childEvent(QChildEvent *) void cbs_childEvent_1701_0(QChildEvent *arg1) { @@ -560,6 +568,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QHttpMultiPart::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QHttpMultiPart_Adaptor *)cls)->emitter_QHttpMultiPart_objectNameChanged_4567 (arg1); +} + + // exposed int QHttpMultiPart::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -651,6 +677,7 @@ static gsi::Methods methods_QHttpMultiPart_Adaptor () { methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QHttpMultiPart::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QHttpMultiPart::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QHttpMultiPart::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QHttpMultiPart::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QHttpMultiPart::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QHttpMultiPart::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); diff --git a/src/gsiqt/qt5/QtNetwork/gsiDeclQLocalServer.cc b/src/gsiqt/qt5/QtNetwork/gsiDeclQLocalServer.cc index b6295bfbd..a059f7220 100644 --- a/src/gsiqt/qt5/QtNetwork/gsiDeclQLocalServer.cc +++ b/src/gsiqt/qt5/QtNetwork/gsiDeclQLocalServer.cc @@ -399,6 +399,7 @@ static gsi::Methods methods_QLocalServer () { methods += new qt_gsi::GenericMethod ("waitForNewConnection", "@brief Method bool QLocalServer::waitForNewConnection(int msec, bool *timedOut)\n", false, &_init_f_waitForNewConnection_1709, &_call_f_waitForNewConnection_1709); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QLocalServer::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("newConnection()", "newConnection", "@brief Signal declaration for QLocalServer::newConnection()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QLocalServer::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("removeServer", "@brief Static method bool QLocalServer::removeServer(const QString &name)\nThis method is static and can be called without an instance.", &_init_f_removeServer_2025, &_call_f_removeServer_2025); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QLocalServer::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QLocalServer::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); @@ -526,6 +527,13 @@ public: } } + // [emitter impl] void QLocalServer::objectNameChanged(const QString &objectName) + void emitter_QLocalServer_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QLocalServer::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] void QLocalServer::childEvent(QChildEvent *) void cbs_childEvent_1701_0(QChildEvent *arg1) { @@ -865,6 +873,24 @@ static void _set_callback_cbs_nextPendingConnection_0_0 (void *cls, const gsi::C } +// emitter void QLocalServer::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QLocalServer_Adaptor *)cls)->emitter_QLocalServer_objectNameChanged_4567 (arg1); +} + + // exposed int QLocalServer::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -962,6 +988,7 @@ static gsi::Methods methods_QLocalServer_Adaptor () { methods += new qt_gsi::GenericMethod ("emit_newConnection", "@brief Emitter for signal void QLocalServer::newConnection()\nCall this method to emit this signal.", false, &_init_emitter_newConnection_0, &_call_emitter_newConnection_0); methods += new qt_gsi::GenericMethod ("nextPendingConnection", "@brief Virtual method QLocalSocket *QLocalServer::nextPendingConnection()\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nextPendingConnection_0_0, &_call_cbs_nextPendingConnection_0_0); methods += new qt_gsi::GenericMethod ("nextPendingConnection", "@hide", false, &_init_cbs_nextPendingConnection_0_0, &_call_cbs_nextPendingConnection_0_0, &_set_callback_cbs_nextPendingConnection_0_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QLocalServer::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QLocalServer::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QLocalServer::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QLocalServer::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); diff --git a/src/gsiqt/qt5/QtNetwork/gsiDeclQLocalSocket.cc b/src/gsiqt/qt5/QtNetwork/gsiDeclQLocalSocket.cc index 565433324..c7ee3981a 100644 --- a/src/gsiqt/qt5/QtNetwork/gsiDeclQLocalSocket.cc +++ b/src/gsiqt/qt5/QtNetwork/gsiDeclQLocalSocket.cc @@ -592,6 +592,7 @@ static gsi::Methods methods_QLocalSocket () { methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QLocalSocket::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("disconnected()", "disconnected", "@brief Signal declaration for QLocalSocket::disconnected()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal::target_type & > ("error(QLocalSocket::LocalSocketError)", "error_sig", gsi::arg("socketError"), "@brief Signal declaration for QLocalSocket::error(QLocalSocket::LocalSocketError socketError)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QLocalSocket::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("readChannelFinished()", "readChannelFinished", "@brief Signal declaration for QLocalSocket::readChannelFinished()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("readyRead()", "readyRead", "@brief Signal declaration for QLocalSocket::readyRead()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal::target_type & > ("stateChanged(QLocalSocket::LocalSocketState)", "stateChanged", gsi::arg("socketState"), "@brief Signal declaration for QLocalSocket::stateChanged(QLocalSocket::LocalSocketState socketState)\nYou can bind a procedure to this signal."); diff --git a/src/gsiqt/qt5/QtNetwork/gsiDeclQNetworkAccessManager.cc b/src/gsiqt/qt5/QtNetwork/gsiDeclQNetworkAccessManager.cc index 8bff61de1..ed19cf1cf 100644 --- a/src/gsiqt/qt5/QtNetwork/gsiDeclQNetworkAccessManager.cc +++ b/src/gsiqt/qt5/QtNetwork/gsiDeclQNetworkAccessManager.cc @@ -676,6 +676,7 @@ static gsi::Methods methods_QNetworkAccessManager () { methods += gsi::qt_signal ("finished(QNetworkReply *)", "finished", gsi::arg("reply"), "@brief Signal declaration for QNetworkAccessManager::finished(QNetworkReply *reply)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal::target_type & > ("networkAccessibleChanged(QNetworkAccessManager::NetworkAccessibility)", "networkAccessibleChanged", gsi::arg("accessible"), "@brief Signal declaration for QNetworkAccessManager::networkAccessibleChanged(QNetworkAccessManager::NetworkAccessibility accessible)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("networkSessionConnected()", "networkSessionConnected", "@brief Signal declaration for QNetworkAccessManager::networkSessionConnected()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QNetworkAccessManager::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("preSharedKeyAuthenticationRequired(QNetworkReply *, QSslPreSharedKeyAuthenticator *)", "preSharedKeyAuthenticationRequired", gsi::arg("reply"), gsi::arg("authenticator"), "@brief Signal declaration for QNetworkAccessManager::preSharedKeyAuthenticationRequired(QNetworkReply *reply, QSslPreSharedKeyAuthenticator *authenticator)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("proxyAuthenticationRequired(const QNetworkProxy &, QAuthenticator *)", "proxyAuthenticationRequired", gsi::arg("proxy"), gsi::arg("authenticator"), "@brief Signal declaration for QNetworkAccessManager::proxyAuthenticationRequired(const QNetworkProxy &proxy, QAuthenticator *authenticator)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal & > ("sslErrors(QNetworkReply *, const QList &)", "sslErrors", gsi::arg("reply"), gsi::arg("errors"), "@brief Signal declaration for QNetworkAccessManager::sslErrors(QNetworkReply *reply, const QList &errors)\nYou can bind a procedure to this signal."); @@ -804,6 +805,13 @@ public: emit QNetworkAccessManager::networkSessionConnected(); } + // [emitter impl] void QNetworkAccessManager::objectNameChanged(const QString &objectName) + void emitter_QNetworkAccessManager_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QNetworkAccessManager::objectNameChanged(const QString &objectName)'"); + } + // [emitter impl] void QNetworkAccessManager::preSharedKeyAuthenticationRequired(QNetworkReply *reply, QSslPreSharedKeyAuthenticator *authenticator) void emitter_QNetworkAccessManager_preSharedKeyAuthenticationRequired_5436(QNetworkReply *reply, QSslPreSharedKeyAuthenticator *authenticator) { @@ -1201,6 +1209,24 @@ static void _call_emitter_networkSessionConnected_0 (const qt_gsi::GenericMethod } +// emitter void QNetworkAccessManager::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QNetworkAccessManager_Adaptor *)cls)->emitter_QNetworkAccessManager_objectNameChanged_4567 (arg1); +} + + // emitter void QNetworkAccessManager::preSharedKeyAuthenticationRequired(QNetworkReply *reply, QSslPreSharedKeyAuthenticator *authenticator) static void _init_emitter_preSharedKeyAuthenticationRequired_5436 (qt_gsi::GenericMethod *decl) @@ -1375,6 +1401,7 @@ static gsi::Methods methods_QNetworkAccessManager_Adaptor () { methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QNetworkAccessManager::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); methods += new qt_gsi::GenericMethod ("emit_networkAccessibleChanged", "@brief Emitter for signal void QNetworkAccessManager::networkAccessibleChanged(QNetworkAccessManager::NetworkAccessibility accessible)\nCall this method to emit this signal.", false, &_init_emitter_networkAccessibleChanged_4770, &_call_emitter_networkAccessibleChanged_4770); methods += new qt_gsi::GenericMethod ("emit_networkSessionConnected", "@brief Emitter for signal void QNetworkAccessManager::networkSessionConnected()\nCall this method to emit this signal.", false, &_init_emitter_networkSessionConnected_0, &_call_emitter_networkSessionConnected_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QNetworkAccessManager::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("emit_preSharedKeyAuthenticationRequired", "@brief Emitter for signal void QNetworkAccessManager::preSharedKeyAuthenticationRequired(QNetworkReply *reply, QSslPreSharedKeyAuthenticator *authenticator)\nCall this method to emit this signal.", false, &_init_emitter_preSharedKeyAuthenticationRequired_5436, &_call_emitter_preSharedKeyAuthenticationRequired_5436); methods += new qt_gsi::GenericMethod ("emit_proxyAuthenticationRequired", "@brief Emitter for signal void QNetworkAccessManager::proxyAuthenticationRequired(const QNetworkProxy &proxy, QAuthenticator *authenticator)\nCall this method to emit this signal.", false, &_init_emitter_proxyAuthenticationRequired_4652, &_call_emitter_proxyAuthenticationRequired_4652); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QNetworkAccessManager::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); diff --git a/src/gsiqt/qt5/QtNetwork/gsiDeclQNetworkConfigurationManager.cc b/src/gsiqt/qt5/QtNetwork/gsiDeclQNetworkConfigurationManager.cc index 51c9bf95f..272cd4a3b 100644 --- a/src/gsiqt/qt5/QtNetwork/gsiDeclQNetworkConfigurationManager.cc +++ b/src/gsiqt/qt5/QtNetwork/gsiDeclQNetworkConfigurationManager.cc @@ -221,6 +221,7 @@ static gsi::Methods methods_QNetworkConfigurationManager () { methods += gsi::qt_signal ("configurationChanged(const QNetworkConfiguration &)", "configurationChanged", gsi::arg("config"), "@brief Signal declaration for QNetworkConfigurationManager::configurationChanged(const QNetworkConfiguration &config)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("configurationRemoved(const QNetworkConfiguration &)", "configurationRemoved", gsi::arg("config"), "@brief Signal declaration for QNetworkConfigurationManager::configurationRemoved(const QNetworkConfiguration &config)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QNetworkConfigurationManager::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QNetworkConfigurationManager::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("onlineStateChanged(bool)", "onlineStateChanged", gsi::arg("isOnline"), "@brief Signal declaration for QNetworkConfigurationManager::onlineStateChanged(bool isOnline)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("updateCompleted()", "updateCompleted", "@brief Signal declaration for QNetworkConfigurationManager::updateCompleted()\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QNetworkConfigurationManager::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); @@ -331,6 +332,13 @@ public: } } + // [emitter impl] void QNetworkConfigurationManager::objectNameChanged(const QString &objectName) + void emitter_QNetworkConfigurationManager_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QNetworkConfigurationManager::objectNameChanged(const QString &objectName)'"); + } + // [emitter impl] void QNetworkConfigurationManager::onlineStateChanged(bool isOnline) void emitter_QNetworkConfigurationManager_onlineStateChanged_864(bool isOnline) { @@ -642,6 +650,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QNetworkConfigurationManager::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QNetworkConfigurationManager_Adaptor *)cls)->emitter_QNetworkConfigurationManager_objectNameChanged_4567 (arg1); +} + + // emitter void QNetworkConfigurationManager::onlineStateChanged(bool isOnline) static void _init_emitter_onlineStateChanged_864 (qt_gsi::GenericMethod *decl) @@ -767,6 +793,7 @@ static gsi::Methods methods_QNetworkConfigurationManager_Adaptor () { methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QNetworkConfigurationManager::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QNetworkConfigurationManager::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QNetworkConfigurationManager::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("emit_onlineStateChanged", "@brief Emitter for signal void QNetworkConfigurationManager::onlineStateChanged(bool isOnline)\nCall this method to emit this signal.", false, &_init_emitter_onlineStateChanged_864, &_call_emitter_onlineStateChanged_864); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QNetworkConfigurationManager::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QNetworkConfigurationManager::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); diff --git a/src/gsiqt/qt5/QtNetwork/gsiDeclQNetworkCookieJar.cc b/src/gsiqt/qt5/QtNetwork/gsiDeclQNetworkCookieJar.cc index 671c1449f..33b239584 100644 --- a/src/gsiqt/qt5/QtNetwork/gsiDeclQNetworkCookieJar.cc +++ b/src/gsiqt/qt5/QtNetwork/gsiDeclQNetworkCookieJar.cc @@ -217,6 +217,7 @@ static gsi::Methods methods_QNetworkCookieJar () { methods += new qt_gsi::GenericMethod ("setCookiesFromUrl", "@brief Method bool QNetworkCookieJar::setCookiesFromUrl(const QList &cookieList, const QUrl &url)\n", false, &_init_f_setCookiesFromUrl_4950, &_call_f_setCookiesFromUrl_4950); methods += new qt_gsi::GenericMethod ("updateCookie", "@brief Method bool QNetworkCookieJar::updateCookie(const QNetworkCookie &cookie)\n", false, &_init_f_updateCookie_2742, &_call_f_updateCookie_2742); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QNetworkCookieJar::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QNetworkCookieJar::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QNetworkCookieJar::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QNetworkCookieJar::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -362,6 +363,13 @@ public: } } + // [emitter impl] void QNetworkCookieJar::objectNameChanged(const QString &objectName) + void emitter_QNetworkCookieJar_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QNetworkCookieJar::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] bool QNetworkCookieJar::setCookiesFromUrl(const QList &cookieList, const QUrl &url) bool cbs_setCookiesFromUrl_4950_0(const QList &cookieList, const QUrl &url) { @@ -741,6 +749,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QNetworkCookieJar::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QNetworkCookieJar_Adaptor *)cls)->emitter_QNetworkCookieJar_objectNameChanged_4567 (arg1); +} + + // exposed int QNetworkCookieJar::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -932,6 +958,7 @@ static gsi::Methods methods_QNetworkCookieJar_Adaptor () { methods += new qt_gsi::GenericMethod ("insertCookie", "@brief Virtual method bool QNetworkCookieJar::insertCookie(const QNetworkCookie &cookie)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_insertCookie_2742_0, &_call_cbs_insertCookie_2742_0); methods += new qt_gsi::GenericMethod ("insertCookie", "@hide", false, &_init_cbs_insertCookie_2742_0, &_call_cbs_insertCookie_2742_0, &_set_callback_cbs_insertCookie_2742_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QNetworkCookieJar::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QNetworkCookieJar::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QNetworkCookieJar::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QNetworkCookieJar::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QNetworkCookieJar::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); diff --git a/src/gsiqt/qt5/QtNetwork/gsiDeclQNetworkDiskCache.cc b/src/gsiqt/qt5/QtNetwork/gsiDeclQNetworkDiskCache.cc index bf54f31a1..229549aef 100644 --- a/src/gsiqt/qt5/QtNetwork/gsiDeclQNetworkDiskCache.cc +++ b/src/gsiqt/qt5/QtNetwork/gsiDeclQNetworkDiskCache.cc @@ -364,6 +364,7 @@ static gsi::Methods methods_QNetworkDiskCache () { methods += new qt_gsi::GenericMethod ("setMaximumCacheSize|maximumCacheSize=", "@brief Method void QNetworkDiskCache::setMaximumCacheSize(qint64 size)\n", false, &_init_f_setMaximumCacheSize_986, &_call_f_setMaximumCacheSize_986); methods += new qt_gsi::GenericMethod ("updateMetaData", "@brief Method void QNetworkDiskCache::updateMetaData(const QNetworkCacheMetaData &metaData)\nThis is a reimplementation of QAbstractNetworkCache::updateMetaData", false, &_init_f_updateMetaData_3377, &_call_f_updateMetaData_3377); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QNetworkDiskCache::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QNetworkDiskCache::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QNetworkDiskCache::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QNetworkDiskCache::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -529,6 +530,13 @@ public: } } + // [emitter impl] void QNetworkDiskCache::objectNameChanged(const QString &objectName) + void emitter_QNetworkDiskCache_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QNetworkDiskCache::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QIODevice *QNetworkDiskCache::prepare(const QNetworkCacheMetaData &metaData) QIODevice * cbs_prepare_3377_0(const QNetworkCacheMetaData &metaData) { @@ -971,6 +979,24 @@ static void _set_callback_cbs_metaData_1701_0 (void *cls, const gsi::Callback &c } +// emitter void QNetworkDiskCache::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QNetworkDiskCache_Adaptor *)cls)->emitter_QNetworkDiskCache_objectNameChanged_4567 (arg1); +} + + // QIODevice *QNetworkDiskCache::prepare(const QNetworkCacheMetaData &metaData) static void _init_cbs_prepare_3377_0 (qt_gsi::GenericMethod *decl) @@ -1143,6 +1169,7 @@ static gsi::Methods methods_QNetworkDiskCache_Adaptor () { methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QNetworkDiskCache::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); methods += new qt_gsi::GenericMethod ("metaData", "@brief Virtual method QNetworkCacheMetaData QNetworkDiskCache::metaData(const QUrl &url)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_metaData_1701_0, &_call_cbs_metaData_1701_0); methods += new qt_gsi::GenericMethod ("metaData", "@hide", false, &_init_cbs_metaData_1701_0, &_call_cbs_metaData_1701_0, &_set_callback_cbs_metaData_1701_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QNetworkDiskCache::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("prepare", "@brief Virtual method QIODevice *QNetworkDiskCache::prepare(const QNetworkCacheMetaData &metaData)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_prepare_3377_0, &_call_cbs_prepare_3377_0); methods += new qt_gsi::GenericMethod ("prepare", "@hide", false, &_init_cbs_prepare_3377_0, &_call_cbs_prepare_3377_0, &_set_callback_cbs_prepare_3377_0); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QNetworkDiskCache::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); diff --git a/src/gsiqt/qt5/QtNetwork/gsiDeclQNetworkReply.cc b/src/gsiqt/qt5/QtNetwork/gsiDeclQNetworkReply.cc index a2b765c71..d37f1ee61 100644 --- a/src/gsiqt/qt5/QtNetwork/gsiDeclQNetworkReply.cc +++ b/src/gsiqt/qt5/QtNetwork/gsiDeclQNetworkReply.cc @@ -510,6 +510,7 @@ static gsi::Methods methods_QNetworkReply () { methods += gsi::qt_signal::target_type & > ("error(QNetworkReply::NetworkError)", "error_sig", gsi::arg("arg1"), "@brief Signal declaration for QNetworkReply::error(QNetworkReply::NetworkError)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("finished()", "finished", "@brief Signal declaration for QNetworkReply::finished()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("metaDataChanged()", "metaDataChanged", "@brief Signal declaration for QNetworkReply::metaDataChanged()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QNetworkReply::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("preSharedKeyAuthenticationRequired(QSslPreSharedKeyAuthenticator *)", "preSharedKeyAuthenticationRequired", gsi::arg("authenticator"), "@brief Signal declaration for QNetworkReply::preSharedKeyAuthenticationRequired(QSslPreSharedKeyAuthenticator *authenticator)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("readChannelFinished()", "readChannelFinished", "@brief Signal declaration for QNetworkReply::readChannelFinished()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("readyRead()", "readyRead", "@brief Signal declaration for QNetworkReply::readyRead()\nYou can bind a procedure to this signal."); diff --git a/src/gsiqt/qt5/QtNetwork/gsiDeclQNetworkSession.cc b/src/gsiqt/qt5/QtNetwork/gsiDeclQNetworkSession.cc index a5768ee03..19c8db69f 100644 --- a/src/gsiqt/qt5/QtNetwork/gsiDeclQNetworkSession.cc +++ b/src/gsiqt/qt5/QtNetwork/gsiDeclQNetworkSession.cc @@ -460,6 +460,7 @@ static gsi::Methods methods_QNetworkSession () { methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QNetworkSession::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal::target_type & > ("error(QNetworkSession::SessionError)", "error_sig", gsi::arg("arg1"), "@brief Signal declaration for QNetworkSession::error(QNetworkSession::SessionError)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("newConfigurationActivated()", "newConfigurationActivated", "@brief Signal declaration for QNetworkSession::newConfigurationActivated()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QNetworkSession::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("opened()", "opened", "@brief Signal declaration for QNetworkSession::opened()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("preferredConfigurationChanged(const QNetworkConfiguration &, bool)", "preferredConfigurationChanged", gsi::arg("config"), gsi::arg("isSeamless"), "@brief Signal declaration for QNetworkSession::preferredConfigurationChanged(const QNetworkConfiguration &config, bool isSeamless)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal::target_type & > ("stateChanged(QNetworkSession::State)", "stateChanged", gsi::arg("arg1"), "@brief Signal declaration for QNetworkSession::stateChanged(QNetworkSession::State)\nYou can bind a procedure to this signal."); @@ -572,6 +573,13 @@ public: emit QNetworkSession::newConfigurationActivated(); } + // [emitter impl] void QNetworkSession::objectNameChanged(const QString &objectName) + void emitter_QNetworkSession_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QNetworkSession::objectNameChanged(const QString &objectName)'"); + } + // [emitter impl] void QNetworkSession::opened() void emitter_QNetworkSession_opened_0() { @@ -890,6 +898,24 @@ static void _call_emitter_newConfigurationActivated_0 (const qt_gsi::GenericMeth } +// emitter void QNetworkSession::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QNetworkSession_Adaptor *)cls)->emitter_QNetworkSession_objectNameChanged_4567 (arg1); +} + + // emitter void QNetworkSession::opened() static void _init_emitter_opened_0 (qt_gsi::GenericMethod *decl) @@ -1054,6 +1080,7 @@ static gsi::Methods methods_QNetworkSession_Adaptor () { methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QNetworkSession::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); methods += new qt_gsi::GenericMethod ("emit_newConfigurationActivated", "@brief Emitter for signal void QNetworkSession::newConfigurationActivated()\nCall this method to emit this signal.", false, &_init_emitter_newConfigurationActivated_0, &_call_emitter_newConfigurationActivated_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QNetworkSession::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("emit_opened", "@brief Emitter for signal void QNetworkSession::opened()\nCall this method to emit this signal.", false, &_init_emitter_opened_0, &_call_emitter_opened_0); methods += new qt_gsi::GenericMethod ("emit_preferredConfigurationChanged", "@brief Emitter for signal void QNetworkSession::preferredConfigurationChanged(const QNetworkConfiguration &config, bool isSeamless)\nCall this method to emit this signal.", false, &_init_emitter_preferredConfigurationChanged_4264, &_call_emitter_preferredConfigurationChanged_4264); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QNetworkSession::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); diff --git a/src/gsiqt/qt5/QtNetwork/gsiDeclQSslSocket.cc b/src/gsiqt/qt5/QtNetwork/gsiDeclQSslSocket.cc index cb8b5ad45..bb48e78cc 100644 --- a/src/gsiqt/qt5/QtNetwork/gsiDeclQSslSocket.cc +++ b/src/gsiqt/qt5/QtNetwork/gsiDeclQSslSocket.cc @@ -1577,6 +1577,7 @@ static gsi::Methods methods_QSslSocket () { methods += gsi::qt_signal::target_type & > ("error(QAbstractSocket::SocketError)", "error_sig", gsi::arg("arg1"), "@brief Signal declaration for QSslSocket::error(QAbstractSocket::SocketError)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("hostFound()", "hostFound", "@brief Signal declaration for QSslSocket::hostFound()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal::target_type & > ("modeChanged(QSslSocket::SslMode)", "modeChanged", gsi::arg("newMode"), "@brief Signal declaration for QSslSocket::modeChanged(QSslSocket::SslMode newMode)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QSslSocket::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("peerVerifyError(const QSslError &)", "peerVerifyError", gsi::arg("error"), "@brief Signal declaration for QSslSocket::peerVerifyError(const QSslError &error)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("preSharedKeyAuthenticationRequired(QSslPreSharedKeyAuthenticator *)", "preSharedKeyAuthenticationRequired", gsi::arg("authenticator"), "@brief Signal declaration for QSslSocket::preSharedKeyAuthenticationRequired(QSslPreSharedKeyAuthenticator *authenticator)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("proxyAuthenticationRequired(const QNetworkProxy &, QAuthenticator *)", "proxyAuthenticationRequired", gsi::arg("proxy"), gsi::arg("authenticator"), "@brief Signal declaration for QSslSocket::proxyAuthenticationRequired(const QNetworkProxy &proxy, QAuthenticator *authenticator)\nYou can bind a procedure to this signal."); diff --git a/src/gsiqt/qt5/QtNetwork/gsiDeclQTcpServer.cc b/src/gsiqt/qt5/QtNetwork/gsiDeclQTcpServer.cc index 561e00af0..2f0c50987 100644 --- a/src/gsiqt/qt5/QtNetwork/gsiDeclQTcpServer.cc +++ b/src/gsiqt/qt5/QtNetwork/gsiDeclQTcpServer.cc @@ -436,6 +436,7 @@ static gsi::Methods methods_QTcpServer () { methods += gsi::qt_signal::target_type & > ("acceptError(QAbstractSocket::SocketError)", "acceptError", gsi::arg("socketError"), "@brief Signal declaration for QTcpServer::acceptError(QAbstractSocket::SocketError socketError)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QTcpServer::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("newConnection()", "newConnection", "@brief Signal declaration for QTcpServer::newConnection()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QTcpServer::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QTcpServer::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QTcpServer::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -573,6 +574,13 @@ public: } } + // [emitter impl] void QTcpServer::objectNameChanged(const QString &objectName) + void emitter_QTcpServer_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QTcpServer::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] void QTcpServer::childEvent(QChildEvent *) void cbs_childEvent_1701_0(QChildEvent *arg1) { @@ -949,6 +957,24 @@ static void _set_callback_cbs_nextPendingConnection_0_0 (void *cls, const gsi::C } +// emitter void QTcpServer::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QTcpServer_Adaptor *)cls)->emitter_QTcpServer_objectNameChanged_4567 (arg1); +} + + // exposed int QTcpServer::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -1048,6 +1074,7 @@ static gsi::Methods methods_QTcpServer_Adaptor () { methods += new qt_gsi::GenericMethod ("emit_newConnection", "@brief Emitter for signal void QTcpServer::newConnection()\nCall this method to emit this signal.", false, &_init_emitter_newConnection_0, &_call_emitter_newConnection_0); methods += new qt_gsi::GenericMethod ("nextPendingConnection", "@brief Virtual method QTcpSocket *QTcpServer::nextPendingConnection()\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nextPendingConnection_0_0, &_call_cbs_nextPendingConnection_0_0); methods += new qt_gsi::GenericMethod ("nextPendingConnection", "@hide", false, &_init_cbs_nextPendingConnection_0_0, &_call_cbs_nextPendingConnection_0_0, &_set_callback_cbs_nextPendingConnection_0_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QTcpServer::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QTcpServer::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QTcpServer::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QTcpServer::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); diff --git a/src/gsiqt/qt5/QtNetwork/gsiDeclQTcpSocket.cc b/src/gsiqt/qt5/QtNetwork/gsiDeclQTcpSocket.cc index f0ead11ee..c4d410a6f 100644 --- a/src/gsiqt/qt5/QtNetwork/gsiDeclQTcpSocket.cc +++ b/src/gsiqt/qt5/QtNetwork/gsiDeclQTcpSocket.cc @@ -140,6 +140,7 @@ static gsi::Methods methods_QTcpSocket () { methods += gsi::qt_signal ("disconnected()", "disconnected", "@brief Signal declaration for QTcpSocket::disconnected()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal::target_type & > ("error(QAbstractSocket::SocketError)", "error_sig", gsi::arg("arg1"), "@brief Signal declaration for QTcpSocket::error(QAbstractSocket::SocketError)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("hostFound()", "hostFound", "@brief Signal declaration for QTcpSocket::hostFound()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QTcpSocket::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("proxyAuthenticationRequired(const QNetworkProxy &, QAuthenticator *)", "proxyAuthenticationRequired", gsi::arg("proxy"), gsi::arg("authenticator"), "@brief Signal declaration for QTcpSocket::proxyAuthenticationRequired(const QNetworkProxy &proxy, QAuthenticator *authenticator)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("readChannelFinished()", "readChannelFinished", "@brief Signal declaration for QTcpSocket::readChannelFinished()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("readyRead()", "readyRead", "@brief Signal declaration for QTcpSocket::readyRead()\nYou can bind a procedure to this signal."); diff --git a/src/gsiqt/qt5/QtNetwork/gsiDeclQUdpSocket.cc b/src/gsiqt/qt5/QtNetwork/gsiDeclQUdpSocket.cc index 95038fe63..310d719df 100644 --- a/src/gsiqt/qt5/QtNetwork/gsiDeclQUdpSocket.cc +++ b/src/gsiqt/qt5/QtNetwork/gsiDeclQUdpSocket.cc @@ -351,6 +351,7 @@ static gsi::Methods methods_QUdpSocket () { methods += gsi::qt_signal ("disconnected()", "disconnected", "@brief Signal declaration for QUdpSocket::disconnected()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal::target_type & > ("error(QAbstractSocket::SocketError)", "error_sig", gsi::arg("arg1"), "@brief Signal declaration for QUdpSocket::error(QAbstractSocket::SocketError)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("hostFound()", "hostFound", "@brief Signal declaration for QUdpSocket::hostFound()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QUdpSocket::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("proxyAuthenticationRequired(const QNetworkProxy &, QAuthenticator *)", "proxyAuthenticationRequired", gsi::arg("proxy"), gsi::arg("authenticator"), "@brief Signal declaration for QUdpSocket::proxyAuthenticationRequired(const QNetworkProxy &proxy, QAuthenticator *authenticator)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("readChannelFinished()", "readChannelFinished", "@brief Signal declaration for QUdpSocket::readChannelFinished()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("readyRead()", "readyRead", "@brief Signal declaration for QUdpSocket::readyRead()\nYou can bind a procedure to this signal."); diff --git a/src/gsiqt/qt5/QtPrintSupport/gsiDeclQAbstractPrintDialog.cc b/src/gsiqt/qt5/QtPrintSupport/gsiDeclQAbstractPrintDialog.cc index 55db9f1a4..aedf4bed2 100644 --- a/src/gsiqt/qt5/QtPrintSupport/gsiDeclQAbstractPrintDialog.cc +++ b/src/gsiqt/qt5/QtPrintSupport/gsiDeclQAbstractPrintDialog.cc @@ -437,14 +437,6 @@ static gsi::Methods methods_QAbstractPrintDialog () { methods += new qt_gsi::GenericMethod ("setOptionTabs", "@brief Method void QAbstractPrintDialog::setOptionTabs(const QList &tabs)\n", false, &_init_f_setOptionTabs_2663, &_call_f_setOptionTabs_2663); methods += new qt_gsi::GenericMethod ("setPrintRange|printRange=", "@brief Method void QAbstractPrintDialog::setPrintRange(QAbstractPrintDialog::PrintRange range)\n", false, &_init_f_setPrintRange_3588, &_call_f_setPrintRange_3588); methods += new qt_gsi::GenericMethod ("toPage", "@brief Method int QAbstractPrintDialog::toPage()\n", true, &_init_f_toPage_c0, &_call_f_toPage_c0); - methods += gsi::qt_signal ("accepted()", "accepted", "@brief Signal declaration for QAbstractPrintDialog::accepted()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("customContextMenuRequested(const QPoint &)", "customContextMenuRequested", gsi::arg("pos"), "@brief Signal declaration for QAbstractPrintDialog::customContextMenuRequested(const QPoint &pos)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QAbstractPrintDialog::destroyed(QObject *)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("finished(int)", "finished", gsi::arg("result"), "@brief Signal declaration for QAbstractPrintDialog::finished(int result)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("rejected()", "rejected", "@brief Signal declaration for QAbstractPrintDialog::rejected()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("windowIconChanged(const QIcon &)", "windowIconChanged", gsi::arg("icon"), "@brief Signal declaration for QAbstractPrintDialog::windowIconChanged(const QIcon &icon)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("windowIconTextChanged(const QString &)", "windowIconTextChanged", gsi::arg("iconText"), "@brief Signal declaration for QAbstractPrintDialog::windowIconTextChanged(const QString &iconText)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("windowTitleChanged(const QString &)", "windowTitleChanged", gsi::arg("title"), "@brief Signal declaration for QAbstractPrintDialog::windowTitleChanged(const QString &title)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QAbstractPrintDialog::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QAbstractPrintDialog::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -544,24 +536,6 @@ public: } } - // [emitter impl] void QAbstractPrintDialog::accepted() - void emitter_QAbstractPrintDialog_accepted_0() - { - emit QAbstractPrintDialog::accepted(); - } - - // [emitter impl] void QAbstractPrintDialog::customContextMenuRequested(const QPoint &pos) - void emitter_QAbstractPrintDialog_customContextMenuRequested_1916(const QPoint &pos) - { - emit QAbstractPrintDialog::customContextMenuRequested(pos); - } - - // [emitter impl] void QAbstractPrintDialog::destroyed(QObject *) - void emitter_QAbstractPrintDialog_destroyed_1302(QObject *arg1) - { - emit QAbstractPrintDialog::destroyed(arg1); - } - // [adaptor impl] void QAbstractPrintDialog::done(int) void cbs_done_767_0(int arg1) { @@ -592,12 +566,6 @@ public: } } - // [emitter impl] void QAbstractPrintDialog::finished(int result) - void emitter_QAbstractPrintDialog_finished_767(int result) - { - emit QAbstractPrintDialog::finished(result); - } - // [adaptor impl] bool QAbstractPrintDialog::hasHeightForWidth() bool cbs_hasHeightForWidth_c0_0() const { @@ -703,12 +671,6 @@ public: } } - // [emitter impl] void QAbstractPrintDialog::rejected() - void emitter_QAbstractPrintDialog_rejected_0() - { - emit QAbstractPrintDialog::rejected(); - } - // [adaptor impl] void QAbstractPrintDialog::setVisible(bool visible) void cbs_setVisible_864_0(bool visible) { @@ -739,24 +701,6 @@ public: } } - // [emitter impl] void QAbstractPrintDialog::windowIconChanged(const QIcon &icon) - void emitter_QAbstractPrintDialog_windowIconChanged_1787(const QIcon &icon) - { - emit QAbstractPrintDialog::windowIconChanged(icon); - } - - // [emitter impl] void QAbstractPrintDialog::windowIconTextChanged(const QString &iconText) - void emitter_QAbstractPrintDialog_windowIconTextChanged_2025(const QString &iconText) - { - emit QAbstractPrintDialog::windowIconTextChanged(iconText); - } - - // [emitter impl] void QAbstractPrintDialog::windowTitleChanged(const QString &title) - void emitter_QAbstractPrintDialog_windowTitleChanged_2025(const QString &title) - { - emit QAbstractPrintDialog::windowTitleChanged(title); - } - // [adaptor impl] void QAbstractPrintDialog::actionEvent(QActionEvent *) void cbs_actionEvent_1823_0(QActionEvent *arg1) { @@ -1422,20 +1366,6 @@ static void _set_callback_cbs_accept_0_0 (void *cls, const gsi::Callback &cb) } -// emitter void QAbstractPrintDialog::accepted() - -static void _init_emitter_accepted_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_accepted_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QAbstractPrintDialog_Adaptor *)cls)->emitter_QAbstractPrintDialog_accepted_0 (); -} - - // void QAbstractPrintDialog::actionEvent(QActionEvent *) static void _init_cbs_actionEvent_1823_0 (qt_gsi::GenericMethod *decl) @@ -1600,24 +1530,6 @@ static void _call_fp_create_2208 (const qt_gsi::GenericMethod * /*decl*/, void * } -// emitter void QAbstractPrintDialog::customContextMenuRequested(const QPoint &pos) - -static void _init_emitter_customContextMenuRequested_1916 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("pos"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_customContextMenuRequested_1916 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const QPoint &arg1 = gsi::arg_reader() (args, heap); - ((QAbstractPrintDialog_Adaptor *)cls)->emitter_QAbstractPrintDialog_customContextMenuRequested_1916 (arg1); -} - - // void QAbstractPrintDialog::customEvent(QEvent *) static void _init_cbs_customEvent_1217_0 (qt_gsi::GenericMethod *decl) @@ -1664,24 +1576,6 @@ static void _call_fp_destroy_1620 (const qt_gsi::GenericMethod * /*decl*/, void } -// emitter void QAbstractPrintDialog::destroyed(QObject *) - -static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - ((QAbstractPrintDialog_Adaptor *)cls)->emitter_QAbstractPrintDialog_destroyed_1302 (arg1); -} - - // void QAbstractPrintDialog::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -1918,24 +1812,6 @@ static void _set_callback_cbs_exec_0_0 (void *cls, const gsi::Callback &cb) } -// emitter void QAbstractPrintDialog::finished(int result) - -static void _init_emitter_finished_767 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("result"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_finished_767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - int arg1 = gsi::arg_reader() (args, heap); - ((QAbstractPrintDialog_Adaptor *)cls)->emitter_QAbstractPrintDialog_finished_767 (arg1); -} - - // void QAbstractPrintDialog::focusInEvent(QFocusEvent *) static void _init_cbs_focusInEvent_1729_0 (qt_gsi::GenericMethod *decl) @@ -2577,20 +2453,6 @@ static void _set_callback_cbs_reject_0_0 (void *cls, const gsi::Callback &cb) } -// emitter void QAbstractPrintDialog::rejected() - -static void _init_emitter_rejected_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_rejected_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QAbstractPrintDialog_Adaptor *)cls)->emitter_QAbstractPrintDialog_rejected_0 (); -} - - // void QAbstractPrintDialog::resizeEvent(QResizeEvent *) static void _init_cbs_resizeEvent_1843_0 (qt_gsi::GenericMethod *decl) @@ -2816,60 +2678,6 @@ static void _set_callback_cbs_wheelEvent_1718_0 (void *cls, const gsi::Callback } -// emitter void QAbstractPrintDialog::windowIconChanged(const QIcon &icon) - -static void _init_emitter_windowIconChanged_1787 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("icon"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_windowIconChanged_1787 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const QIcon &arg1 = gsi::arg_reader() (args, heap); - ((QAbstractPrintDialog_Adaptor *)cls)->emitter_QAbstractPrintDialog_windowIconChanged_1787 (arg1); -} - - -// emitter void QAbstractPrintDialog::windowIconTextChanged(const QString &iconText) - -static void _init_emitter_windowIconTextChanged_2025 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("iconText"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_windowIconTextChanged_2025 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const QString &arg1 = gsi::arg_reader() (args, heap); - ((QAbstractPrintDialog_Adaptor *)cls)->emitter_QAbstractPrintDialog_windowIconTextChanged_2025 (arg1); -} - - -// emitter void QAbstractPrintDialog::windowTitleChanged(const QString &title) - -static void _init_emitter_windowTitleChanged_2025 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("title"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_windowTitleChanged_2025 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const QString &arg1 = gsi::arg_reader() (args, heap); - ((QAbstractPrintDialog_Adaptor *)cls)->emitter_QAbstractPrintDialog_windowTitleChanged_2025 (arg1); -} - - namespace gsi { @@ -2880,7 +2688,6 @@ static gsi::Methods methods_QAbstractPrintDialog_Adaptor () { methods += new qt_gsi::GenericStaticMethod ("new", "@brief Constructor QAbstractPrintDialog::QAbstractPrintDialog(QPrinter *printer, QWidget *parent)\nThis method creates an object of class QAbstractPrintDialog.", &_init_ctor_QAbstractPrintDialog_Adaptor_2650, &_call_ctor_QAbstractPrintDialog_Adaptor_2650); methods += new qt_gsi::GenericMethod ("accept", "@brief Virtual method void QAbstractPrintDialog::accept()\nThis method can be reimplemented in a derived class.", false, &_init_cbs_accept_0_0, &_call_cbs_accept_0_0); methods += new qt_gsi::GenericMethod ("accept", "@hide", false, &_init_cbs_accept_0_0, &_call_cbs_accept_0_0, &_set_callback_cbs_accept_0_0); - methods += new qt_gsi::GenericMethod ("emit_accepted", "@brief Emitter for signal void QAbstractPrintDialog::accepted()\nCall this method to emit this signal.", false, &_init_emitter_accepted_0, &_call_emitter_accepted_0); methods += new qt_gsi::GenericMethod ("*actionEvent", "@brief Virtual method void QAbstractPrintDialog::actionEvent(QActionEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_actionEvent_1823_0, &_call_cbs_actionEvent_1823_0); methods += new qt_gsi::GenericMethod ("*actionEvent", "@hide", false, &_init_cbs_actionEvent_1823_0, &_call_cbs_actionEvent_1823_0, &_set_callback_cbs_actionEvent_1823_0); methods += new qt_gsi::GenericMethod ("*adjustPosition", "@brief Method void QAbstractPrintDialog::adjustPosition(QWidget *)\nThis method is protected and can only be called from inside a derived class.", false, &_init_fp_adjustPosition_1315, &_call_fp_adjustPosition_1315); @@ -2893,11 +2700,9 @@ static gsi::Methods methods_QAbstractPrintDialog_Adaptor () { methods += new qt_gsi::GenericMethod ("*contextMenuEvent", "@brief Virtual method void QAbstractPrintDialog::contextMenuEvent(QContextMenuEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_contextMenuEvent_2363_0, &_call_cbs_contextMenuEvent_2363_0); methods += new qt_gsi::GenericMethod ("*contextMenuEvent", "@hide", false, &_init_cbs_contextMenuEvent_2363_0, &_call_cbs_contextMenuEvent_2363_0, &_set_callback_cbs_contextMenuEvent_2363_0); methods += new qt_gsi::GenericMethod ("*qt_create", "@brief Method void QAbstractPrintDialog::create(WId, bool initializeWindow, bool destroyOldWindow)\nThis method is protected and can only be called from inside a derived class.", false, &_init_fp_create_2208, &_call_fp_create_2208); - methods += new qt_gsi::GenericMethod ("emit_customContextMenuRequested", "@brief Emitter for signal void QAbstractPrintDialog::customContextMenuRequested(const QPoint &pos)\nCall this method to emit this signal.", false, &_init_emitter_customContextMenuRequested_1916, &_call_emitter_customContextMenuRequested_1916); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QAbstractPrintDialog::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*qt_destroy", "@brief Method void QAbstractPrintDialog::destroy(bool destroyWindow, bool destroySubWindows)\nThis method is protected and can only be called from inside a derived class.", false, &_init_fp_destroy_1620, &_call_fp_destroy_1620); - methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QAbstractPrintDialog::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QAbstractPrintDialog::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("done", "@brief Virtual method void QAbstractPrintDialog::done(int)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_done_767_0, &_call_cbs_done_767_0); @@ -2918,7 +2723,6 @@ static gsi::Methods methods_QAbstractPrintDialog_Adaptor () { methods += new qt_gsi::GenericMethod ("*eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("exec", "@brief Virtual method int QAbstractPrintDialog::exec()\nThis method can be reimplemented in a derived class.", false, &_init_cbs_exec_0_0, &_call_cbs_exec_0_0); methods += new qt_gsi::GenericMethod ("exec", "@hide", false, &_init_cbs_exec_0_0, &_call_cbs_exec_0_0, &_set_callback_cbs_exec_0_0); - methods += new qt_gsi::GenericMethod ("emit_finished", "@brief Emitter for signal void QAbstractPrintDialog::finished(int result)\nCall this method to emit this signal.", false, &_init_emitter_finished_767, &_call_emitter_finished_767); methods += new qt_gsi::GenericMethod ("*focusInEvent", "@brief Virtual method void QAbstractPrintDialog::focusInEvent(QFocusEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_focusInEvent_1729_0, &_call_cbs_focusInEvent_1729_0); methods += new qt_gsi::GenericMethod ("*focusInEvent", "@hide", false, &_init_cbs_focusInEvent_1729_0, &_call_cbs_focusInEvent_1729_0, &_set_callback_cbs_focusInEvent_1729_0); methods += new qt_gsi::GenericMethod ("*focusNextChild", "@brief Method bool QAbstractPrintDialog::focusNextChild()\nThis method is protected and can only be called from inside a derived class.", false, &_init_fp_focusNextChild_0, &_call_fp_focusNextChild_0); @@ -2973,7 +2777,6 @@ static gsi::Methods methods_QAbstractPrintDialog_Adaptor () { methods += new qt_gsi::GenericMethod ("*redirected", "@hide", true, &_init_cbs_redirected_c1225_0, &_call_cbs_redirected_c1225_0, &_set_callback_cbs_redirected_c1225_0); methods += new qt_gsi::GenericMethod ("reject", "@brief Virtual method void QAbstractPrintDialog::reject()\nThis method can be reimplemented in a derived class.", false, &_init_cbs_reject_0_0, &_call_cbs_reject_0_0); methods += new qt_gsi::GenericMethod ("reject", "@hide", false, &_init_cbs_reject_0_0, &_call_cbs_reject_0_0, &_set_callback_cbs_reject_0_0); - methods += new qt_gsi::GenericMethod ("emit_rejected", "@brief Emitter for signal void QAbstractPrintDialog::rejected()\nCall this method to emit this signal.", false, &_init_emitter_rejected_0, &_call_emitter_rejected_0); methods += new qt_gsi::GenericMethod ("*resizeEvent", "@brief Virtual method void QAbstractPrintDialog::resizeEvent(QResizeEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_resizeEvent_1843_0, &_call_cbs_resizeEvent_1843_0); methods += new qt_gsi::GenericMethod ("*resizeEvent", "@hide", false, &_init_cbs_resizeEvent_1843_0, &_call_cbs_resizeEvent_1843_0, &_set_callback_cbs_resizeEvent_1843_0); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QAbstractPrintDialog::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); @@ -2993,9 +2796,6 @@ static gsi::Methods methods_QAbstractPrintDialog_Adaptor () { methods += new qt_gsi::GenericMethod ("*updateMicroFocus", "@brief Method void QAbstractPrintDialog::updateMicroFocus()\nThis method is protected and can only be called from inside a derived class.", false, &_init_fp_updateMicroFocus_0, &_call_fp_updateMicroFocus_0); methods += new qt_gsi::GenericMethod ("*wheelEvent", "@brief Virtual method void QAbstractPrintDialog::wheelEvent(QWheelEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_wheelEvent_1718_0, &_call_cbs_wheelEvent_1718_0); methods += new qt_gsi::GenericMethod ("*wheelEvent", "@hide", false, &_init_cbs_wheelEvent_1718_0, &_call_cbs_wheelEvent_1718_0, &_set_callback_cbs_wheelEvent_1718_0); - methods += new qt_gsi::GenericMethod ("emit_windowIconChanged", "@brief Emitter for signal void QAbstractPrintDialog::windowIconChanged(const QIcon &icon)\nCall this method to emit this signal.", false, &_init_emitter_windowIconChanged_1787, &_call_emitter_windowIconChanged_1787); - methods += new qt_gsi::GenericMethod ("emit_windowIconTextChanged", "@brief Emitter for signal void QAbstractPrintDialog::windowIconTextChanged(const QString &iconText)\nCall this method to emit this signal.", false, &_init_emitter_windowIconTextChanged_2025, &_call_emitter_windowIconTextChanged_2025); - methods += new qt_gsi::GenericMethod ("emit_windowTitleChanged", "@brief Emitter for signal void QAbstractPrintDialog::windowTitleChanged(const QString &title)\nCall this method to emit this signal.", false, &_init_emitter_windowTitleChanged_2025, &_call_emitter_windowTitleChanged_2025); return methods; } diff --git a/src/gsiqt/qt5/QtPrintSupport/gsiDeclQPrintDialog.cc b/src/gsiqt/qt5/QtPrintSupport/gsiDeclQPrintDialog.cc index 3c14d696c..b6d8c9e49 100644 --- a/src/gsiqt/qt5/QtPrintSupport/gsiDeclQPrintDialog.cc +++ b/src/gsiqt/qt5/QtPrintSupport/gsiDeclQPrintDialog.cc @@ -117,6 +117,42 @@ static void _call_f_accept_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, } +// void QPrintDialog::accepted() + + +static void _init_f_accepted_0 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_f_accepted_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + __SUPPRESS_UNUSED_WARNING(ret); + ((QPrintDialog *)cls)->accepted (); +} + + +// void QPrintDialog::accepted(QPrinter *printer) + + +static void _init_f_accepted_1443 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("printer"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_accepted_1443 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + QPrinter *arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QPrintDialog *)cls)->accepted (arg1); +} + + // void QPrintDialog::done(int result) @@ -345,6 +381,8 @@ static gsi::Methods methods_QPrintDialog () { gsi::Methods methods; methods += new qt_gsi::GenericStaticMethod ("staticMetaObject", "@brief Obtains the static MetaObject for this class.", &_init_smo, &_call_smo); methods += new qt_gsi::GenericMethod ("accept", "@brief Method void QPrintDialog::accept()\nThis is a reimplementation of QDialog::accept", false, &_init_f_accept_0, &_call_f_accept_0); + methods += new qt_gsi::GenericMethod ("accepted", "@brief Method void QPrintDialog::accepted()\n", false, &_init_f_accepted_0, &_call_f_accepted_0); + methods += new qt_gsi::GenericMethod ("accepted_sig", "@brief Method void QPrintDialog::accepted(QPrinter *printer)\n", false, &_init_f_accepted_1443, &_call_f_accepted_1443); methods += new qt_gsi::GenericMethod ("done", "@brief Method void QPrintDialog::done(int result)\nThis is a reimplementation of QDialog::done", false, &_init_f_done_767, &_call_f_done_767); methods += new qt_gsi::GenericMethod ("exec", "@brief Method int QPrintDialog::exec()\nThis is a reimplementation of QAbstractPrintDialog::exec", false, &_init_f_exec_0, &_call_f_exec_0); methods += new qt_gsi::GenericMethod ("open", "@brief Method void QPrintDialog::open()\nThis is a reimplementation of QDialog::open", false, &_init_f_open_0, &_call_f_open_0); @@ -354,15 +392,6 @@ static gsi::Methods methods_QPrintDialog () { methods += new qt_gsi::GenericMethod ("setOptions|options=", "@brief Method void QPrintDialog::setOptions(QFlags options)\n", false, &_init_f_setOptions_5016, &_call_f_setOptions_5016); methods += new qt_gsi::GenericMethod ("setVisible|visible=", "@brief Method void QPrintDialog::setVisible(bool visible)\nThis is a reimplementation of QDialog::setVisible", false, &_init_f_setVisible_864, &_call_f_setVisible_864); methods += new qt_gsi::GenericMethod ("testOption", "@brief Method bool QPrintDialog::testOption(QAbstractPrintDialog::PrintDialogOption option)\n", true, &_init_f_testOption_c4320, &_call_f_testOption_c4320); - methods += gsi::qt_signal ("accepted()", "accepted", "@brief Signal declaration for QPrintDialog::accepted()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("accepted(QPrinter *)", "accepted_sig", gsi::arg("printer"), "@brief Signal declaration for QPrintDialog::accepted(QPrinter *printer)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("customContextMenuRequested(const QPoint &)", "customContextMenuRequested", gsi::arg("pos"), "@brief Signal declaration for QPrintDialog::customContextMenuRequested(const QPoint &pos)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QPrintDialog::destroyed(QObject *)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("finished(int)", "finished", gsi::arg("result"), "@brief Signal declaration for QPrintDialog::finished(int result)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("rejected()", "rejected", "@brief Signal declaration for QPrintDialog::rejected()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("windowIconChanged(const QIcon &)", "windowIconChanged", gsi::arg("icon"), "@brief Signal declaration for QPrintDialog::windowIconChanged(const QIcon &icon)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("windowIconTextChanged(const QString &)", "windowIconTextChanged", gsi::arg("iconText"), "@brief Signal declaration for QPrintDialog::windowIconTextChanged(const QString &iconText)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("windowTitleChanged(const QString &)", "windowTitleChanged", gsi::arg("title"), "@brief Signal declaration for QPrintDialog::windowTitleChanged(const QString &title)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QPrintDialog::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QPrintDialog::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -474,30 +503,6 @@ public: } } - // [emitter impl] void QPrintDialog::accepted() - void emitter_QPrintDialog_accepted_0() - { - emit QPrintDialog::accepted(); - } - - // [emitter impl] void QPrintDialog::accepted(QPrinter *printer) - void emitter_QPrintDialog_accepted_1443(QPrinter *printer) - { - emit QPrintDialog::accepted(printer); - } - - // [emitter impl] void QPrintDialog::customContextMenuRequested(const QPoint &pos) - void emitter_QPrintDialog_customContextMenuRequested_1916(const QPoint &pos) - { - emit QPrintDialog::customContextMenuRequested(pos); - } - - // [emitter impl] void QPrintDialog::destroyed(QObject *) - void emitter_QPrintDialog_destroyed_1302(QObject *arg1) - { - emit QPrintDialog::destroyed(arg1); - } - // [adaptor impl] void QPrintDialog::done(int result) void cbs_done_767_0(int result) { @@ -528,12 +533,6 @@ public: } } - // [emitter impl] void QPrintDialog::finished(int result) - void emitter_QPrintDialog_finished_767(int result) - { - emit QPrintDialog::finished(result); - } - // [adaptor impl] bool QPrintDialog::hasHeightForWidth() bool cbs_hasHeightForWidth_c0_0() const { @@ -639,12 +638,6 @@ public: } } - // [emitter impl] void QPrintDialog::rejected() - void emitter_QPrintDialog_rejected_0() - { - emit QPrintDialog::rejected(); - } - // [adaptor impl] void QPrintDialog::setVisible(bool visible) void cbs_setVisible_864_0(bool visible) { @@ -675,24 +668,6 @@ public: } } - // [emitter impl] void QPrintDialog::windowIconChanged(const QIcon &icon) - void emitter_QPrintDialog_windowIconChanged_1787(const QIcon &icon) - { - emit QPrintDialog::windowIconChanged(icon); - } - - // [emitter impl] void QPrintDialog::windowIconTextChanged(const QString &iconText) - void emitter_QPrintDialog_windowIconTextChanged_2025(const QString &iconText) - { - emit QPrintDialog::windowIconTextChanged(iconText); - } - - // [emitter impl] void QPrintDialog::windowTitleChanged(const QString &title) - void emitter_QPrintDialog_windowTitleChanged_2025(const QString &title) - { - emit QPrintDialog::windowTitleChanged(title); - } - // [adaptor impl] void QPrintDialog::actionEvent(QActionEvent *) void cbs_actionEvent_1823_0(QActionEvent *arg1) { @@ -1376,38 +1351,6 @@ static void _set_callback_cbs_accept_0_0 (void *cls, const gsi::Callback &cb) } -// emitter void QPrintDialog::accepted() - -static void _init_emitter_accepted_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_accepted_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QPrintDialog_Adaptor *)cls)->emitter_QPrintDialog_accepted_0 (); -} - - -// emitter void QPrintDialog::accepted(QPrinter *printer) - -static void _init_emitter_accepted_1443 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("printer"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_accepted_1443 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QPrinter *arg1 = gsi::arg_reader() (args, heap); - ((QPrintDialog_Adaptor *)cls)->emitter_QPrintDialog_accepted_1443 (arg1); -} - - // void QPrintDialog::actionEvent(QActionEvent *) static void _init_cbs_actionEvent_1823_0 (qt_gsi::GenericMethod *decl) @@ -1572,24 +1515,6 @@ static void _call_fp_create_2208 (const qt_gsi::GenericMethod * /*decl*/, void * } -// emitter void QPrintDialog::customContextMenuRequested(const QPoint &pos) - -static void _init_emitter_customContextMenuRequested_1916 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("pos"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_customContextMenuRequested_1916 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const QPoint &arg1 = gsi::arg_reader() (args, heap); - ((QPrintDialog_Adaptor *)cls)->emitter_QPrintDialog_customContextMenuRequested_1916 (arg1); -} - - // void QPrintDialog::customEvent(QEvent *) static void _init_cbs_customEvent_1217_0 (qt_gsi::GenericMethod *decl) @@ -1636,24 +1561,6 @@ static void _call_fp_destroy_1620 (const qt_gsi::GenericMethod * /*decl*/, void } -// emitter void QPrintDialog::destroyed(QObject *) - -static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - ((QPrintDialog_Adaptor *)cls)->emitter_QPrintDialog_destroyed_1302 (arg1); -} - - // void QPrintDialog::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -1890,24 +1797,6 @@ static void _set_callback_cbs_exec_0_0 (void *cls, const gsi::Callback &cb) } -// emitter void QPrintDialog::finished(int result) - -static void _init_emitter_finished_767 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("result"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_finished_767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - int arg1 = gsi::arg_reader() (args, heap); - ((QPrintDialog_Adaptor *)cls)->emitter_QPrintDialog_finished_767 (arg1); -} - - // void QPrintDialog::focusInEvent(QFocusEvent *) static void _init_cbs_focusInEvent_1729_0 (qt_gsi::GenericMethod *decl) @@ -2549,20 +2438,6 @@ static void _set_callback_cbs_reject_0_0 (void *cls, const gsi::Callback &cb) } -// emitter void QPrintDialog::rejected() - -static void _init_emitter_rejected_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_rejected_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QPrintDialog_Adaptor *)cls)->emitter_QPrintDialog_rejected_0 (); -} - - // void QPrintDialog::resizeEvent(QResizeEvent *) static void _init_cbs_resizeEvent_1843_0 (qt_gsi::GenericMethod *decl) @@ -2788,60 +2663,6 @@ static void _set_callback_cbs_wheelEvent_1718_0 (void *cls, const gsi::Callback } -// emitter void QPrintDialog::windowIconChanged(const QIcon &icon) - -static void _init_emitter_windowIconChanged_1787 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("icon"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_windowIconChanged_1787 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const QIcon &arg1 = gsi::arg_reader() (args, heap); - ((QPrintDialog_Adaptor *)cls)->emitter_QPrintDialog_windowIconChanged_1787 (arg1); -} - - -// emitter void QPrintDialog::windowIconTextChanged(const QString &iconText) - -static void _init_emitter_windowIconTextChanged_2025 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("iconText"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_windowIconTextChanged_2025 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const QString &arg1 = gsi::arg_reader() (args, heap); - ((QPrintDialog_Adaptor *)cls)->emitter_QPrintDialog_windowIconTextChanged_2025 (arg1); -} - - -// emitter void QPrintDialog::windowTitleChanged(const QString &title) - -static void _init_emitter_windowTitleChanged_2025 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("title"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_windowTitleChanged_2025 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const QString &arg1 = gsi::arg_reader() (args, heap); - ((QPrintDialog_Adaptor *)cls)->emitter_QPrintDialog_windowTitleChanged_2025 (arg1); -} - - namespace gsi { @@ -2853,8 +2674,6 @@ static gsi::Methods methods_QPrintDialog_Adaptor () { methods += new qt_gsi::GenericStaticMethod ("new", "@brief Constructor QPrintDialog::QPrintDialog(QWidget *parent)\nThis method creates an object of class QPrintDialog.", &_init_ctor_QPrintDialog_Adaptor_1315, &_call_ctor_QPrintDialog_Adaptor_1315); methods += new qt_gsi::GenericMethod ("accept", "@brief Virtual method void QPrintDialog::accept()\nThis method can be reimplemented in a derived class.", false, &_init_cbs_accept_0_0, &_call_cbs_accept_0_0); methods += new qt_gsi::GenericMethod ("accept", "@hide", false, &_init_cbs_accept_0_0, &_call_cbs_accept_0_0, &_set_callback_cbs_accept_0_0); - methods += new qt_gsi::GenericMethod ("emit_accepted", "@brief Emitter for signal void QPrintDialog::accepted()\nCall this method to emit this signal.", false, &_init_emitter_accepted_0, &_call_emitter_accepted_0); - methods += new qt_gsi::GenericMethod ("emit_accepted_sig", "@brief Emitter for signal void QPrintDialog::accepted(QPrinter *printer)\nCall this method to emit this signal.", false, &_init_emitter_accepted_1443, &_call_emitter_accepted_1443); methods += new qt_gsi::GenericMethod ("*actionEvent", "@brief Virtual method void QPrintDialog::actionEvent(QActionEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_actionEvent_1823_0, &_call_cbs_actionEvent_1823_0); methods += new qt_gsi::GenericMethod ("*actionEvent", "@hide", false, &_init_cbs_actionEvent_1823_0, &_call_cbs_actionEvent_1823_0, &_set_callback_cbs_actionEvent_1823_0); methods += new qt_gsi::GenericMethod ("*adjustPosition", "@brief Method void QPrintDialog::adjustPosition(QWidget *)\nThis method is protected and can only be called from inside a derived class.", false, &_init_fp_adjustPosition_1315, &_call_fp_adjustPosition_1315); @@ -2867,11 +2686,9 @@ static gsi::Methods methods_QPrintDialog_Adaptor () { methods += new qt_gsi::GenericMethod ("*contextMenuEvent", "@brief Virtual method void QPrintDialog::contextMenuEvent(QContextMenuEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_contextMenuEvent_2363_0, &_call_cbs_contextMenuEvent_2363_0); methods += new qt_gsi::GenericMethod ("*contextMenuEvent", "@hide", false, &_init_cbs_contextMenuEvent_2363_0, &_call_cbs_contextMenuEvent_2363_0, &_set_callback_cbs_contextMenuEvent_2363_0); methods += new qt_gsi::GenericMethod ("*qt_create", "@brief Method void QPrintDialog::create(WId, bool initializeWindow, bool destroyOldWindow)\nThis method is protected and can only be called from inside a derived class.", false, &_init_fp_create_2208, &_call_fp_create_2208); - methods += new qt_gsi::GenericMethod ("emit_customContextMenuRequested", "@brief Emitter for signal void QPrintDialog::customContextMenuRequested(const QPoint &pos)\nCall this method to emit this signal.", false, &_init_emitter_customContextMenuRequested_1916, &_call_emitter_customContextMenuRequested_1916); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QPrintDialog::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*qt_destroy", "@brief Method void QPrintDialog::destroy(bool destroyWindow, bool destroySubWindows)\nThis method is protected and can only be called from inside a derived class.", false, &_init_fp_destroy_1620, &_call_fp_destroy_1620); - methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QPrintDialog::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QPrintDialog::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("done", "@brief Virtual method void QPrintDialog::done(int result)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_done_767_0, &_call_cbs_done_767_0); @@ -2892,7 +2709,6 @@ static gsi::Methods methods_QPrintDialog_Adaptor () { methods += new qt_gsi::GenericMethod ("*eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("exec", "@brief Virtual method int QPrintDialog::exec()\nThis method can be reimplemented in a derived class.", false, &_init_cbs_exec_0_0, &_call_cbs_exec_0_0); methods += new qt_gsi::GenericMethod ("exec", "@hide", false, &_init_cbs_exec_0_0, &_call_cbs_exec_0_0, &_set_callback_cbs_exec_0_0); - methods += new qt_gsi::GenericMethod ("emit_finished", "@brief Emitter for signal void QPrintDialog::finished(int result)\nCall this method to emit this signal.", false, &_init_emitter_finished_767, &_call_emitter_finished_767); methods += new qt_gsi::GenericMethod ("*focusInEvent", "@brief Virtual method void QPrintDialog::focusInEvent(QFocusEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_focusInEvent_1729_0, &_call_cbs_focusInEvent_1729_0); methods += new qt_gsi::GenericMethod ("*focusInEvent", "@hide", false, &_init_cbs_focusInEvent_1729_0, &_call_cbs_focusInEvent_1729_0, &_set_callback_cbs_focusInEvent_1729_0); methods += new qt_gsi::GenericMethod ("*focusNextChild", "@brief Method bool QPrintDialog::focusNextChild()\nThis method is protected and can only be called from inside a derived class.", false, &_init_fp_focusNextChild_0, &_call_fp_focusNextChild_0); @@ -2947,7 +2763,6 @@ static gsi::Methods methods_QPrintDialog_Adaptor () { methods += new qt_gsi::GenericMethod ("*redirected", "@hide", true, &_init_cbs_redirected_c1225_0, &_call_cbs_redirected_c1225_0, &_set_callback_cbs_redirected_c1225_0); methods += new qt_gsi::GenericMethod ("reject", "@brief Virtual method void QPrintDialog::reject()\nThis method can be reimplemented in a derived class.", false, &_init_cbs_reject_0_0, &_call_cbs_reject_0_0); methods += new qt_gsi::GenericMethod ("reject", "@hide", false, &_init_cbs_reject_0_0, &_call_cbs_reject_0_0, &_set_callback_cbs_reject_0_0); - methods += new qt_gsi::GenericMethod ("emit_rejected", "@brief Emitter for signal void QPrintDialog::rejected()\nCall this method to emit this signal.", false, &_init_emitter_rejected_0, &_call_emitter_rejected_0); methods += new qt_gsi::GenericMethod ("*resizeEvent", "@brief Virtual method void QPrintDialog::resizeEvent(QResizeEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_resizeEvent_1843_0, &_call_cbs_resizeEvent_1843_0); methods += new qt_gsi::GenericMethod ("*resizeEvent", "@hide", false, &_init_cbs_resizeEvent_1843_0, &_call_cbs_resizeEvent_1843_0, &_set_callback_cbs_resizeEvent_1843_0); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QPrintDialog::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); @@ -2967,9 +2782,6 @@ static gsi::Methods methods_QPrintDialog_Adaptor () { methods += new qt_gsi::GenericMethod ("*updateMicroFocus", "@brief Method void QPrintDialog::updateMicroFocus()\nThis method is protected and can only be called from inside a derived class.", false, &_init_fp_updateMicroFocus_0, &_call_fp_updateMicroFocus_0); methods += new qt_gsi::GenericMethod ("*wheelEvent", "@brief Virtual method void QPrintDialog::wheelEvent(QWheelEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_wheelEvent_1718_0, &_call_cbs_wheelEvent_1718_0); methods += new qt_gsi::GenericMethod ("*wheelEvent", "@hide", false, &_init_cbs_wheelEvent_1718_0, &_call_cbs_wheelEvent_1718_0, &_set_callback_cbs_wheelEvent_1718_0); - methods += new qt_gsi::GenericMethod ("emit_windowIconChanged", "@brief Emitter for signal void QPrintDialog::windowIconChanged(const QIcon &icon)\nCall this method to emit this signal.", false, &_init_emitter_windowIconChanged_1787, &_call_emitter_windowIconChanged_1787); - methods += new qt_gsi::GenericMethod ("emit_windowIconTextChanged", "@brief Emitter for signal void QPrintDialog::windowIconTextChanged(const QString &iconText)\nCall this method to emit this signal.", false, &_init_emitter_windowIconTextChanged_2025, &_call_emitter_windowIconTextChanged_2025); - methods += new qt_gsi::GenericMethod ("emit_windowTitleChanged", "@brief Emitter for signal void QPrintDialog::windowTitleChanged(const QString &title)\nCall this method to emit this signal.", false, &_init_emitter_windowTitleChanged_2025, &_call_emitter_windowTitleChanged_2025); return methods; } diff --git a/src/gsiqt/qt5/QtPrintSupport/gsiDeclQPrintPreviewDialog.cc b/src/gsiqt/qt5/QtPrintSupport/gsiDeclQPrintPreviewDialog.cc index f9b4c6616..d5d2368c6 100644 --- a/src/gsiqt/qt5/QtPrintSupport/gsiDeclQPrintPreviewDialog.cc +++ b/src/gsiqt/qt5/QtPrintSupport/gsiDeclQPrintPreviewDialog.cc @@ -160,6 +160,26 @@ static void _call_f_open_2925 (const qt_gsi::GenericMethod * /*decl*/, void *cls } +// void QPrintPreviewDialog::paintRequested(QPrinter *printer) + + +static void _init_f_paintRequested_1443 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("printer"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_paintRequested_1443 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + QPrinter *arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QPrintPreviewDialog *)cls)->paintRequested (arg1); +} + + // QPrinter *QPrintPreviewDialog::printer() @@ -254,17 +274,9 @@ static gsi::Methods methods_QPrintPreviewDialog () { methods += new qt_gsi::GenericMethod ("done", "@brief Method void QPrintPreviewDialog::done(int result)\nThis is a reimplementation of QDialog::done", false, &_init_f_done_767, &_call_f_done_767); methods += new qt_gsi::GenericMethod ("open", "@brief Method void QPrintPreviewDialog::open()\nThis is a reimplementation of QDialog::open", false, &_init_f_open_0, &_call_f_open_0); methods += new qt_gsi::GenericMethod ("open", "@brief Method void QPrintPreviewDialog::open(QObject *receiver, const char *member)\n", false, &_init_f_open_2925, &_call_f_open_2925); + methods += new qt_gsi::GenericMethod ("paintRequested", "@brief Method void QPrintPreviewDialog::paintRequested(QPrinter *printer)\n", false, &_init_f_paintRequested_1443, &_call_f_paintRequested_1443); methods += new qt_gsi::GenericMethod ("printer", "@brief Method QPrinter *QPrintPreviewDialog::printer()\n", false, &_init_f_printer_0, &_call_f_printer_0); methods += new qt_gsi::GenericMethod ("setVisible|visible=", "@brief Method void QPrintPreviewDialog::setVisible(bool visible)\nThis is a reimplementation of QDialog::setVisible", false, &_init_f_setVisible_864, &_call_f_setVisible_864); - methods += gsi::qt_signal ("accepted()", "accepted", "@brief Signal declaration for QPrintPreviewDialog::accepted()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("customContextMenuRequested(const QPoint &)", "customContextMenuRequested", gsi::arg("pos"), "@brief Signal declaration for QPrintPreviewDialog::customContextMenuRequested(const QPoint &pos)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QPrintPreviewDialog::destroyed(QObject *)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("finished(int)", "finished", gsi::arg("result"), "@brief Signal declaration for QPrintPreviewDialog::finished(int result)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("paintRequested(QPrinter *)", "paintRequested", gsi::arg("printer"), "@brief Signal declaration for QPrintPreviewDialog::paintRequested(QPrinter *printer)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("rejected()", "rejected", "@brief Signal declaration for QPrintPreviewDialog::rejected()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("windowIconChanged(const QIcon &)", "windowIconChanged", gsi::arg("icon"), "@brief Signal declaration for QPrintPreviewDialog::windowIconChanged(const QIcon &icon)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("windowIconTextChanged(const QString &)", "windowIconTextChanged", gsi::arg("iconText"), "@brief Signal declaration for QPrintPreviewDialog::windowIconTextChanged(const QString &iconText)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("windowTitleChanged(const QString &)", "windowTitleChanged", gsi::arg("title"), "@brief Signal declaration for QPrintPreviewDialog::windowTitleChanged(const QString &title)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QPrintPreviewDialog::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QPrintPreviewDialog::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -388,24 +400,6 @@ public: } } - // [emitter impl] void QPrintPreviewDialog::accepted() - void emitter_QPrintPreviewDialog_accepted_0() - { - emit QPrintPreviewDialog::accepted(); - } - - // [emitter impl] void QPrintPreviewDialog::customContextMenuRequested(const QPoint &pos) - void emitter_QPrintPreviewDialog_customContextMenuRequested_1916(const QPoint &pos) - { - emit QPrintPreviewDialog::customContextMenuRequested(pos); - } - - // [emitter impl] void QPrintPreviewDialog::destroyed(QObject *) - void emitter_QPrintPreviewDialog_destroyed_1302(QObject *arg1) - { - emit QPrintPreviewDialog::destroyed(arg1); - } - // [adaptor impl] void QPrintPreviewDialog::done(int result) void cbs_done_767_0(int result) { @@ -436,12 +430,6 @@ public: } } - // [emitter impl] void QPrintPreviewDialog::finished(int result) - void emitter_QPrintPreviewDialog_finished_767(int result) - { - emit QPrintPreviewDialog::finished(result); - } - // [adaptor impl] bool QPrintPreviewDialog::hasHeightForWidth() bool cbs_hasHeightForWidth_c0_0() const { @@ -532,12 +520,6 @@ public: } } - // [emitter impl] void QPrintPreviewDialog::paintRequested(QPrinter *printer) - void emitter_QPrintPreviewDialog_paintRequested_1443(QPrinter *printer) - { - emit QPrintPreviewDialog::paintRequested(printer); - } - // [adaptor impl] void QPrintPreviewDialog::reject() void cbs_reject_0_0() { @@ -553,12 +535,6 @@ public: } } - // [emitter impl] void QPrintPreviewDialog::rejected() - void emitter_QPrintPreviewDialog_rejected_0() - { - emit QPrintPreviewDialog::rejected(); - } - // [adaptor impl] void QPrintPreviewDialog::setVisible(bool visible) void cbs_setVisible_864_0(bool visible) { @@ -589,24 +565,6 @@ public: } } - // [emitter impl] void QPrintPreviewDialog::windowIconChanged(const QIcon &icon) - void emitter_QPrintPreviewDialog_windowIconChanged_1787(const QIcon &icon) - { - emit QPrintPreviewDialog::windowIconChanged(icon); - } - - // [emitter impl] void QPrintPreviewDialog::windowIconTextChanged(const QString &iconText) - void emitter_QPrintPreviewDialog_windowIconTextChanged_2025(const QString &iconText) - { - emit QPrintPreviewDialog::windowIconTextChanged(iconText); - } - - // [emitter impl] void QPrintPreviewDialog::windowTitleChanged(const QString &title) - void emitter_QPrintPreviewDialog_windowTitleChanged_2025(const QString &title) - { - emit QPrintPreviewDialog::windowTitleChanged(title); - } - // [adaptor impl] void QPrintPreviewDialog::actionEvent(QActionEvent *) void cbs_actionEvent_1823_0(QActionEvent *arg1) { @@ -1296,20 +1254,6 @@ static void _set_callback_cbs_accept_0_0 (void *cls, const gsi::Callback &cb) } -// emitter void QPrintPreviewDialog::accepted() - -static void _init_emitter_accepted_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_accepted_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QPrintPreviewDialog_Adaptor *)cls)->emitter_QPrintPreviewDialog_accepted_0 (); -} - - // void QPrintPreviewDialog::actionEvent(QActionEvent *) static void _init_cbs_actionEvent_1823_0 (qt_gsi::GenericMethod *decl) @@ -1474,24 +1418,6 @@ static void _call_fp_create_2208 (const qt_gsi::GenericMethod * /*decl*/, void * } -// emitter void QPrintPreviewDialog::customContextMenuRequested(const QPoint &pos) - -static void _init_emitter_customContextMenuRequested_1916 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("pos"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_customContextMenuRequested_1916 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const QPoint &arg1 = gsi::arg_reader() (args, heap); - ((QPrintPreviewDialog_Adaptor *)cls)->emitter_QPrintPreviewDialog_customContextMenuRequested_1916 (arg1); -} - - // void QPrintPreviewDialog::customEvent(QEvent *) static void _init_cbs_customEvent_1217_0 (qt_gsi::GenericMethod *decl) @@ -1538,24 +1464,6 @@ static void _call_fp_destroy_1620 (const qt_gsi::GenericMethod * /*decl*/, void } -// emitter void QPrintPreviewDialog::destroyed(QObject *) - -static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - ((QPrintPreviewDialog_Adaptor *)cls)->emitter_QPrintPreviewDialog_destroyed_1302 (arg1); -} - - // void QPrintPreviewDialog::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -1792,24 +1700,6 @@ static void _set_callback_cbs_exec_0_0 (void *cls, const gsi::Callback &cb) } -// emitter void QPrintPreviewDialog::finished(int result) - -static void _init_emitter_finished_767 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("result"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_finished_767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - int arg1 = gsi::arg_reader() (args, heap); - ((QPrintPreviewDialog_Adaptor *)cls)->emitter_QPrintPreviewDialog_finished_767 (arg1); -} - - // void QPrintPreviewDialog::focusInEvent(QFocusEvent *) static void _init_cbs_focusInEvent_1729_0 (qt_gsi::GenericMethod *decl) @@ -2390,24 +2280,6 @@ static void _set_callback_cbs_paintEvent_1725_0 (void *cls, const gsi::Callback } -// emitter void QPrintPreviewDialog::paintRequested(QPrinter *printer) - -static void _init_emitter_paintRequested_1443 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("printer"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_paintRequested_1443 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QPrinter *arg1 = gsi::arg_reader() (args, heap); - ((QPrintPreviewDialog_Adaptor *)cls)->emitter_QPrintPreviewDialog_paintRequested_1443 (arg1); -} - - // exposed int QPrintPreviewDialog::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -2469,20 +2341,6 @@ static void _set_callback_cbs_reject_0_0 (void *cls, const gsi::Callback &cb) } -// emitter void QPrintPreviewDialog::rejected() - -static void _init_emitter_rejected_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_rejected_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QPrintPreviewDialog_Adaptor *)cls)->emitter_QPrintPreviewDialog_rejected_0 (); -} - - // void QPrintPreviewDialog::resizeEvent(QResizeEvent *) static void _init_cbs_resizeEvent_1843_0 (qt_gsi::GenericMethod *decl) @@ -2708,60 +2566,6 @@ static void _set_callback_cbs_wheelEvent_1718_0 (void *cls, const gsi::Callback } -// emitter void QPrintPreviewDialog::windowIconChanged(const QIcon &icon) - -static void _init_emitter_windowIconChanged_1787 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("icon"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_windowIconChanged_1787 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const QIcon &arg1 = gsi::arg_reader() (args, heap); - ((QPrintPreviewDialog_Adaptor *)cls)->emitter_QPrintPreviewDialog_windowIconChanged_1787 (arg1); -} - - -// emitter void QPrintPreviewDialog::windowIconTextChanged(const QString &iconText) - -static void _init_emitter_windowIconTextChanged_2025 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("iconText"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_windowIconTextChanged_2025 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const QString &arg1 = gsi::arg_reader() (args, heap); - ((QPrintPreviewDialog_Adaptor *)cls)->emitter_QPrintPreviewDialog_windowIconTextChanged_2025 (arg1); -} - - -// emitter void QPrintPreviewDialog::windowTitleChanged(const QString &title) - -static void _init_emitter_windowTitleChanged_2025 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("title"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_windowTitleChanged_2025 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const QString &arg1 = gsi::arg_reader() (args, heap); - ((QPrintPreviewDialog_Adaptor *)cls)->emitter_QPrintPreviewDialog_windowTitleChanged_2025 (arg1); -} - - namespace gsi { @@ -2773,7 +2577,6 @@ static gsi::Methods methods_QPrintPreviewDialog_Adaptor () { methods += new qt_gsi::GenericStaticMethod ("new", "@brief Constructor QPrintPreviewDialog::QPrintPreviewDialog(QPrinter *printer, QWidget *parent, QFlags flags)\nThis method creates an object of class QPrintPreviewDialog.", &_init_ctor_QPrintPreviewDialog_Adaptor_5037, &_call_ctor_QPrintPreviewDialog_Adaptor_5037); methods += new qt_gsi::GenericMethod ("accept", "@brief Virtual method void QPrintPreviewDialog::accept()\nThis method can be reimplemented in a derived class.", false, &_init_cbs_accept_0_0, &_call_cbs_accept_0_0); methods += new qt_gsi::GenericMethod ("accept", "@hide", false, &_init_cbs_accept_0_0, &_call_cbs_accept_0_0, &_set_callback_cbs_accept_0_0); - methods += new qt_gsi::GenericMethod ("emit_accepted", "@brief Emitter for signal void QPrintPreviewDialog::accepted()\nCall this method to emit this signal.", false, &_init_emitter_accepted_0, &_call_emitter_accepted_0); methods += new qt_gsi::GenericMethod ("*actionEvent", "@brief Virtual method void QPrintPreviewDialog::actionEvent(QActionEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_actionEvent_1823_0, &_call_cbs_actionEvent_1823_0); methods += new qt_gsi::GenericMethod ("*actionEvent", "@hide", false, &_init_cbs_actionEvent_1823_0, &_call_cbs_actionEvent_1823_0, &_set_callback_cbs_actionEvent_1823_0); methods += new qt_gsi::GenericMethod ("*adjustPosition", "@brief Method void QPrintPreviewDialog::adjustPosition(QWidget *)\nThis method is protected and can only be called from inside a derived class.", false, &_init_fp_adjustPosition_1315, &_call_fp_adjustPosition_1315); @@ -2786,11 +2589,9 @@ static gsi::Methods methods_QPrintPreviewDialog_Adaptor () { methods += new qt_gsi::GenericMethod ("*contextMenuEvent", "@brief Virtual method void QPrintPreviewDialog::contextMenuEvent(QContextMenuEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_contextMenuEvent_2363_0, &_call_cbs_contextMenuEvent_2363_0); methods += new qt_gsi::GenericMethod ("*contextMenuEvent", "@hide", false, &_init_cbs_contextMenuEvent_2363_0, &_call_cbs_contextMenuEvent_2363_0, &_set_callback_cbs_contextMenuEvent_2363_0); methods += new qt_gsi::GenericMethod ("*qt_create", "@brief Method void QPrintPreviewDialog::create(WId, bool initializeWindow, bool destroyOldWindow)\nThis method is protected and can only be called from inside a derived class.", false, &_init_fp_create_2208, &_call_fp_create_2208); - methods += new qt_gsi::GenericMethod ("emit_customContextMenuRequested", "@brief Emitter for signal void QPrintPreviewDialog::customContextMenuRequested(const QPoint &pos)\nCall this method to emit this signal.", false, &_init_emitter_customContextMenuRequested_1916, &_call_emitter_customContextMenuRequested_1916); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QPrintPreviewDialog::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*qt_destroy", "@brief Method void QPrintPreviewDialog::destroy(bool destroyWindow, bool destroySubWindows)\nThis method is protected and can only be called from inside a derived class.", false, &_init_fp_destroy_1620, &_call_fp_destroy_1620); - methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QPrintPreviewDialog::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QPrintPreviewDialog::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("done", "@brief Virtual method void QPrintPreviewDialog::done(int result)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_done_767_0, &_call_cbs_done_767_0); @@ -2811,7 +2612,6 @@ static gsi::Methods methods_QPrintPreviewDialog_Adaptor () { methods += new qt_gsi::GenericMethod ("*eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("exec", "@brief Virtual method int QPrintPreviewDialog::exec()\nThis method can be reimplemented in a derived class.", false, &_init_cbs_exec_0_0, &_call_cbs_exec_0_0); methods += new qt_gsi::GenericMethod ("exec", "@hide", false, &_init_cbs_exec_0_0, &_call_cbs_exec_0_0, &_set_callback_cbs_exec_0_0); - methods += new qt_gsi::GenericMethod ("emit_finished", "@brief Emitter for signal void QPrintPreviewDialog::finished(int result)\nCall this method to emit this signal.", false, &_init_emitter_finished_767, &_call_emitter_finished_767); methods += new qt_gsi::GenericMethod ("*focusInEvent", "@brief Virtual method void QPrintPreviewDialog::focusInEvent(QFocusEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_focusInEvent_1729_0, &_call_cbs_focusInEvent_1729_0); methods += new qt_gsi::GenericMethod ("*focusInEvent", "@hide", false, &_init_cbs_focusInEvent_1729_0, &_call_cbs_focusInEvent_1729_0, &_set_callback_cbs_focusInEvent_1729_0); methods += new qt_gsi::GenericMethod ("*focusNextChild", "@brief Method bool QPrintPreviewDialog::focusNextChild()\nThis method is protected and can only be called from inside a derived class.", false, &_init_fp_focusNextChild_0, &_call_fp_focusNextChild_0); @@ -2861,13 +2661,11 @@ static gsi::Methods methods_QPrintPreviewDialog_Adaptor () { methods += new qt_gsi::GenericMethod ("paintEngine", "@hide", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0, &_set_callback_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("*paintEvent", "@brief Virtual method void QPrintPreviewDialog::paintEvent(QPaintEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_paintEvent_1725_0, &_call_cbs_paintEvent_1725_0); methods += new qt_gsi::GenericMethod ("*paintEvent", "@hide", false, &_init_cbs_paintEvent_1725_0, &_call_cbs_paintEvent_1725_0, &_set_callback_cbs_paintEvent_1725_0); - methods += new qt_gsi::GenericMethod ("emit_paintRequested", "@brief Emitter for signal void QPrintPreviewDialog::paintRequested(QPrinter *printer)\nCall this method to emit this signal.", false, &_init_emitter_paintRequested_1443, &_call_emitter_paintRequested_1443); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QPrintPreviewDialog::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*redirected", "@brief Virtual method QPaintDevice *QPrintPreviewDialog::redirected(QPoint *offset)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_redirected_c1225_0, &_call_cbs_redirected_c1225_0); methods += new qt_gsi::GenericMethod ("*redirected", "@hide", true, &_init_cbs_redirected_c1225_0, &_call_cbs_redirected_c1225_0, &_set_callback_cbs_redirected_c1225_0); methods += new qt_gsi::GenericMethod ("reject", "@brief Virtual method void QPrintPreviewDialog::reject()\nThis method can be reimplemented in a derived class.", false, &_init_cbs_reject_0_0, &_call_cbs_reject_0_0); methods += new qt_gsi::GenericMethod ("reject", "@hide", false, &_init_cbs_reject_0_0, &_call_cbs_reject_0_0, &_set_callback_cbs_reject_0_0); - methods += new qt_gsi::GenericMethod ("emit_rejected", "@brief Emitter for signal void QPrintPreviewDialog::rejected()\nCall this method to emit this signal.", false, &_init_emitter_rejected_0, &_call_emitter_rejected_0); methods += new qt_gsi::GenericMethod ("*resizeEvent", "@brief Virtual method void QPrintPreviewDialog::resizeEvent(QResizeEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_resizeEvent_1843_0, &_call_cbs_resizeEvent_1843_0); methods += new qt_gsi::GenericMethod ("*resizeEvent", "@hide", false, &_init_cbs_resizeEvent_1843_0, &_call_cbs_resizeEvent_1843_0, &_set_callback_cbs_resizeEvent_1843_0); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QPrintPreviewDialog::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); @@ -2887,9 +2685,6 @@ static gsi::Methods methods_QPrintPreviewDialog_Adaptor () { methods += new qt_gsi::GenericMethod ("*updateMicroFocus", "@brief Method void QPrintPreviewDialog::updateMicroFocus()\nThis method is protected and can only be called from inside a derived class.", false, &_init_fp_updateMicroFocus_0, &_call_fp_updateMicroFocus_0); methods += new qt_gsi::GenericMethod ("*wheelEvent", "@brief Virtual method void QPrintPreviewDialog::wheelEvent(QWheelEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_wheelEvent_1718_0, &_call_cbs_wheelEvent_1718_0); methods += new qt_gsi::GenericMethod ("*wheelEvent", "@hide", false, &_init_cbs_wheelEvent_1718_0, &_call_cbs_wheelEvent_1718_0, &_set_callback_cbs_wheelEvent_1718_0); - methods += new qt_gsi::GenericMethod ("emit_windowIconChanged", "@brief Emitter for signal void QPrintPreviewDialog::windowIconChanged(const QIcon &icon)\nCall this method to emit this signal.", false, &_init_emitter_windowIconChanged_1787, &_call_emitter_windowIconChanged_1787); - methods += new qt_gsi::GenericMethod ("emit_windowIconTextChanged", "@brief Emitter for signal void QPrintPreviewDialog::windowIconTextChanged(const QString &iconText)\nCall this method to emit this signal.", false, &_init_emitter_windowIconTextChanged_2025, &_call_emitter_windowIconTextChanged_2025); - methods += new qt_gsi::GenericMethod ("emit_windowTitleChanged", "@brief Emitter for signal void QPrintPreviewDialog::windowTitleChanged(const QString &title)\nCall this method to emit this signal.", false, &_init_emitter_windowTitleChanged_2025, &_call_emitter_windowTitleChanged_2025); return methods; } diff --git a/src/gsiqt/qt5/QtPrintSupport/gsiDeclQPrintPreviewWidget.cc b/src/gsiqt/qt5/QtPrintSupport/gsiDeclQPrintPreviewWidget.cc index ff4e919ef..4635920d1 100644 --- a/src/gsiqt/qt5/QtPrintSupport/gsiDeclQPrintPreviewWidget.cc +++ b/src/gsiqt/qt5/QtPrintSupport/gsiDeclQPrintPreviewWidget.cc @@ -178,6 +178,42 @@ static void _call_f_pageCount_c0 (const qt_gsi::GenericMethod * /*decl*/, void * } +// void QPrintPreviewWidget::paintRequested(QPrinter *printer) + + +static void _init_f_paintRequested_1443 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("printer"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_f_paintRequested_1443 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + QPrinter *arg1 = gsi::arg_reader() (args, heap); + __SUPPRESS_UNUSED_WARNING(ret); + ((QPrintPreviewWidget *)cls)->paintRequested (arg1); +} + + +// void QPrintPreviewWidget::previewChanged() + + +static void _init_f_previewChanged_0 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_f_previewChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + __SUPPRESS_UNUSED_WARNING(ret); + ((QPrintPreviewWidget *)cls)->previewChanged (); +} + + // void QPrintPreviewWidget::print() @@ -556,6 +592,8 @@ static gsi::Methods methods_QPrintPreviewWidget () { methods += new qt_gsi::GenericMethod ("fitToWidth", "@brief Method void QPrintPreviewWidget::fitToWidth()\n", false, &_init_f_fitToWidth_0, &_call_f_fitToWidth_0); methods += new qt_gsi::GenericMethod (":orientation", "@brief Method QPrinter::Orientation QPrintPreviewWidget::orientation()\n", true, &_init_f_orientation_c0, &_call_f_orientation_c0); methods += new qt_gsi::GenericMethod ("pageCount", "@brief Method int QPrintPreviewWidget::pageCount()\n", true, &_init_f_pageCount_c0, &_call_f_pageCount_c0); + methods += new qt_gsi::GenericMethod ("paintRequested", "@brief Method void QPrintPreviewWidget::paintRequested(QPrinter *printer)\n", false, &_init_f_paintRequested_1443, &_call_f_paintRequested_1443); + methods += new qt_gsi::GenericMethod ("previewChanged", "@brief Method void QPrintPreviewWidget::previewChanged()\n", false, &_init_f_previewChanged_0, &_call_f_previewChanged_0); methods += new qt_gsi::GenericMethod ("print", "@brief Method void QPrintPreviewWidget::print()\n", false, &_init_f_print_0, &_call_f_print_0); methods += new qt_gsi::GenericMethod ("setAllPagesViewMode", "@brief Method void QPrintPreviewWidget::setAllPagesViewMode()\n", false, &_init_f_setAllPagesViewMode_0, &_call_f_setAllPagesViewMode_0); methods += new qt_gsi::GenericMethod ("setCurrentPage|currentPage=", "@brief Method void QPrintPreviewWidget::setCurrentPage(int pageNumber)\n", false, &_init_f_setCurrentPage_767, &_call_f_setCurrentPage_767); @@ -574,13 +612,6 @@ static gsi::Methods methods_QPrintPreviewWidget () { methods += new qt_gsi::GenericMethod ("zoomIn", "@brief Method void QPrintPreviewWidget::zoomIn(double zoom)\n", false, &_init_f_zoomIn_1071, &_call_f_zoomIn_1071); methods += new qt_gsi::GenericMethod (":zoomMode", "@brief Method QPrintPreviewWidget::ZoomMode QPrintPreviewWidget::zoomMode()\n", true, &_init_f_zoomMode_c0, &_call_f_zoomMode_c0); methods += new qt_gsi::GenericMethod ("zoomOut", "@brief Method void QPrintPreviewWidget::zoomOut(double zoom)\n", false, &_init_f_zoomOut_1071, &_call_f_zoomOut_1071); - methods += gsi::qt_signal ("customContextMenuRequested(const QPoint &)", "customContextMenuRequested", gsi::arg("pos"), "@brief Signal declaration for QPrintPreviewWidget::customContextMenuRequested(const QPoint &pos)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QPrintPreviewWidget::destroyed(QObject *)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("paintRequested(QPrinter *)", "paintRequested", gsi::arg("printer"), "@brief Signal declaration for QPrintPreviewWidget::paintRequested(QPrinter *printer)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("previewChanged()", "previewChanged", "@brief Signal declaration for QPrintPreviewWidget::previewChanged()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("windowIconChanged(const QIcon &)", "windowIconChanged", gsi::arg("icon"), "@brief Signal declaration for QPrintPreviewWidget::windowIconChanged(const QIcon &icon)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("windowIconTextChanged(const QString &)", "windowIconTextChanged", gsi::arg("iconText"), "@brief Signal declaration for QPrintPreviewWidget::windowIconTextChanged(const QString &iconText)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("windowTitleChanged(const QString &)", "windowTitleChanged", gsi::arg("title"), "@brief Signal declaration for QPrintPreviewWidget::windowTitleChanged(const QString &title)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QPrintPreviewWidget::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QPrintPreviewWidget::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -684,18 +715,6 @@ public: QPrintPreviewWidget::updateMicroFocus(); } - // [emitter impl] void QPrintPreviewWidget::customContextMenuRequested(const QPoint &pos) - void emitter_QPrintPreviewWidget_customContextMenuRequested_1916(const QPoint &pos) - { - emit QPrintPreviewWidget::customContextMenuRequested(pos); - } - - // [emitter impl] void QPrintPreviewWidget::destroyed(QObject *) - void emitter_QPrintPreviewWidget_destroyed_1302(QObject *arg1) - { - emit QPrintPreviewWidget::destroyed(arg1); - } - // [adaptor impl] bool QPrintPreviewWidget::eventFilter(QObject *, QEvent *) bool cbs_eventFilter_2411_0(QObject *arg1, QEvent *arg2) { @@ -786,18 +805,6 @@ public: } } - // [emitter impl] void QPrintPreviewWidget::paintRequested(QPrinter *printer) - void emitter_QPrintPreviewWidget_paintRequested_1443(QPrinter *printer) - { - emit QPrintPreviewWidget::paintRequested(printer); - } - - // [emitter impl] void QPrintPreviewWidget::previewChanged() - void emitter_QPrintPreviewWidget_previewChanged_0() - { - emit QPrintPreviewWidget::previewChanged(); - } - // [adaptor impl] void QPrintPreviewWidget::setVisible(bool visible) void cbs_setVisible_864_0(bool visible) { @@ -828,24 +835,6 @@ public: } } - // [emitter impl] void QPrintPreviewWidget::windowIconChanged(const QIcon &icon) - void emitter_QPrintPreviewWidget_windowIconChanged_1787(const QIcon &icon) - { - emit QPrintPreviewWidget::windowIconChanged(icon); - } - - // [emitter impl] void QPrintPreviewWidget::windowIconTextChanged(const QString &iconText) - void emitter_QPrintPreviewWidget_windowIconTextChanged_2025(const QString &iconText) - { - emit QPrintPreviewWidget::windowIconTextChanged(iconText); - } - - // [emitter impl] void QPrintPreviewWidget::windowTitleChanged(const QString &title) - void emitter_QPrintPreviewWidget_windowTitleChanged_2025(const QString &title) - { - emit QPrintPreviewWidget::windowTitleChanged(title); - } - // [adaptor impl] void QPrintPreviewWidget::actionEvent(QActionEvent *) void cbs_actionEvent_1823_0(QActionEvent *arg1) { @@ -1640,24 +1629,6 @@ static void _call_fp_create_2208 (const qt_gsi::GenericMethod * /*decl*/, void * } -// emitter void QPrintPreviewWidget::customContextMenuRequested(const QPoint &pos) - -static void _init_emitter_customContextMenuRequested_1916 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("pos"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_customContextMenuRequested_1916 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const QPoint &arg1 = gsi::arg_reader() (args, heap); - ((QPrintPreviewWidget_Adaptor *)cls)->emitter_QPrintPreviewWidget_customContextMenuRequested_1916 (arg1); -} - - // void QPrintPreviewWidget::customEvent(QEvent *) static void _init_cbs_customEvent_1217_0 (qt_gsi::GenericMethod *decl) @@ -1704,24 +1675,6 @@ static void _call_fp_destroy_1620 (const qt_gsi::GenericMethod * /*decl*/, void } -// emitter void QPrintPreviewWidget::destroyed(QObject *) - -static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - ((QPrintPreviewWidget_Adaptor *)cls)->emitter_QPrintPreviewWidget_destroyed_1302 (arg1); -} - - // void QPrintPreviewWidget::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -2475,38 +2428,6 @@ static void _set_callback_cbs_paintEvent_1725_0 (void *cls, const gsi::Callback } -// emitter void QPrintPreviewWidget::paintRequested(QPrinter *printer) - -static void _init_emitter_paintRequested_1443 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("printer"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_paintRequested_1443 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QPrinter *arg1 = gsi::arg_reader() (args, heap); - ((QPrintPreviewWidget_Adaptor *)cls)->emitter_QPrintPreviewWidget_paintRequested_1443 (arg1); -} - - -// emitter void QPrintPreviewWidget::previewChanged() - -static void _init_emitter_previewChanged_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_previewChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QPrintPreviewWidget_Adaptor *)cls)->emitter_QPrintPreviewWidget_previewChanged_0 (); -} - - // exposed int QPrintPreviewWidget::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -2773,60 +2694,6 @@ static void _set_callback_cbs_wheelEvent_1718_0 (void *cls, const gsi::Callback } -// emitter void QPrintPreviewWidget::windowIconChanged(const QIcon &icon) - -static void _init_emitter_windowIconChanged_1787 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("icon"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_windowIconChanged_1787 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const QIcon &arg1 = gsi::arg_reader() (args, heap); - ((QPrintPreviewWidget_Adaptor *)cls)->emitter_QPrintPreviewWidget_windowIconChanged_1787 (arg1); -} - - -// emitter void QPrintPreviewWidget::windowIconTextChanged(const QString &iconText) - -static void _init_emitter_windowIconTextChanged_2025 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("iconText"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_windowIconTextChanged_2025 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const QString &arg1 = gsi::arg_reader() (args, heap); - ((QPrintPreviewWidget_Adaptor *)cls)->emitter_QPrintPreviewWidget_windowIconTextChanged_2025 (arg1); -} - - -// emitter void QPrintPreviewWidget::windowTitleChanged(const QString &title) - -static void _init_emitter_windowTitleChanged_2025 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("title"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_windowTitleChanged_2025 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const QString &arg1 = gsi::arg_reader() (args, heap); - ((QPrintPreviewWidget_Adaptor *)cls)->emitter_QPrintPreviewWidget_windowTitleChanged_2025 (arg1); -} - - namespace gsi { @@ -2847,11 +2714,9 @@ static gsi::Methods methods_QPrintPreviewWidget_Adaptor () { methods += new qt_gsi::GenericMethod ("*contextMenuEvent", "@brief Virtual method void QPrintPreviewWidget::contextMenuEvent(QContextMenuEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_contextMenuEvent_2363_0, &_call_cbs_contextMenuEvent_2363_0); methods += new qt_gsi::GenericMethod ("*contextMenuEvent", "@hide", false, &_init_cbs_contextMenuEvent_2363_0, &_call_cbs_contextMenuEvent_2363_0, &_set_callback_cbs_contextMenuEvent_2363_0); methods += new qt_gsi::GenericMethod ("*qt_create", "@brief Method void QPrintPreviewWidget::create(WId, bool initializeWindow, bool destroyOldWindow)\nThis method is protected and can only be called from inside a derived class.", false, &_init_fp_create_2208, &_call_fp_create_2208); - methods += new qt_gsi::GenericMethod ("emit_customContextMenuRequested", "@brief Emitter for signal void QPrintPreviewWidget::customContextMenuRequested(const QPoint &pos)\nCall this method to emit this signal.", false, &_init_emitter_customContextMenuRequested_1916, &_call_emitter_customContextMenuRequested_1916); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QPrintPreviewWidget::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*qt_destroy", "@brief Method void QPrintPreviewWidget::destroy(bool destroyWindow, bool destroySubWindows)\nThis method is protected and can only be called from inside a derived class.", false, &_init_fp_destroy_1620, &_call_fp_destroy_1620); - methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QPrintPreviewWidget::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QPrintPreviewWidget::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*dragEnterEvent", "@brief Virtual method void QPrintPreviewWidget::dragEnterEvent(QDragEnterEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_dragEnterEvent_2109_0, &_call_cbs_dragEnterEvent_2109_0); @@ -2915,8 +2780,6 @@ static gsi::Methods methods_QPrintPreviewWidget_Adaptor () { methods += new qt_gsi::GenericMethod ("paintEngine", "@hide", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0, &_set_callback_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("*paintEvent", "@brief Virtual method void QPrintPreviewWidget::paintEvent(QPaintEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_paintEvent_1725_0, &_call_cbs_paintEvent_1725_0); methods += new qt_gsi::GenericMethod ("*paintEvent", "@hide", false, &_init_cbs_paintEvent_1725_0, &_call_cbs_paintEvent_1725_0, &_set_callback_cbs_paintEvent_1725_0); - methods += new qt_gsi::GenericMethod ("emit_paintRequested", "@brief Emitter for signal void QPrintPreviewWidget::paintRequested(QPrinter *printer)\nCall this method to emit this signal.", false, &_init_emitter_paintRequested_1443, &_call_emitter_paintRequested_1443); - methods += new qt_gsi::GenericMethod ("emit_previewChanged", "@brief Emitter for signal void QPrintPreviewWidget::previewChanged()\nCall this method to emit this signal.", false, &_init_emitter_previewChanged_0, &_call_emitter_previewChanged_0); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QPrintPreviewWidget::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*redirected", "@brief Virtual method QPaintDevice *QPrintPreviewWidget::redirected(QPoint *offset)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_redirected_c1225_0, &_call_cbs_redirected_c1225_0); methods += new qt_gsi::GenericMethod ("*redirected", "@hide", true, &_init_cbs_redirected_c1225_0, &_call_cbs_redirected_c1225_0, &_set_callback_cbs_redirected_c1225_0); @@ -2939,9 +2802,6 @@ static gsi::Methods methods_QPrintPreviewWidget_Adaptor () { methods += new qt_gsi::GenericMethod ("*updateMicroFocus", "@brief Method void QPrintPreviewWidget::updateMicroFocus()\nThis method is protected and can only be called from inside a derived class.", false, &_init_fp_updateMicroFocus_0, &_call_fp_updateMicroFocus_0); methods += new qt_gsi::GenericMethod ("*wheelEvent", "@brief Virtual method void QPrintPreviewWidget::wheelEvent(QWheelEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_wheelEvent_1718_0, &_call_cbs_wheelEvent_1718_0); methods += new qt_gsi::GenericMethod ("*wheelEvent", "@hide", false, &_init_cbs_wheelEvent_1718_0, &_call_cbs_wheelEvent_1718_0, &_set_callback_cbs_wheelEvent_1718_0); - methods += new qt_gsi::GenericMethod ("emit_windowIconChanged", "@brief Emitter for signal void QPrintPreviewWidget::windowIconChanged(const QIcon &icon)\nCall this method to emit this signal.", false, &_init_emitter_windowIconChanged_1787, &_call_emitter_windowIconChanged_1787); - methods += new qt_gsi::GenericMethod ("emit_windowIconTextChanged", "@brief Emitter for signal void QPrintPreviewWidget::windowIconTextChanged(const QString &iconText)\nCall this method to emit this signal.", false, &_init_emitter_windowIconTextChanged_2025, &_call_emitter_windowIconTextChanged_2025); - methods += new qt_gsi::GenericMethod ("emit_windowTitleChanged", "@brief Emitter for signal void QPrintPreviewWidget::windowTitleChanged(const QString &title)\nCall this method to emit this signal.", false, &_init_emitter_windowTitleChanged_2025, &_call_emitter_windowTitleChanged_2025); return methods; } diff --git a/src/gsiqt/qt5/QtSql/gsiDeclQSqlDriver.cc b/src/gsiqt/qt5/QtSql/gsiDeclQSqlDriver.cc index 6f907d3fc..dae7f8ec0 100644 --- a/src/gsiqt/qt5/QtSql/gsiDeclQSqlDriver.cc +++ b/src/gsiqt/qt5/QtSql/gsiDeclQSqlDriver.cc @@ -625,6 +625,7 @@ static gsi::Methods methods_QSqlDriver () { methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QSqlDriver::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("notification(const QString &)", "notification", gsi::arg("name"), "@brief Signal declaration for QSqlDriver::notification(const QString &name)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal::target_type &, const QVariant & > ("notification(const QString &, QSqlDriver::NotificationSource, const QVariant &)", "notification_withData", gsi::arg("name"), gsi::arg("source"), gsi::arg("payload"), "@brief Signal declaration for QSqlDriver::notification(const QString &name, QSqlDriver::NotificationSource source, const QVariant &payload)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QSqlDriver::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QSqlDriver::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QSqlDriver::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -893,6 +894,13 @@ public: emit QSqlDriver::notification(name, source, payload); } + // [emitter impl] void QSqlDriver::objectNameChanged(const QString &objectName) + void emitter_QSqlDriver_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QSqlDriver::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] bool QSqlDriver::open(const QString &db, const QString &user, const QString &password, const QString &host, int port, const QString &connOpts) bool cbs_open_10352_5(const QString &db, const QString &user, const QString &password, const QString &host, int port, const QString &connOpts) { @@ -1640,6 +1648,24 @@ static void _call_emitter_notification_7365 (const qt_gsi::GenericMethod * /*dec } +// emitter void QSqlDriver::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QSqlDriver_Adaptor *)cls)->emitter_QSqlDriver_objectNameChanged_4567 (arg1); +} + + // bool QSqlDriver::open(const QString &db, const QString &user, const QString &password, const QString &host, int port, const QString &connOpts) static void _init_cbs_open_10352_5 (qt_gsi::GenericMethod *decl) @@ -2075,6 +2101,7 @@ static gsi::Methods methods_QSqlDriver_Adaptor () { methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QSqlDriver::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); methods += new qt_gsi::GenericMethod ("emit_notification", "@brief Emitter for signal void QSqlDriver::notification(const QString &name)\nCall this method to emit this signal.", false, &_init_emitter_notification_2025, &_call_emitter_notification_2025); methods += new qt_gsi::GenericMethod ("emit_notification_withData", "@brief Emitter for signal void QSqlDriver::notification(const QString &name, QSqlDriver::NotificationSource source, const QVariant &payload)\nCall this method to emit this signal.", false, &_init_emitter_notification_7365, &_call_emitter_notification_7365); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QSqlDriver::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("open", "@brief Virtual method bool QSqlDriver::open(const QString &db, const QString &user, const QString &password, const QString &host, int port, const QString &connOpts)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_open_10352_5, &_call_cbs_open_10352_5); methods += new qt_gsi::GenericMethod ("open", "@hide", false, &_init_cbs_open_10352_5, &_call_cbs_open_10352_5, &_set_callback_cbs_open_10352_5); methods += new qt_gsi::GenericMethod ("primaryIndex", "@brief Virtual method QSqlIndex QSqlDriver::primaryIndex(const QString &tableName)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_primaryIndex_c2025_0, &_call_cbs_primaryIndex_c2025_0); diff --git a/src/gsiqt/qt5/QtSql/gsiDeclQSqlQueryModel.cc b/src/gsiqt/qt5/QtSql/gsiDeclQSqlQueryModel.cc index d468312ac..7ecc3a7b1 100644 --- a/src/gsiqt/qt5/QtSql/gsiDeclQSqlQueryModel.cc +++ b/src/gsiqt/qt5/QtSql/gsiDeclQSqlQueryModel.cc @@ -461,11 +461,26 @@ static gsi::Methods methods_QSqlQueryModel () { methods += new qt_gsi::GenericMethod ("setHeaderData", "@brief Method bool QSqlQueryModel::setHeaderData(int section, Qt::Orientation orientation, const QVariant &value, int role)\nThis is a reimplementation of QAbstractItemModel::setHeaderData", false, &_init_f_setHeaderData_5242, &_call_f_setHeaderData_5242); methods += new qt_gsi::GenericMethod ("setQuery|query=", "@brief Method void QSqlQueryModel::setQuery(const QSqlQuery &query)\n", false, &_init_f_setQuery_2232, &_call_f_setQuery_2232); methods += new qt_gsi::GenericMethod ("setQuery", "@brief Method void QSqlQueryModel::setQuery(const QString &query, const QSqlDatabase &db)\n", false, &_init_f_setQuery_4404, &_call_f_setQuery_4404); + methods += gsi::qt_signal ("columnsAboutToBeInserted(const QModelIndex &, int, int)", "columnsAboutToBeInserted", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QSqlQueryModel::columnsAboutToBeInserted(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("columnsAboutToBeMoved(const QModelIndex &, int, int, const QModelIndex &, int)", "columnsAboutToBeMoved", gsi::arg("sourceParent"), gsi::arg("sourceStart"), gsi::arg("sourceEnd"), gsi::arg("destinationParent"), gsi::arg("destinationColumn"), "@brief Signal declaration for QSqlQueryModel::columnsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("columnsAboutToBeRemoved(const QModelIndex &, int, int)", "columnsAboutToBeRemoved", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QSqlQueryModel::columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("columnsInserted(const QModelIndex &, int, int)", "columnsInserted", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QSqlQueryModel::columnsInserted(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("columnsMoved(const QModelIndex &, int, int, const QModelIndex &, int)", "columnsMoved", gsi::arg("parent"), gsi::arg("start"), gsi::arg("end"), gsi::arg("destination"), gsi::arg("column"), "@brief Signal declaration for QSqlQueryModel::columnsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("columnsRemoved(const QModelIndex &, int, int)", "columnsRemoved", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QSqlQueryModel::columnsRemoved(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal & > ("dataChanged(const QModelIndex &, const QModelIndex &, const QVector &)", "dataChanged", gsi::arg("topLeft"), gsi::arg("bottomRight"), gsi::arg("roles"), "@brief Signal declaration for QSqlQueryModel::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector &roles)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QSqlQueryModel::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal::target_type &, int, int > ("headerDataChanged(Qt::Orientation, int, int)", "headerDataChanged", gsi::arg("orientation"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QSqlQueryModel::headerDataChanged(Qt::Orientation orientation, int first, int last)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal &, const qt_gsi::Converter::target_type & > ("layoutAboutToBeChanged(const QList &, QAbstractItemModel::LayoutChangeHint)", "layoutAboutToBeChanged", gsi::arg("parents"), gsi::arg("hint"), "@brief Signal declaration for QSqlQueryModel::layoutAboutToBeChanged(const QList &parents, QAbstractItemModel::LayoutChangeHint hint)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal &, const qt_gsi::Converter::target_type & > ("layoutChanged(const QList &, QAbstractItemModel::LayoutChangeHint)", "layoutChanged", gsi::arg("parents"), gsi::arg("hint"), "@brief Signal declaration for QSqlQueryModel::layoutChanged(const QList &parents, QAbstractItemModel::LayoutChangeHint hint)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("modelAboutToBeReset()", "modelAboutToBeReset", "@brief Signal declaration for QSqlQueryModel::modelAboutToBeReset()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("modelReset()", "modelReset", "@brief Signal declaration for QSqlQueryModel::modelReset()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QSqlQueryModel::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsAboutToBeInserted(const QModelIndex &, int, int)", "rowsAboutToBeInserted", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QSqlQueryModel::rowsAboutToBeInserted(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsAboutToBeMoved(const QModelIndex &, int, int, const QModelIndex &, int)", "rowsAboutToBeMoved", gsi::arg("sourceParent"), gsi::arg("sourceStart"), gsi::arg("sourceEnd"), gsi::arg("destinationParent"), gsi::arg("destinationRow"), "@brief Signal declaration for QSqlQueryModel::rowsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsAboutToBeRemoved(const QModelIndex &, int, int)", "rowsAboutToBeRemoved", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QSqlQueryModel::rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsInserted(const QModelIndex &, int, int)", "rowsInserted", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QSqlQueryModel::rowsInserted(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsMoved(const QModelIndex &, int, int, const QModelIndex &, int)", "rowsMoved", gsi::arg("parent"), gsi::arg("start"), gsi::arg("end"), gsi::arg("destination"), gsi::arg("row"), "@brief Signal declaration for QSqlQueryModel::rowsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsRemoved(const QModelIndex &, int, int)", "rowsRemoved", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QSqlQueryModel::rowsRemoved(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QSqlQueryModel::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QSqlQueryModel::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -710,6 +725,64 @@ public: } } + // [emitter impl] void QSqlQueryModel::columnsAboutToBeInserted(const QModelIndex &parent, int first, int last) + void emitter_QSqlQueryModel_columnsAboutToBeInserted_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QSqlQueryModel::columnsAboutToBeInserted(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QSqlQueryModel::columnsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn) + void emitter_QSqlQueryModel_columnsAboutToBeMoved_10318(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn) + { + __SUPPRESS_UNUSED_WARNING (sourceParent); + __SUPPRESS_UNUSED_WARNING (sourceStart); + __SUPPRESS_UNUSED_WARNING (sourceEnd); + __SUPPRESS_UNUSED_WARNING (destinationParent); + __SUPPRESS_UNUSED_WARNING (destinationColumn); + throw tl::Exception ("Can't emit private signal 'void QSqlQueryModel::columnsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn)'"); + } + + // [emitter impl] void QSqlQueryModel::columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last) + void emitter_QSqlQueryModel_columnsAboutToBeRemoved_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QSqlQueryModel::columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QSqlQueryModel::columnsInserted(const QModelIndex &parent, int first, int last) + void emitter_QSqlQueryModel_columnsInserted_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QSqlQueryModel::columnsInserted(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QSqlQueryModel::columnsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column) + void emitter_QSqlQueryModel_columnsMoved_10318(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (start); + __SUPPRESS_UNUSED_WARNING (end); + __SUPPRESS_UNUSED_WARNING (destination); + __SUPPRESS_UNUSED_WARNING (column); + throw tl::Exception ("Can't emit private signal 'void QSqlQueryModel::columnsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column)'"); + } + + // [emitter impl] void QSqlQueryModel::columnsRemoved(const QModelIndex &parent, int first, int last) + void emitter_QSqlQueryModel_columnsRemoved_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QSqlQueryModel::columnsRemoved(const QModelIndex &parent, int first, int last)'"); + } + // [adaptor impl] QVariant QSqlQueryModel::data(const QModelIndex &item, int role) QVariant cbs_data_c3054_1(const QModelIndex &item, int role) const { @@ -950,6 +1023,18 @@ public: } } + // [emitter impl] void QSqlQueryModel::modelAboutToBeReset() + void emitter_QSqlQueryModel_modelAboutToBeReset_3767() + { + throw tl::Exception ("Can't emit private signal 'void QSqlQueryModel::modelAboutToBeReset()'"); + } + + // [emitter impl] void QSqlQueryModel::modelReset() + void emitter_QSqlQueryModel_modelReset_3767() + { + throw tl::Exception ("Can't emit private signal 'void QSqlQueryModel::modelReset()'"); + } + // [adaptor impl] bool QSqlQueryModel::moveColumns(const QModelIndex &sourceParent, int sourceColumn, int count, const QModelIndex &destinationParent, int destinationChild) bool cbs_moveColumns_6659_0(const QModelIndex &sourceParent, int sourceColumn, int count, const QModelIndex &destinationParent, int destinationChild) { @@ -980,6 +1065,13 @@ public: } } + // [emitter impl] void QSqlQueryModel::objectNameChanged(const QString &objectName) + void emitter_QSqlQueryModel_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QSqlQueryModel::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] bool QSqlQueryModel::removeColumns(int column, int count, const QModelIndex &parent) bool cbs_removeColumns_3713_1(int column, int count, const QModelIndex &parent) { @@ -1055,6 +1147,64 @@ public: } } + // [emitter impl] void QSqlQueryModel::rowsAboutToBeInserted(const QModelIndex &parent, int first, int last) + void emitter_QSqlQueryModel_rowsAboutToBeInserted_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QSqlQueryModel::rowsAboutToBeInserted(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QSqlQueryModel::rowsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow) + void emitter_QSqlQueryModel_rowsAboutToBeMoved_10318(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow) + { + __SUPPRESS_UNUSED_WARNING (sourceParent); + __SUPPRESS_UNUSED_WARNING (sourceStart); + __SUPPRESS_UNUSED_WARNING (sourceEnd); + __SUPPRESS_UNUSED_WARNING (destinationParent); + __SUPPRESS_UNUSED_WARNING (destinationRow); + throw tl::Exception ("Can't emit private signal 'void QSqlQueryModel::rowsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow)'"); + } + + // [emitter impl] void QSqlQueryModel::rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last) + void emitter_QSqlQueryModel_rowsAboutToBeRemoved_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QSqlQueryModel::rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QSqlQueryModel::rowsInserted(const QModelIndex &parent, int first, int last) + void emitter_QSqlQueryModel_rowsInserted_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QSqlQueryModel::rowsInserted(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QSqlQueryModel::rowsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row) + void emitter_QSqlQueryModel_rowsMoved_10318(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (start); + __SUPPRESS_UNUSED_WARNING (end); + __SUPPRESS_UNUSED_WARNING (destination); + __SUPPRESS_UNUSED_WARNING (row); + throw tl::Exception ("Can't emit private signal 'void QSqlQueryModel::rowsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row)'"); + } + + // [emitter impl] void QSqlQueryModel::rowsRemoved(const QModelIndex &parent, int first, int last) + void emitter_QSqlQueryModel_rowsRemoved_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QSqlQueryModel::rowsRemoved(const QModelIndex &parent, int first, int last)'"); + } + // [adaptor impl] bool QSqlQueryModel::setData(const QModelIndex &index, const QVariant &value, int role) bool cbs_setData_5065_1(const QModelIndex &index, const QVariant &value, int role) { @@ -1710,6 +1860,162 @@ static void _set_callback_cbs_columnCount_c2395_1 (void *cls, const gsi::Callbac } +// emitter void QSqlQueryModel::columnsAboutToBeInserted(const QModelIndex &parent, int first, int last) + +static void _init_emitter_columnsAboutToBeInserted_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_columnsAboutToBeInserted_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QSqlQueryModel_Adaptor *)cls)->emitter_QSqlQueryModel_columnsAboutToBeInserted_7372 (arg1, arg2, arg3); +} + + +// emitter void QSqlQueryModel::columnsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn) + +static void _init_emitter_columnsAboutToBeMoved_10318 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("sourceParent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("sourceStart"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("sourceEnd"); + decl->add_arg (argspec_2); + static gsi::ArgSpecBase argspec_3 ("destinationParent"); + decl->add_arg (argspec_3); + static gsi::ArgSpecBase argspec_4 ("destinationColumn"); + decl->add_arg (argspec_4); + decl->set_return (); +} + +static void _call_emitter_columnsAboutToBeMoved_10318 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + const QModelIndex &arg4 = gsi::arg_reader() (args, heap); + int arg5 = gsi::arg_reader() (args, heap); + ((QSqlQueryModel_Adaptor *)cls)->emitter_QSqlQueryModel_columnsAboutToBeMoved_10318 (arg1, arg2, arg3, arg4, arg5); +} + + +// emitter void QSqlQueryModel::columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last) + +static void _init_emitter_columnsAboutToBeRemoved_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_columnsAboutToBeRemoved_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QSqlQueryModel_Adaptor *)cls)->emitter_QSqlQueryModel_columnsAboutToBeRemoved_7372 (arg1, arg2, arg3); +} + + +// emitter void QSqlQueryModel::columnsInserted(const QModelIndex &parent, int first, int last) + +static void _init_emitter_columnsInserted_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_columnsInserted_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QSqlQueryModel_Adaptor *)cls)->emitter_QSqlQueryModel_columnsInserted_7372 (arg1, arg2, arg3); +} + + +// emitter void QSqlQueryModel::columnsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column) + +static void _init_emitter_columnsMoved_10318 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("start"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("end"); + decl->add_arg (argspec_2); + static gsi::ArgSpecBase argspec_3 ("destination"); + decl->add_arg (argspec_3); + static gsi::ArgSpecBase argspec_4 ("column"); + decl->add_arg (argspec_4); + decl->set_return (); +} + +static void _call_emitter_columnsMoved_10318 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + const QModelIndex &arg4 = gsi::arg_reader() (args, heap); + int arg5 = gsi::arg_reader() (args, heap); + ((QSqlQueryModel_Adaptor *)cls)->emitter_QSqlQueryModel_columnsMoved_10318 (arg1, arg2, arg3, arg4, arg5); +} + + +// emitter void QSqlQueryModel::columnsRemoved(const QModelIndex &parent, int first, int last) + +static void _init_emitter_columnsRemoved_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_columnsRemoved_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QSqlQueryModel_Adaptor *)cls)->emitter_QSqlQueryModel_columnsRemoved_7372 (arg1, arg2, arg3); +} + + // exposed QModelIndex QSqlQueryModel::createIndex(int row, int column, void *data) static void _init_fp_createIndex_c2374 (qt_gsi::GenericMethod *decl) @@ -2482,6 +2788,34 @@ static void _set_callback_cbs_mimeTypes_c0_0 (void *cls, const gsi::Callback &cb } +// emitter void QSqlQueryModel::modelAboutToBeReset() + +static void _init_emitter_modelAboutToBeReset_3767 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_emitter_modelAboutToBeReset_3767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + ((QSqlQueryModel_Adaptor *)cls)->emitter_QSqlQueryModel_modelAboutToBeReset_3767 (); +} + + +// emitter void QSqlQueryModel::modelReset() + +static void _init_emitter_modelReset_3767 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_emitter_modelReset_3767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + ((QSqlQueryModel_Adaptor *)cls)->emitter_QSqlQueryModel_modelReset_3767 (); +} + + // bool QSqlQueryModel::moveColumns(const QModelIndex &sourceParent, int sourceColumn, int count, const QModelIndex &destinationParent, int destinationChild) static void _init_cbs_moveColumns_6659_0 (qt_gsi::GenericMethod *decl) @@ -2552,6 +2886,24 @@ static void _set_callback_cbs_moveRows_6659_0 (void *cls, const gsi::Callback &c } +// emitter void QSqlQueryModel::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QSqlQueryModel_Adaptor *)cls)->emitter_QSqlQueryModel_objectNameChanged_4567 (arg1); +} + + // exposed QList QSqlQueryModel::persistentIndexList() static void _init_fp_persistentIndexList_c0 (qt_gsi::GenericMethod *decl) @@ -2739,6 +3091,162 @@ static void _set_callback_cbs_rowCount_c2395_1 (void *cls, const gsi::Callback & } +// emitter void QSqlQueryModel::rowsAboutToBeInserted(const QModelIndex &parent, int first, int last) + +static void _init_emitter_rowsAboutToBeInserted_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_rowsAboutToBeInserted_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QSqlQueryModel_Adaptor *)cls)->emitter_QSqlQueryModel_rowsAboutToBeInserted_7372 (arg1, arg2, arg3); +} + + +// emitter void QSqlQueryModel::rowsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow) + +static void _init_emitter_rowsAboutToBeMoved_10318 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("sourceParent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("sourceStart"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("sourceEnd"); + decl->add_arg (argspec_2); + static gsi::ArgSpecBase argspec_3 ("destinationParent"); + decl->add_arg (argspec_3); + static gsi::ArgSpecBase argspec_4 ("destinationRow"); + decl->add_arg (argspec_4); + decl->set_return (); +} + +static void _call_emitter_rowsAboutToBeMoved_10318 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + const QModelIndex &arg4 = gsi::arg_reader() (args, heap); + int arg5 = gsi::arg_reader() (args, heap); + ((QSqlQueryModel_Adaptor *)cls)->emitter_QSqlQueryModel_rowsAboutToBeMoved_10318 (arg1, arg2, arg3, arg4, arg5); +} + + +// emitter void QSqlQueryModel::rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last) + +static void _init_emitter_rowsAboutToBeRemoved_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_rowsAboutToBeRemoved_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QSqlQueryModel_Adaptor *)cls)->emitter_QSqlQueryModel_rowsAboutToBeRemoved_7372 (arg1, arg2, arg3); +} + + +// emitter void QSqlQueryModel::rowsInserted(const QModelIndex &parent, int first, int last) + +static void _init_emitter_rowsInserted_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_rowsInserted_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QSqlQueryModel_Adaptor *)cls)->emitter_QSqlQueryModel_rowsInserted_7372 (arg1, arg2, arg3); +} + + +// emitter void QSqlQueryModel::rowsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row) + +static void _init_emitter_rowsMoved_10318 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("start"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("end"); + decl->add_arg (argspec_2); + static gsi::ArgSpecBase argspec_3 ("destination"); + decl->add_arg (argspec_3); + static gsi::ArgSpecBase argspec_4 ("row"); + decl->add_arg (argspec_4); + decl->set_return (); +} + +static void _call_emitter_rowsMoved_10318 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + const QModelIndex &arg4 = gsi::arg_reader() (args, heap); + int arg5 = gsi::arg_reader() (args, heap); + ((QSqlQueryModel_Adaptor *)cls)->emitter_QSqlQueryModel_rowsMoved_10318 (arg1, arg2, arg3, arg4, arg5); +} + + +// emitter void QSqlQueryModel::rowsRemoved(const QModelIndex &parent, int first, int last) + +static void _init_emitter_rowsRemoved_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_rowsRemoved_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QSqlQueryModel_Adaptor *)cls)->emitter_QSqlQueryModel_rowsRemoved_7372 (arg1, arg2, arg3); +} + + // exposed QObject *QSqlQueryModel::sender() static void _init_fp_sender_c0 (qt_gsi::GenericMethod *decl) @@ -3062,6 +3570,12 @@ static gsi::Methods methods_QSqlQueryModel_Adaptor () { methods += new qt_gsi::GenericMethod ("clear", "@hide", false, &_init_cbs_clear_0_0, &_call_cbs_clear_0_0, &_set_callback_cbs_clear_0_0); methods += new qt_gsi::GenericMethod ("columnCount", "@brief Virtual method int QSqlQueryModel::columnCount(const QModelIndex &parent)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_columnCount_c2395_1, &_call_cbs_columnCount_c2395_1); methods += new qt_gsi::GenericMethod ("columnCount", "@hide", true, &_init_cbs_columnCount_c2395_1, &_call_cbs_columnCount_c2395_1, &_set_callback_cbs_columnCount_c2395_1); + methods += new qt_gsi::GenericMethod ("emit_columnsAboutToBeInserted", "@brief Emitter for signal void QSqlQueryModel::columnsAboutToBeInserted(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_columnsAboutToBeInserted_7372, &_call_emitter_columnsAboutToBeInserted_7372); + methods += new qt_gsi::GenericMethod ("emit_columnsAboutToBeMoved", "@brief Emitter for signal void QSqlQueryModel::columnsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn)\nCall this method to emit this signal.", false, &_init_emitter_columnsAboutToBeMoved_10318, &_call_emitter_columnsAboutToBeMoved_10318); + methods += new qt_gsi::GenericMethod ("emit_columnsAboutToBeRemoved", "@brief Emitter for signal void QSqlQueryModel::columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_columnsAboutToBeRemoved_7372, &_call_emitter_columnsAboutToBeRemoved_7372); + methods += new qt_gsi::GenericMethod ("emit_columnsInserted", "@brief Emitter for signal void QSqlQueryModel::columnsInserted(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_columnsInserted_7372, &_call_emitter_columnsInserted_7372); + methods += new qt_gsi::GenericMethod ("emit_columnsMoved", "@brief Emitter for signal void QSqlQueryModel::columnsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column)\nCall this method to emit this signal.", false, &_init_emitter_columnsMoved_10318, &_call_emitter_columnsMoved_10318); + methods += new qt_gsi::GenericMethod ("emit_columnsRemoved", "@brief Emitter for signal void QSqlQueryModel::columnsRemoved(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_columnsRemoved_7372, &_call_emitter_columnsRemoved_7372); methods += new qt_gsi::GenericMethod ("*createIndex", "@brief Method QModelIndex QSqlQueryModel::createIndex(int row, int column, void *data)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_createIndex_c2374, &_call_fp_createIndex_c2374); methods += new qt_gsi::GenericMethod ("*createIndex", "@brief Method QModelIndex QSqlQueryModel::createIndex(int row, int column, quintptr id)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_createIndex_c2657, &_call_fp_createIndex_c2657); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QSqlQueryModel::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); @@ -3113,10 +3627,13 @@ static gsi::Methods methods_QSqlQueryModel_Adaptor () { methods += new qt_gsi::GenericMethod ("mimeData", "@hide", true, &_init_cbs_mimeData_c3010_0, &_call_cbs_mimeData_c3010_0, &_set_callback_cbs_mimeData_c3010_0); methods += new qt_gsi::GenericMethod ("mimeTypes", "@brief Virtual method QStringList QSqlQueryModel::mimeTypes()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_mimeTypes_c0_0, &_call_cbs_mimeTypes_c0_0); methods += new qt_gsi::GenericMethod ("mimeTypes", "@hide", true, &_init_cbs_mimeTypes_c0_0, &_call_cbs_mimeTypes_c0_0, &_set_callback_cbs_mimeTypes_c0_0); + methods += new qt_gsi::GenericMethod ("emit_modelAboutToBeReset", "@brief Emitter for signal void QSqlQueryModel::modelAboutToBeReset()\nCall this method to emit this signal.", false, &_init_emitter_modelAboutToBeReset_3767, &_call_emitter_modelAboutToBeReset_3767); + methods += new qt_gsi::GenericMethod ("emit_modelReset", "@brief Emitter for signal void QSqlQueryModel::modelReset()\nCall this method to emit this signal.", false, &_init_emitter_modelReset_3767, &_call_emitter_modelReset_3767); methods += new qt_gsi::GenericMethod ("moveColumns", "@brief Virtual method bool QSqlQueryModel::moveColumns(const QModelIndex &sourceParent, int sourceColumn, int count, const QModelIndex &destinationParent, int destinationChild)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_moveColumns_6659_0, &_call_cbs_moveColumns_6659_0); methods += new qt_gsi::GenericMethod ("moveColumns", "@hide", false, &_init_cbs_moveColumns_6659_0, &_call_cbs_moveColumns_6659_0, &_set_callback_cbs_moveColumns_6659_0); methods += new qt_gsi::GenericMethod ("moveRows", "@brief Virtual method bool QSqlQueryModel::moveRows(const QModelIndex &sourceParent, int sourceRow, int count, const QModelIndex &destinationParent, int destinationChild)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_moveRows_6659_0, &_call_cbs_moveRows_6659_0); methods += new qt_gsi::GenericMethod ("moveRows", "@hide", false, &_init_cbs_moveRows_6659_0, &_call_cbs_moveRows_6659_0, &_set_callback_cbs_moveRows_6659_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QSqlQueryModel::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*persistentIndexList", "@brief Method QList QSqlQueryModel::persistentIndexList()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_persistentIndexList_c0, &_call_fp_persistentIndexList_c0); methods += new qt_gsi::GenericMethod ("*queryChange", "@brief Virtual method void QSqlQueryModel::queryChange()\nThis method can be reimplemented in a derived class.", false, &_init_cbs_queryChange_0_0, &_call_cbs_queryChange_0_0); methods += new qt_gsi::GenericMethod ("*queryChange", "@hide", false, &_init_cbs_queryChange_0_0, &_call_cbs_queryChange_0_0, &_set_callback_cbs_queryChange_0_0); @@ -3132,6 +3649,12 @@ static gsi::Methods methods_QSqlQueryModel_Adaptor () { methods += new qt_gsi::GenericMethod ("roleNames", "@hide", true, &_init_cbs_roleNames_c0_0, &_call_cbs_roleNames_c0_0, &_set_callback_cbs_roleNames_c0_0); methods += new qt_gsi::GenericMethod ("rowCount", "@brief Virtual method int QSqlQueryModel::rowCount(const QModelIndex &parent)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_rowCount_c2395_1, &_call_cbs_rowCount_c2395_1); methods += new qt_gsi::GenericMethod ("rowCount", "@hide", true, &_init_cbs_rowCount_c2395_1, &_call_cbs_rowCount_c2395_1, &_set_callback_cbs_rowCount_c2395_1); + methods += new qt_gsi::GenericMethod ("emit_rowsAboutToBeInserted", "@brief Emitter for signal void QSqlQueryModel::rowsAboutToBeInserted(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_rowsAboutToBeInserted_7372, &_call_emitter_rowsAboutToBeInserted_7372); + methods += new qt_gsi::GenericMethod ("emit_rowsAboutToBeMoved", "@brief Emitter for signal void QSqlQueryModel::rowsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow)\nCall this method to emit this signal.", false, &_init_emitter_rowsAboutToBeMoved_10318, &_call_emitter_rowsAboutToBeMoved_10318); + methods += new qt_gsi::GenericMethod ("emit_rowsAboutToBeRemoved", "@brief Emitter for signal void QSqlQueryModel::rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_rowsAboutToBeRemoved_7372, &_call_emitter_rowsAboutToBeRemoved_7372); + methods += new qt_gsi::GenericMethod ("emit_rowsInserted", "@brief Emitter for signal void QSqlQueryModel::rowsInserted(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_rowsInserted_7372, &_call_emitter_rowsInserted_7372); + methods += new qt_gsi::GenericMethod ("emit_rowsMoved", "@brief Emitter for signal void QSqlQueryModel::rowsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row)\nCall this method to emit this signal.", false, &_init_emitter_rowsMoved_10318, &_call_emitter_rowsMoved_10318); + methods += new qt_gsi::GenericMethod ("emit_rowsRemoved", "@brief Emitter for signal void QSqlQueryModel::rowsRemoved(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_rowsRemoved_7372, &_call_emitter_rowsRemoved_7372); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QSqlQueryModel::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QSqlQueryModel::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); methods += new qt_gsi::GenericMethod ("setData", "@brief Virtual method bool QSqlQueryModel::setData(const QModelIndex &index, const QVariant &value, int role)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_setData_5065_1, &_call_cbs_setData_5065_1); diff --git a/src/gsiqt/qt5/QtSql/gsiDeclQSqlRelationalTableModel.cc b/src/gsiqt/qt5/QtSql/gsiDeclQSqlRelationalTableModel.cc index 53b82dd52..0f6e17a10 100644 --- a/src/gsiqt/qt5/QtSql/gsiDeclQSqlRelationalTableModel.cc +++ b/src/gsiqt/qt5/QtSql/gsiDeclQSqlRelationalTableModel.cc @@ -361,12 +361,27 @@ static gsi::Methods methods_QSqlRelationalTableModel () { methods += gsi::qt_signal ("beforeDelete(int)", "beforeDelete", gsi::arg("row"), "@brief Signal declaration for QSqlRelationalTableModel::beforeDelete(int row)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("beforeInsert(QSqlRecord &)", "beforeInsert", gsi::arg("record"), "@brief Signal declaration for QSqlRelationalTableModel::beforeInsert(QSqlRecord &record)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("beforeUpdate(int, QSqlRecord &)", "beforeUpdate", gsi::arg("row"), gsi::arg("record"), "@brief Signal declaration for QSqlRelationalTableModel::beforeUpdate(int row, QSqlRecord &record)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("columnsAboutToBeInserted(const QModelIndex &, int, int)", "columnsAboutToBeInserted", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QSqlRelationalTableModel::columnsAboutToBeInserted(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("columnsAboutToBeMoved(const QModelIndex &, int, int, const QModelIndex &, int)", "columnsAboutToBeMoved", gsi::arg("sourceParent"), gsi::arg("sourceStart"), gsi::arg("sourceEnd"), gsi::arg("destinationParent"), gsi::arg("destinationColumn"), "@brief Signal declaration for QSqlRelationalTableModel::columnsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("columnsAboutToBeRemoved(const QModelIndex &, int, int)", "columnsAboutToBeRemoved", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QSqlRelationalTableModel::columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("columnsInserted(const QModelIndex &, int, int)", "columnsInserted", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QSqlRelationalTableModel::columnsInserted(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("columnsMoved(const QModelIndex &, int, int, const QModelIndex &, int)", "columnsMoved", gsi::arg("parent"), gsi::arg("start"), gsi::arg("end"), gsi::arg("destination"), gsi::arg("column"), "@brief Signal declaration for QSqlRelationalTableModel::columnsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("columnsRemoved(const QModelIndex &, int, int)", "columnsRemoved", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QSqlRelationalTableModel::columnsRemoved(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal & > ("dataChanged(const QModelIndex &, const QModelIndex &, const QVector &)", "dataChanged", gsi::arg("topLeft"), gsi::arg("bottomRight"), gsi::arg("roles"), "@brief Signal declaration for QSqlRelationalTableModel::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector &roles)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QSqlRelationalTableModel::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal::target_type &, int, int > ("headerDataChanged(Qt::Orientation, int, int)", "headerDataChanged", gsi::arg("orientation"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QSqlRelationalTableModel::headerDataChanged(Qt::Orientation orientation, int first, int last)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal &, const qt_gsi::Converter::target_type & > ("layoutAboutToBeChanged(const QList &, QAbstractItemModel::LayoutChangeHint)", "layoutAboutToBeChanged", gsi::arg("parents"), gsi::arg("hint"), "@brief Signal declaration for QSqlRelationalTableModel::layoutAboutToBeChanged(const QList &parents, QAbstractItemModel::LayoutChangeHint hint)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal &, const qt_gsi::Converter::target_type & > ("layoutChanged(const QList &, QAbstractItemModel::LayoutChangeHint)", "layoutChanged", gsi::arg("parents"), gsi::arg("hint"), "@brief Signal declaration for QSqlRelationalTableModel::layoutChanged(const QList &parents, QAbstractItemModel::LayoutChangeHint hint)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("modelAboutToBeReset()", "modelAboutToBeReset", "@brief Signal declaration for QSqlRelationalTableModel::modelAboutToBeReset()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("modelReset()", "modelReset", "@brief Signal declaration for QSqlRelationalTableModel::modelReset()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QSqlRelationalTableModel::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("primeInsert(int, QSqlRecord &)", "primeInsert", gsi::arg("row"), gsi::arg("record"), "@brief Signal declaration for QSqlRelationalTableModel::primeInsert(int row, QSqlRecord &record)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsAboutToBeInserted(const QModelIndex &, int, int)", "rowsAboutToBeInserted", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QSqlRelationalTableModel::rowsAboutToBeInserted(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsAboutToBeMoved(const QModelIndex &, int, int, const QModelIndex &, int)", "rowsAboutToBeMoved", gsi::arg("sourceParent"), gsi::arg("sourceStart"), gsi::arg("sourceEnd"), gsi::arg("destinationParent"), gsi::arg("destinationRow"), "@brief Signal declaration for QSqlRelationalTableModel::rowsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsAboutToBeRemoved(const QModelIndex &, int, int)", "rowsAboutToBeRemoved", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QSqlRelationalTableModel::rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsInserted(const QModelIndex &, int, int)", "rowsInserted", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QSqlRelationalTableModel::rowsInserted(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsMoved(const QModelIndex &, int, int, const QModelIndex &, int)", "rowsMoved", gsi::arg("parent"), gsi::arg("start"), gsi::arg("end"), gsi::arg("destination"), gsi::arg("row"), "@brief Signal declaration for QSqlRelationalTableModel::rowsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsRemoved(const QModelIndex &, int, int)", "rowsRemoved", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QSqlRelationalTableModel::rowsRemoved(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QSqlRelationalTableModel::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QSqlRelationalTableModel::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -650,6 +665,64 @@ public: } } + // [emitter impl] void QSqlRelationalTableModel::columnsAboutToBeInserted(const QModelIndex &parent, int first, int last) + void emitter_QSqlRelationalTableModel_columnsAboutToBeInserted_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QSqlRelationalTableModel::columnsAboutToBeInserted(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QSqlRelationalTableModel::columnsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn) + void emitter_QSqlRelationalTableModel_columnsAboutToBeMoved_10318(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn) + { + __SUPPRESS_UNUSED_WARNING (sourceParent); + __SUPPRESS_UNUSED_WARNING (sourceStart); + __SUPPRESS_UNUSED_WARNING (sourceEnd); + __SUPPRESS_UNUSED_WARNING (destinationParent); + __SUPPRESS_UNUSED_WARNING (destinationColumn); + throw tl::Exception ("Can't emit private signal 'void QSqlRelationalTableModel::columnsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn)'"); + } + + // [emitter impl] void QSqlRelationalTableModel::columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last) + void emitter_QSqlRelationalTableModel_columnsAboutToBeRemoved_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QSqlRelationalTableModel::columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QSqlRelationalTableModel::columnsInserted(const QModelIndex &parent, int first, int last) + void emitter_QSqlRelationalTableModel_columnsInserted_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QSqlRelationalTableModel::columnsInserted(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QSqlRelationalTableModel::columnsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column) + void emitter_QSqlRelationalTableModel_columnsMoved_10318(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (start); + __SUPPRESS_UNUSED_WARNING (end); + __SUPPRESS_UNUSED_WARNING (destination); + __SUPPRESS_UNUSED_WARNING (column); + throw tl::Exception ("Can't emit private signal 'void QSqlRelationalTableModel::columnsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column)'"); + } + + // [emitter impl] void QSqlRelationalTableModel::columnsRemoved(const QModelIndex &parent, int first, int last) + void emitter_QSqlRelationalTableModel_columnsRemoved_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QSqlRelationalTableModel::columnsRemoved(const QModelIndex &parent, int first, int last)'"); + } + // [adaptor impl] QVariant QSqlRelationalTableModel::data(const QModelIndex &item, int role) QVariant cbs_data_c3054_1(const QModelIndex &item, int role) const { @@ -890,6 +963,18 @@ public: } } + // [emitter impl] void QSqlRelationalTableModel::modelAboutToBeReset() + void emitter_QSqlRelationalTableModel_modelAboutToBeReset_3767() + { + throw tl::Exception ("Can't emit private signal 'void QSqlRelationalTableModel::modelAboutToBeReset()'"); + } + + // [emitter impl] void QSqlRelationalTableModel::modelReset() + void emitter_QSqlRelationalTableModel_modelReset_3767() + { + throw tl::Exception ("Can't emit private signal 'void QSqlRelationalTableModel::modelReset()'"); + } + // [adaptor impl] bool QSqlRelationalTableModel::moveColumns(const QModelIndex &sourceParent, int sourceColumn, int count, const QModelIndex &destinationParent, int destinationChild) bool cbs_moveColumns_6659_0(const QModelIndex &sourceParent, int sourceColumn, int count, const QModelIndex &destinationParent, int destinationChild) { @@ -920,6 +1005,13 @@ public: } } + // [emitter impl] void QSqlRelationalTableModel::objectNameChanged(const QString &objectName) + void emitter_QSqlRelationalTableModel_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QSqlRelationalTableModel::objectNameChanged(const QString &objectName)'"); + } + // [emitter impl] void QSqlRelationalTableModel::primeInsert(int row, QSqlRecord &record) void emitter_QSqlRelationalTableModel_primeInsert_2269(int row, QSqlRecord &record) { @@ -1031,6 +1123,64 @@ public: } } + // [emitter impl] void QSqlRelationalTableModel::rowsAboutToBeInserted(const QModelIndex &parent, int first, int last) + void emitter_QSqlRelationalTableModel_rowsAboutToBeInserted_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QSqlRelationalTableModel::rowsAboutToBeInserted(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QSqlRelationalTableModel::rowsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow) + void emitter_QSqlRelationalTableModel_rowsAboutToBeMoved_10318(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow) + { + __SUPPRESS_UNUSED_WARNING (sourceParent); + __SUPPRESS_UNUSED_WARNING (sourceStart); + __SUPPRESS_UNUSED_WARNING (sourceEnd); + __SUPPRESS_UNUSED_WARNING (destinationParent); + __SUPPRESS_UNUSED_WARNING (destinationRow); + throw tl::Exception ("Can't emit private signal 'void QSqlRelationalTableModel::rowsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow)'"); + } + + // [emitter impl] void QSqlRelationalTableModel::rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last) + void emitter_QSqlRelationalTableModel_rowsAboutToBeRemoved_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QSqlRelationalTableModel::rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QSqlRelationalTableModel::rowsInserted(const QModelIndex &parent, int first, int last) + void emitter_QSqlRelationalTableModel_rowsInserted_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QSqlRelationalTableModel::rowsInserted(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QSqlRelationalTableModel::rowsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row) + void emitter_QSqlRelationalTableModel_rowsMoved_10318(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (start); + __SUPPRESS_UNUSED_WARNING (end); + __SUPPRESS_UNUSED_WARNING (destination); + __SUPPRESS_UNUSED_WARNING (row); + throw tl::Exception ("Can't emit private signal 'void QSqlRelationalTableModel::rowsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row)'"); + } + + // [emitter impl] void QSqlRelationalTableModel::rowsRemoved(const QModelIndex &parent, int first, int last) + void emitter_QSqlRelationalTableModel_rowsRemoved_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QSqlRelationalTableModel::rowsRemoved(const QModelIndex &parent, int first, int last)'"); + } + // [adaptor impl] bool QSqlRelationalTableModel::select() bool cbs_select_0_0() { @@ -1940,6 +2090,162 @@ static void _set_callback_cbs_columnCount_c2395_1 (void *cls, const gsi::Callbac } +// emitter void QSqlRelationalTableModel::columnsAboutToBeInserted(const QModelIndex &parent, int first, int last) + +static void _init_emitter_columnsAboutToBeInserted_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_columnsAboutToBeInserted_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QSqlRelationalTableModel_Adaptor *)cls)->emitter_QSqlRelationalTableModel_columnsAboutToBeInserted_7372 (arg1, arg2, arg3); +} + + +// emitter void QSqlRelationalTableModel::columnsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn) + +static void _init_emitter_columnsAboutToBeMoved_10318 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("sourceParent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("sourceStart"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("sourceEnd"); + decl->add_arg (argspec_2); + static gsi::ArgSpecBase argspec_3 ("destinationParent"); + decl->add_arg (argspec_3); + static gsi::ArgSpecBase argspec_4 ("destinationColumn"); + decl->add_arg (argspec_4); + decl->set_return (); +} + +static void _call_emitter_columnsAboutToBeMoved_10318 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + const QModelIndex &arg4 = gsi::arg_reader() (args, heap); + int arg5 = gsi::arg_reader() (args, heap); + ((QSqlRelationalTableModel_Adaptor *)cls)->emitter_QSqlRelationalTableModel_columnsAboutToBeMoved_10318 (arg1, arg2, arg3, arg4, arg5); +} + + +// emitter void QSqlRelationalTableModel::columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last) + +static void _init_emitter_columnsAboutToBeRemoved_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_columnsAboutToBeRemoved_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QSqlRelationalTableModel_Adaptor *)cls)->emitter_QSqlRelationalTableModel_columnsAboutToBeRemoved_7372 (arg1, arg2, arg3); +} + + +// emitter void QSqlRelationalTableModel::columnsInserted(const QModelIndex &parent, int first, int last) + +static void _init_emitter_columnsInserted_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_columnsInserted_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QSqlRelationalTableModel_Adaptor *)cls)->emitter_QSqlRelationalTableModel_columnsInserted_7372 (arg1, arg2, arg3); +} + + +// emitter void QSqlRelationalTableModel::columnsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column) + +static void _init_emitter_columnsMoved_10318 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("start"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("end"); + decl->add_arg (argspec_2); + static gsi::ArgSpecBase argspec_3 ("destination"); + decl->add_arg (argspec_3); + static gsi::ArgSpecBase argspec_4 ("column"); + decl->add_arg (argspec_4); + decl->set_return (); +} + +static void _call_emitter_columnsMoved_10318 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + const QModelIndex &arg4 = gsi::arg_reader() (args, heap); + int arg5 = gsi::arg_reader() (args, heap); + ((QSqlRelationalTableModel_Adaptor *)cls)->emitter_QSqlRelationalTableModel_columnsMoved_10318 (arg1, arg2, arg3, arg4, arg5); +} + + +// emitter void QSqlRelationalTableModel::columnsRemoved(const QModelIndex &parent, int first, int last) + +static void _init_emitter_columnsRemoved_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_columnsRemoved_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QSqlRelationalTableModel_Adaptor *)cls)->emitter_QSqlRelationalTableModel_columnsRemoved_7372 (arg1, arg2, arg3); +} + + // exposed QModelIndex QSqlRelationalTableModel::createIndex(int row, int column, void *data) static void _init_fp_createIndex_c2374 (qt_gsi::GenericMethod *decl) @@ -2758,6 +3064,34 @@ static void _set_callback_cbs_mimeTypes_c0_0 (void *cls, const gsi::Callback &cb } +// emitter void QSqlRelationalTableModel::modelAboutToBeReset() + +static void _init_emitter_modelAboutToBeReset_3767 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_emitter_modelAboutToBeReset_3767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + ((QSqlRelationalTableModel_Adaptor *)cls)->emitter_QSqlRelationalTableModel_modelAboutToBeReset_3767 (); +} + + +// emitter void QSqlRelationalTableModel::modelReset() + +static void _init_emitter_modelReset_3767 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_emitter_modelReset_3767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + ((QSqlRelationalTableModel_Adaptor *)cls)->emitter_QSqlRelationalTableModel_modelReset_3767 (); +} + + // bool QSqlRelationalTableModel::moveColumns(const QModelIndex &sourceParent, int sourceColumn, int count, const QModelIndex &destinationParent, int destinationChild) static void _init_cbs_moveColumns_6659_0 (qt_gsi::GenericMethod *decl) @@ -2828,6 +3162,24 @@ static void _set_callback_cbs_moveRows_6659_0 (void *cls, const gsi::Callback &c } +// emitter void QSqlRelationalTableModel::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QSqlRelationalTableModel_Adaptor *)cls)->emitter_QSqlRelationalTableModel_objectNameChanged_4567 (arg1); +} + + // QString QSqlRelationalTableModel::orderByClause() static void _init_cbs_orderByClause_c0_0 (qt_gsi::GenericMethod *decl) @@ -3120,6 +3472,162 @@ static void _set_callback_cbs_rowCount_c2395_1 (void *cls, const gsi::Callback & } +// emitter void QSqlRelationalTableModel::rowsAboutToBeInserted(const QModelIndex &parent, int first, int last) + +static void _init_emitter_rowsAboutToBeInserted_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_rowsAboutToBeInserted_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QSqlRelationalTableModel_Adaptor *)cls)->emitter_QSqlRelationalTableModel_rowsAboutToBeInserted_7372 (arg1, arg2, arg3); +} + + +// emitter void QSqlRelationalTableModel::rowsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow) + +static void _init_emitter_rowsAboutToBeMoved_10318 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("sourceParent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("sourceStart"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("sourceEnd"); + decl->add_arg (argspec_2); + static gsi::ArgSpecBase argspec_3 ("destinationParent"); + decl->add_arg (argspec_3); + static gsi::ArgSpecBase argspec_4 ("destinationRow"); + decl->add_arg (argspec_4); + decl->set_return (); +} + +static void _call_emitter_rowsAboutToBeMoved_10318 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + const QModelIndex &arg4 = gsi::arg_reader() (args, heap); + int arg5 = gsi::arg_reader() (args, heap); + ((QSqlRelationalTableModel_Adaptor *)cls)->emitter_QSqlRelationalTableModel_rowsAboutToBeMoved_10318 (arg1, arg2, arg3, arg4, arg5); +} + + +// emitter void QSqlRelationalTableModel::rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last) + +static void _init_emitter_rowsAboutToBeRemoved_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_rowsAboutToBeRemoved_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QSqlRelationalTableModel_Adaptor *)cls)->emitter_QSqlRelationalTableModel_rowsAboutToBeRemoved_7372 (arg1, arg2, arg3); +} + + +// emitter void QSqlRelationalTableModel::rowsInserted(const QModelIndex &parent, int first, int last) + +static void _init_emitter_rowsInserted_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_rowsInserted_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QSqlRelationalTableModel_Adaptor *)cls)->emitter_QSqlRelationalTableModel_rowsInserted_7372 (arg1, arg2, arg3); +} + + +// emitter void QSqlRelationalTableModel::rowsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row) + +static void _init_emitter_rowsMoved_10318 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("start"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("end"); + decl->add_arg (argspec_2); + static gsi::ArgSpecBase argspec_3 ("destination"); + decl->add_arg (argspec_3); + static gsi::ArgSpecBase argspec_4 ("row"); + decl->add_arg (argspec_4); + decl->set_return (); +} + +static void _call_emitter_rowsMoved_10318 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + const QModelIndex &arg4 = gsi::arg_reader() (args, heap); + int arg5 = gsi::arg_reader() (args, heap); + ((QSqlRelationalTableModel_Adaptor *)cls)->emitter_QSqlRelationalTableModel_rowsMoved_10318 (arg1, arg2, arg3, arg4, arg5); +} + + +// emitter void QSqlRelationalTableModel::rowsRemoved(const QModelIndex &parent, int first, int last) + +static void _init_emitter_rowsRemoved_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_rowsRemoved_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QSqlRelationalTableModel_Adaptor *)cls)->emitter_QSqlRelationalTableModel_rowsRemoved_7372 (arg1, arg2, arg3); +} + + // bool QSqlRelationalTableModel::select() static void _init_cbs_select_0_0 (qt_gsi::GenericMethod *decl) @@ -3697,6 +4205,12 @@ static gsi::Methods methods_QSqlRelationalTableModel_Adaptor () { methods += new qt_gsi::GenericMethod ("clear", "@hide", false, &_init_cbs_clear_0_0, &_call_cbs_clear_0_0, &_set_callback_cbs_clear_0_0); methods += new qt_gsi::GenericMethod ("columnCount", "@brief Virtual method int QSqlRelationalTableModel::columnCount(const QModelIndex &parent)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_columnCount_c2395_1, &_call_cbs_columnCount_c2395_1); methods += new qt_gsi::GenericMethod ("columnCount", "@hide", true, &_init_cbs_columnCount_c2395_1, &_call_cbs_columnCount_c2395_1, &_set_callback_cbs_columnCount_c2395_1); + methods += new qt_gsi::GenericMethod ("emit_columnsAboutToBeInserted", "@brief Emitter for signal void QSqlRelationalTableModel::columnsAboutToBeInserted(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_columnsAboutToBeInserted_7372, &_call_emitter_columnsAboutToBeInserted_7372); + methods += new qt_gsi::GenericMethod ("emit_columnsAboutToBeMoved", "@brief Emitter for signal void QSqlRelationalTableModel::columnsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn)\nCall this method to emit this signal.", false, &_init_emitter_columnsAboutToBeMoved_10318, &_call_emitter_columnsAboutToBeMoved_10318); + methods += new qt_gsi::GenericMethod ("emit_columnsAboutToBeRemoved", "@brief Emitter for signal void QSqlRelationalTableModel::columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_columnsAboutToBeRemoved_7372, &_call_emitter_columnsAboutToBeRemoved_7372); + methods += new qt_gsi::GenericMethod ("emit_columnsInserted", "@brief Emitter for signal void QSqlRelationalTableModel::columnsInserted(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_columnsInserted_7372, &_call_emitter_columnsInserted_7372); + methods += new qt_gsi::GenericMethod ("emit_columnsMoved", "@brief Emitter for signal void QSqlRelationalTableModel::columnsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column)\nCall this method to emit this signal.", false, &_init_emitter_columnsMoved_10318, &_call_emitter_columnsMoved_10318); + methods += new qt_gsi::GenericMethod ("emit_columnsRemoved", "@brief Emitter for signal void QSqlRelationalTableModel::columnsRemoved(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_columnsRemoved_7372, &_call_emitter_columnsRemoved_7372); methods += new qt_gsi::GenericMethod ("*createIndex", "@brief Method QModelIndex QSqlRelationalTableModel::createIndex(int row, int column, void *data)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_createIndex_c2374, &_call_fp_createIndex_c2374); methods += new qt_gsi::GenericMethod ("*createIndex", "@brief Method QModelIndex QSqlRelationalTableModel::createIndex(int row, int column, quintptr id)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_createIndex_c2657, &_call_fp_createIndex_c2657); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QSqlRelationalTableModel::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); @@ -3752,10 +4266,13 @@ static gsi::Methods methods_QSqlRelationalTableModel_Adaptor () { methods += new qt_gsi::GenericMethod ("mimeData", "@hide", true, &_init_cbs_mimeData_c3010_0, &_call_cbs_mimeData_c3010_0, &_set_callback_cbs_mimeData_c3010_0); methods += new qt_gsi::GenericMethod ("mimeTypes", "@brief Virtual method QStringList QSqlRelationalTableModel::mimeTypes()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_mimeTypes_c0_0, &_call_cbs_mimeTypes_c0_0); methods += new qt_gsi::GenericMethod ("mimeTypes", "@hide", true, &_init_cbs_mimeTypes_c0_0, &_call_cbs_mimeTypes_c0_0, &_set_callback_cbs_mimeTypes_c0_0); + methods += new qt_gsi::GenericMethod ("emit_modelAboutToBeReset", "@brief Emitter for signal void QSqlRelationalTableModel::modelAboutToBeReset()\nCall this method to emit this signal.", false, &_init_emitter_modelAboutToBeReset_3767, &_call_emitter_modelAboutToBeReset_3767); + methods += new qt_gsi::GenericMethod ("emit_modelReset", "@brief Emitter for signal void QSqlRelationalTableModel::modelReset()\nCall this method to emit this signal.", false, &_init_emitter_modelReset_3767, &_call_emitter_modelReset_3767); methods += new qt_gsi::GenericMethod ("moveColumns", "@brief Virtual method bool QSqlRelationalTableModel::moveColumns(const QModelIndex &sourceParent, int sourceColumn, int count, const QModelIndex &destinationParent, int destinationChild)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_moveColumns_6659_0, &_call_cbs_moveColumns_6659_0); methods += new qt_gsi::GenericMethod ("moveColumns", "@hide", false, &_init_cbs_moveColumns_6659_0, &_call_cbs_moveColumns_6659_0, &_set_callback_cbs_moveColumns_6659_0); methods += new qt_gsi::GenericMethod ("moveRows", "@brief Virtual method bool QSqlRelationalTableModel::moveRows(const QModelIndex &sourceParent, int sourceRow, int count, const QModelIndex &destinationParent, int destinationChild)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_moveRows_6659_0, &_call_cbs_moveRows_6659_0); methods += new qt_gsi::GenericMethod ("moveRows", "@hide", false, &_init_cbs_moveRows_6659_0, &_call_cbs_moveRows_6659_0, &_set_callback_cbs_moveRows_6659_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QSqlRelationalTableModel::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*orderByClause", "@brief Virtual method QString QSqlRelationalTableModel::orderByClause()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_orderByClause_c0_0, &_call_cbs_orderByClause_c0_0); methods += new qt_gsi::GenericMethod ("*orderByClause", "@hide", true, &_init_cbs_orderByClause_c0_0, &_call_cbs_orderByClause_c0_0, &_set_callback_cbs_orderByClause_c0_0); methods += new qt_gsi::GenericMethod ("*persistentIndexList", "@brief Method QList QSqlRelationalTableModel::persistentIndexList()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_persistentIndexList_c0, &_call_fp_persistentIndexList_c0); @@ -3779,6 +4296,12 @@ static gsi::Methods methods_QSqlRelationalTableModel_Adaptor () { methods += new qt_gsi::GenericMethod ("roleNames", "@hide", true, &_init_cbs_roleNames_c0_0, &_call_cbs_roleNames_c0_0, &_set_callback_cbs_roleNames_c0_0); methods += new qt_gsi::GenericMethod ("rowCount", "@brief Virtual method int QSqlRelationalTableModel::rowCount(const QModelIndex &parent)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_rowCount_c2395_1, &_call_cbs_rowCount_c2395_1); methods += new qt_gsi::GenericMethod ("rowCount", "@hide", true, &_init_cbs_rowCount_c2395_1, &_call_cbs_rowCount_c2395_1, &_set_callback_cbs_rowCount_c2395_1); + methods += new qt_gsi::GenericMethod ("emit_rowsAboutToBeInserted", "@brief Emitter for signal void QSqlRelationalTableModel::rowsAboutToBeInserted(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_rowsAboutToBeInserted_7372, &_call_emitter_rowsAboutToBeInserted_7372); + methods += new qt_gsi::GenericMethod ("emit_rowsAboutToBeMoved", "@brief Emitter for signal void QSqlRelationalTableModel::rowsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow)\nCall this method to emit this signal.", false, &_init_emitter_rowsAboutToBeMoved_10318, &_call_emitter_rowsAboutToBeMoved_10318); + methods += new qt_gsi::GenericMethod ("emit_rowsAboutToBeRemoved", "@brief Emitter for signal void QSqlRelationalTableModel::rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_rowsAboutToBeRemoved_7372, &_call_emitter_rowsAboutToBeRemoved_7372); + methods += new qt_gsi::GenericMethod ("emit_rowsInserted", "@brief Emitter for signal void QSqlRelationalTableModel::rowsInserted(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_rowsInserted_7372, &_call_emitter_rowsInserted_7372); + methods += new qt_gsi::GenericMethod ("emit_rowsMoved", "@brief Emitter for signal void QSqlRelationalTableModel::rowsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row)\nCall this method to emit this signal.", false, &_init_emitter_rowsMoved_10318, &_call_emitter_rowsMoved_10318); + methods += new qt_gsi::GenericMethod ("emit_rowsRemoved", "@brief Emitter for signal void QSqlRelationalTableModel::rowsRemoved(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_rowsRemoved_7372, &_call_emitter_rowsRemoved_7372); methods += new qt_gsi::GenericMethod ("select", "@brief Virtual method bool QSqlRelationalTableModel::select()\nThis method can be reimplemented in a derived class.", false, &_init_cbs_select_0_0, &_call_cbs_select_0_0); methods += new qt_gsi::GenericMethod ("select", "@hide", false, &_init_cbs_select_0_0, &_call_cbs_select_0_0, &_set_callback_cbs_select_0_0); methods += new qt_gsi::GenericMethod ("selectRow", "@brief Virtual method bool QSqlRelationalTableModel::selectRow(int row)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_selectRow_767_0, &_call_cbs_selectRow_767_0); diff --git a/src/gsiqt/qt5/QtSql/gsiDeclQSqlTableModel.cc b/src/gsiqt/qt5/QtSql/gsiDeclQSqlTableModel.cc index cc86549c5..e89183e2f 100644 --- a/src/gsiqt/qt5/QtSql/gsiDeclQSqlTableModel.cc +++ b/src/gsiqt/qt5/QtSql/gsiDeclQSqlTableModel.cc @@ -786,12 +786,27 @@ static gsi::Methods methods_QSqlTableModel () { methods += gsi::qt_signal ("beforeDelete(int)", "beforeDelete", gsi::arg("row"), "@brief Signal declaration for QSqlTableModel::beforeDelete(int row)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("beforeInsert(QSqlRecord &)", "beforeInsert", gsi::arg("record"), "@brief Signal declaration for QSqlTableModel::beforeInsert(QSqlRecord &record)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("beforeUpdate(int, QSqlRecord &)", "beforeUpdate", gsi::arg("row"), gsi::arg("record"), "@brief Signal declaration for QSqlTableModel::beforeUpdate(int row, QSqlRecord &record)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("columnsAboutToBeInserted(const QModelIndex &, int, int)", "columnsAboutToBeInserted", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QSqlTableModel::columnsAboutToBeInserted(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("columnsAboutToBeMoved(const QModelIndex &, int, int, const QModelIndex &, int)", "columnsAboutToBeMoved", gsi::arg("sourceParent"), gsi::arg("sourceStart"), gsi::arg("sourceEnd"), gsi::arg("destinationParent"), gsi::arg("destinationColumn"), "@brief Signal declaration for QSqlTableModel::columnsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("columnsAboutToBeRemoved(const QModelIndex &, int, int)", "columnsAboutToBeRemoved", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QSqlTableModel::columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("columnsInserted(const QModelIndex &, int, int)", "columnsInserted", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QSqlTableModel::columnsInserted(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("columnsMoved(const QModelIndex &, int, int, const QModelIndex &, int)", "columnsMoved", gsi::arg("parent"), gsi::arg("start"), gsi::arg("end"), gsi::arg("destination"), gsi::arg("column"), "@brief Signal declaration for QSqlTableModel::columnsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("columnsRemoved(const QModelIndex &, int, int)", "columnsRemoved", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QSqlTableModel::columnsRemoved(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal & > ("dataChanged(const QModelIndex &, const QModelIndex &, const QVector &)", "dataChanged", gsi::arg("topLeft"), gsi::arg("bottomRight"), gsi::arg("roles"), "@brief Signal declaration for QSqlTableModel::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector &roles)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QSqlTableModel::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal::target_type &, int, int > ("headerDataChanged(Qt::Orientation, int, int)", "headerDataChanged", gsi::arg("orientation"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QSqlTableModel::headerDataChanged(Qt::Orientation orientation, int first, int last)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal &, const qt_gsi::Converter::target_type & > ("layoutAboutToBeChanged(const QList &, QAbstractItemModel::LayoutChangeHint)", "layoutAboutToBeChanged", gsi::arg("parents"), gsi::arg("hint"), "@brief Signal declaration for QSqlTableModel::layoutAboutToBeChanged(const QList &parents, QAbstractItemModel::LayoutChangeHint hint)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal &, const qt_gsi::Converter::target_type & > ("layoutChanged(const QList &, QAbstractItemModel::LayoutChangeHint)", "layoutChanged", gsi::arg("parents"), gsi::arg("hint"), "@brief Signal declaration for QSqlTableModel::layoutChanged(const QList &parents, QAbstractItemModel::LayoutChangeHint hint)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("modelAboutToBeReset()", "modelAboutToBeReset", "@brief Signal declaration for QSqlTableModel::modelAboutToBeReset()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("modelReset()", "modelReset", "@brief Signal declaration for QSqlTableModel::modelReset()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QSqlTableModel::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("primeInsert(int, QSqlRecord &)", "primeInsert", gsi::arg("row"), gsi::arg("record"), "@brief Signal declaration for QSqlTableModel::primeInsert(int row, QSqlRecord &record)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsAboutToBeInserted(const QModelIndex &, int, int)", "rowsAboutToBeInserted", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QSqlTableModel::rowsAboutToBeInserted(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsAboutToBeMoved(const QModelIndex &, int, int, const QModelIndex &, int)", "rowsAboutToBeMoved", gsi::arg("sourceParent"), gsi::arg("sourceStart"), gsi::arg("sourceEnd"), gsi::arg("destinationParent"), gsi::arg("destinationRow"), "@brief Signal declaration for QSqlTableModel::rowsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsAboutToBeRemoved(const QModelIndex &, int, int)", "rowsAboutToBeRemoved", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QSqlTableModel::rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsInserted(const QModelIndex &, int, int)", "rowsInserted", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QSqlTableModel::rowsInserted(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsMoved(const QModelIndex &, int, int, const QModelIndex &, int)", "rowsMoved", gsi::arg("parent"), gsi::arg("start"), gsi::arg("end"), gsi::arg("destination"), gsi::arg("row"), "@brief Signal declaration for QSqlTableModel::rowsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsRemoved(const QModelIndex &, int, int)", "rowsRemoved", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QSqlTableModel::rowsRemoved(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QSqlTableModel::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QSqlTableModel::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -1075,6 +1090,64 @@ public: } } + // [emitter impl] void QSqlTableModel::columnsAboutToBeInserted(const QModelIndex &parent, int first, int last) + void emitter_QSqlTableModel_columnsAboutToBeInserted_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QSqlTableModel::columnsAboutToBeInserted(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QSqlTableModel::columnsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn) + void emitter_QSqlTableModel_columnsAboutToBeMoved_10318(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn) + { + __SUPPRESS_UNUSED_WARNING (sourceParent); + __SUPPRESS_UNUSED_WARNING (sourceStart); + __SUPPRESS_UNUSED_WARNING (sourceEnd); + __SUPPRESS_UNUSED_WARNING (destinationParent); + __SUPPRESS_UNUSED_WARNING (destinationColumn); + throw tl::Exception ("Can't emit private signal 'void QSqlTableModel::columnsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn)'"); + } + + // [emitter impl] void QSqlTableModel::columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last) + void emitter_QSqlTableModel_columnsAboutToBeRemoved_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QSqlTableModel::columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QSqlTableModel::columnsInserted(const QModelIndex &parent, int first, int last) + void emitter_QSqlTableModel_columnsInserted_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QSqlTableModel::columnsInserted(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QSqlTableModel::columnsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column) + void emitter_QSqlTableModel_columnsMoved_10318(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (start); + __SUPPRESS_UNUSED_WARNING (end); + __SUPPRESS_UNUSED_WARNING (destination); + __SUPPRESS_UNUSED_WARNING (column); + throw tl::Exception ("Can't emit private signal 'void QSqlTableModel::columnsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column)'"); + } + + // [emitter impl] void QSqlTableModel::columnsRemoved(const QModelIndex &parent, int first, int last) + void emitter_QSqlTableModel_columnsRemoved_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QSqlTableModel::columnsRemoved(const QModelIndex &parent, int first, int last)'"); + } + // [adaptor impl] QVariant QSqlTableModel::data(const QModelIndex &idx, int role) QVariant cbs_data_c3054_1(const QModelIndex &idx, int role) const { @@ -1315,6 +1388,18 @@ public: } } + // [emitter impl] void QSqlTableModel::modelAboutToBeReset() + void emitter_QSqlTableModel_modelAboutToBeReset_3767() + { + throw tl::Exception ("Can't emit private signal 'void QSqlTableModel::modelAboutToBeReset()'"); + } + + // [emitter impl] void QSqlTableModel::modelReset() + void emitter_QSqlTableModel_modelReset_3767() + { + throw tl::Exception ("Can't emit private signal 'void QSqlTableModel::modelReset()'"); + } + // [adaptor impl] bool QSqlTableModel::moveColumns(const QModelIndex &sourceParent, int sourceColumn, int count, const QModelIndex &destinationParent, int destinationChild) bool cbs_moveColumns_6659_0(const QModelIndex &sourceParent, int sourceColumn, int count, const QModelIndex &destinationParent, int destinationChild) { @@ -1345,6 +1430,13 @@ public: } } + // [emitter impl] void QSqlTableModel::objectNameChanged(const QString &objectName) + void emitter_QSqlTableModel_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QSqlTableModel::objectNameChanged(const QString &objectName)'"); + } + // [emitter impl] void QSqlTableModel::primeInsert(int row, QSqlRecord &record) void emitter_QSqlTableModel_primeInsert_2269(int row, QSqlRecord &record) { @@ -1441,6 +1533,64 @@ public: } } + // [emitter impl] void QSqlTableModel::rowsAboutToBeInserted(const QModelIndex &parent, int first, int last) + void emitter_QSqlTableModel_rowsAboutToBeInserted_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QSqlTableModel::rowsAboutToBeInserted(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QSqlTableModel::rowsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow) + void emitter_QSqlTableModel_rowsAboutToBeMoved_10318(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow) + { + __SUPPRESS_UNUSED_WARNING (sourceParent); + __SUPPRESS_UNUSED_WARNING (sourceStart); + __SUPPRESS_UNUSED_WARNING (sourceEnd); + __SUPPRESS_UNUSED_WARNING (destinationParent); + __SUPPRESS_UNUSED_WARNING (destinationRow); + throw tl::Exception ("Can't emit private signal 'void QSqlTableModel::rowsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow)'"); + } + + // [emitter impl] void QSqlTableModel::rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last) + void emitter_QSqlTableModel_rowsAboutToBeRemoved_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QSqlTableModel::rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QSqlTableModel::rowsInserted(const QModelIndex &parent, int first, int last) + void emitter_QSqlTableModel_rowsInserted_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QSqlTableModel::rowsInserted(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QSqlTableModel::rowsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row) + void emitter_QSqlTableModel_rowsMoved_10318(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (start); + __SUPPRESS_UNUSED_WARNING (end); + __SUPPRESS_UNUSED_WARNING (destination); + __SUPPRESS_UNUSED_WARNING (row); + throw tl::Exception ("Can't emit private signal 'void QSqlTableModel::rowsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row)'"); + } + + // [emitter impl] void QSqlTableModel::rowsRemoved(const QModelIndex &parent, int first, int last) + void emitter_QSqlTableModel_rowsRemoved_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QSqlTableModel::rowsRemoved(const QModelIndex &parent, int first, int last)'"); + } + // [adaptor impl] bool QSqlTableModel::select() bool cbs_select_0_0() { @@ -2333,6 +2483,162 @@ static void _set_callback_cbs_columnCount_c2395_1 (void *cls, const gsi::Callbac } +// emitter void QSqlTableModel::columnsAboutToBeInserted(const QModelIndex &parent, int first, int last) + +static void _init_emitter_columnsAboutToBeInserted_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_columnsAboutToBeInserted_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QSqlTableModel_Adaptor *)cls)->emitter_QSqlTableModel_columnsAboutToBeInserted_7372 (arg1, arg2, arg3); +} + + +// emitter void QSqlTableModel::columnsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn) + +static void _init_emitter_columnsAboutToBeMoved_10318 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("sourceParent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("sourceStart"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("sourceEnd"); + decl->add_arg (argspec_2); + static gsi::ArgSpecBase argspec_3 ("destinationParent"); + decl->add_arg (argspec_3); + static gsi::ArgSpecBase argspec_4 ("destinationColumn"); + decl->add_arg (argspec_4); + decl->set_return (); +} + +static void _call_emitter_columnsAboutToBeMoved_10318 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + const QModelIndex &arg4 = gsi::arg_reader() (args, heap); + int arg5 = gsi::arg_reader() (args, heap); + ((QSqlTableModel_Adaptor *)cls)->emitter_QSqlTableModel_columnsAboutToBeMoved_10318 (arg1, arg2, arg3, arg4, arg5); +} + + +// emitter void QSqlTableModel::columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last) + +static void _init_emitter_columnsAboutToBeRemoved_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_columnsAboutToBeRemoved_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QSqlTableModel_Adaptor *)cls)->emitter_QSqlTableModel_columnsAboutToBeRemoved_7372 (arg1, arg2, arg3); +} + + +// emitter void QSqlTableModel::columnsInserted(const QModelIndex &parent, int first, int last) + +static void _init_emitter_columnsInserted_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_columnsInserted_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QSqlTableModel_Adaptor *)cls)->emitter_QSqlTableModel_columnsInserted_7372 (arg1, arg2, arg3); +} + + +// emitter void QSqlTableModel::columnsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column) + +static void _init_emitter_columnsMoved_10318 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("start"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("end"); + decl->add_arg (argspec_2); + static gsi::ArgSpecBase argspec_3 ("destination"); + decl->add_arg (argspec_3); + static gsi::ArgSpecBase argspec_4 ("column"); + decl->add_arg (argspec_4); + decl->set_return (); +} + +static void _call_emitter_columnsMoved_10318 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + const QModelIndex &arg4 = gsi::arg_reader() (args, heap); + int arg5 = gsi::arg_reader() (args, heap); + ((QSqlTableModel_Adaptor *)cls)->emitter_QSqlTableModel_columnsMoved_10318 (arg1, arg2, arg3, arg4, arg5); +} + + +// emitter void QSqlTableModel::columnsRemoved(const QModelIndex &parent, int first, int last) + +static void _init_emitter_columnsRemoved_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_columnsRemoved_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QSqlTableModel_Adaptor *)cls)->emitter_QSqlTableModel_columnsRemoved_7372 (arg1, arg2, arg3); +} + + // exposed QModelIndex QSqlTableModel::createIndex(int row, int column, void *data) static void _init_fp_createIndex_c2374 (qt_gsi::GenericMethod *decl) @@ -3151,6 +3457,34 @@ static void _set_callback_cbs_mimeTypes_c0_0 (void *cls, const gsi::Callback &cb } +// emitter void QSqlTableModel::modelAboutToBeReset() + +static void _init_emitter_modelAboutToBeReset_3767 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_emitter_modelAboutToBeReset_3767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + ((QSqlTableModel_Adaptor *)cls)->emitter_QSqlTableModel_modelAboutToBeReset_3767 (); +} + + +// emitter void QSqlTableModel::modelReset() + +static void _init_emitter_modelReset_3767 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_emitter_modelReset_3767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + ((QSqlTableModel_Adaptor *)cls)->emitter_QSqlTableModel_modelReset_3767 (); +} + + // bool QSqlTableModel::moveColumns(const QModelIndex &sourceParent, int sourceColumn, int count, const QModelIndex &destinationParent, int destinationChild) static void _init_cbs_moveColumns_6659_0 (qt_gsi::GenericMethod *decl) @@ -3221,6 +3555,24 @@ static void _set_callback_cbs_moveRows_6659_0 (void *cls, const gsi::Callback &c } +// emitter void QSqlTableModel::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QSqlTableModel_Adaptor *)cls)->emitter_QSqlTableModel_objectNameChanged_4567 (arg1); +} + + // QString QSqlTableModel::orderByClause() static void _init_cbs_orderByClause_c0_0 (qt_gsi::GenericMethod *decl) @@ -3490,6 +3842,162 @@ static void _set_callback_cbs_rowCount_c2395_1 (void *cls, const gsi::Callback & } +// emitter void QSqlTableModel::rowsAboutToBeInserted(const QModelIndex &parent, int first, int last) + +static void _init_emitter_rowsAboutToBeInserted_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_rowsAboutToBeInserted_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QSqlTableModel_Adaptor *)cls)->emitter_QSqlTableModel_rowsAboutToBeInserted_7372 (arg1, arg2, arg3); +} + + +// emitter void QSqlTableModel::rowsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow) + +static void _init_emitter_rowsAboutToBeMoved_10318 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("sourceParent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("sourceStart"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("sourceEnd"); + decl->add_arg (argspec_2); + static gsi::ArgSpecBase argspec_3 ("destinationParent"); + decl->add_arg (argspec_3); + static gsi::ArgSpecBase argspec_4 ("destinationRow"); + decl->add_arg (argspec_4); + decl->set_return (); +} + +static void _call_emitter_rowsAboutToBeMoved_10318 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + const QModelIndex &arg4 = gsi::arg_reader() (args, heap); + int arg5 = gsi::arg_reader() (args, heap); + ((QSqlTableModel_Adaptor *)cls)->emitter_QSqlTableModel_rowsAboutToBeMoved_10318 (arg1, arg2, arg3, arg4, arg5); +} + + +// emitter void QSqlTableModel::rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last) + +static void _init_emitter_rowsAboutToBeRemoved_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_rowsAboutToBeRemoved_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QSqlTableModel_Adaptor *)cls)->emitter_QSqlTableModel_rowsAboutToBeRemoved_7372 (arg1, arg2, arg3); +} + + +// emitter void QSqlTableModel::rowsInserted(const QModelIndex &parent, int first, int last) + +static void _init_emitter_rowsInserted_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_rowsInserted_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QSqlTableModel_Adaptor *)cls)->emitter_QSqlTableModel_rowsInserted_7372 (arg1, arg2, arg3); +} + + +// emitter void QSqlTableModel::rowsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row) + +static void _init_emitter_rowsMoved_10318 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("start"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("end"); + decl->add_arg (argspec_2); + static gsi::ArgSpecBase argspec_3 ("destination"); + decl->add_arg (argspec_3); + static gsi::ArgSpecBase argspec_4 ("row"); + decl->add_arg (argspec_4); + decl->set_return (); +} + +static void _call_emitter_rowsMoved_10318 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + const QModelIndex &arg4 = gsi::arg_reader() (args, heap); + int arg5 = gsi::arg_reader() (args, heap); + ((QSqlTableModel_Adaptor *)cls)->emitter_QSqlTableModel_rowsMoved_10318 (arg1, arg2, arg3, arg4, arg5); +} + + +// emitter void QSqlTableModel::rowsRemoved(const QModelIndex &parent, int first, int last) + +static void _init_emitter_rowsRemoved_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_rowsRemoved_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QSqlTableModel_Adaptor *)cls)->emitter_QSqlTableModel_rowsRemoved_7372 (arg1, arg2, arg3); +} + + // bool QSqlTableModel::select() static void _init_cbs_select_0_0 (qt_gsi::GenericMethod *decl) @@ -4040,6 +4548,12 @@ static gsi::Methods methods_QSqlTableModel_Adaptor () { methods += new qt_gsi::GenericMethod ("clear", "@hide", false, &_init_cbs_clear_0_0, &_call_cbs_clear_0_0, &_set_callback_cbs_clear_0_0); methods += new qt_gsi::GenericMethod ("columnCount", "@brief Virtual method int QSqlTableModel::columnCount(const QModelIndex &parent)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_columnCount_c2395_1, &_call_cbs_columnCount_c2395_1); methods += new qt_gsi::GenericMethod ("columnCount", "@hide", true, &_init_cbs_columnCount_c2395_1, &_call_cbs_columnCount_c2395_1, &_set_callback_cbs_columnCount_c2395_1); + methods += new qt_gsi::GenericMethod ("emit_columnsAboutToBeInserted", "@brief Emitter for signal void QSqlTableModel::columnsAboutToBeInserted(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_columnsAboutToBeInserted_7372, &_call_emitter_columnsAboutToBeInserted_7372); + methods += new qt_gsi::GenericMethod ("emit_columnsAboutToBeMoved", "@brief Emitter for signal void QSqlTableModel::columnsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn)\nCall this method to emit this signal.", false, &_init_emitter_columnsAboutToBeMoved_10318, &_call_emitter_columnsAboutToBeMoved_10318); + methods += new qt_gsi::GenericMethod ("emit_columnsAboutToBeRemoved", "@brief Emitter for signal void QSqlTableModel::columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_columnsAboutToBeRemoved_7372, &_call_emitter_columnsAboutToBeRemoved_7372); + methods += new qt_gsi::GenericMethod ("emit_columnsInserted", "@brief Emitter for signal void QSqlTableModel::columnsInserted(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_columnsInserted_7372, &_call_emitter_columnsInserted_7372); + methods += new qt_gsi::GenericMethod ("emit_columnsMoved", "@brief Emitter for signal void QSqlTableModel::columnsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column)\nCall this method to emit this signal.", false, &_init_emitter_columnsMoved_10318, &_call_emitter_columnsMoved_10318); + methods += new qt_gsi::GenericMethod ("emit_columnsRemoved", "@brief Emitter for signal void QSqlTableModel::columnsRemoved(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_columnsRemoved_7372, &_call_emitter_columnsRemoved_7372); methods += new qt_gsi::GenericMethod ("*createIndex", "@brief Method QModelIndex QSqlTableModel::createIndex(int row, int column, void *data)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_createIndex_c2374, &_call_fp_createIndex_c2374); methods += new qt_gsi::GenericMethod ("*createIndex", "@brief Method QModelIndex QSqlTableModel::createIndex(int row, int column, quintptr id)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_createIndex_c2657, &_call_fp_createIndex_c2657); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QSqlTableModel::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); @@ -4095,10 +4609,13 @@ static gsi::Methods methods_QSqlTableModel_Adaptor () { methods += new qt_gsi::GenericMethod ("mimeData", "@hide", true, &_init_cbs_mimeData_c3010_0, &_call_cbs_mimeData_c3010_0, &_set_callback_cbs_mimeData_c3010_0); methods += new qt_gsi::GenericMethod ("mimeTypes", "@brief Virtual method QStringList QSqlTableModel::mimeTypes()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_mimeTypes_c0_0, &_call_cbs_mimeTypes_c0_0); methods += new qt_gsi::GenericMethod ("mimeTypes", "@hide", true, &_init_cbs_mimeTypes_c0_0, &_call_cbs_mimeTypes_c0_0, &_set_callback_cbs_mimeTypes_c0_0); + methods += new qt_gsi::GenericMethod ("emit_modelAboutToBeReset", "@brief Emitter for signal void QSqlTableModel::modelAboutToBeReset()\nCall this method to emit this signal.", false, &_init_emitter_modelAboutToBeReset_3767, &_call_emitter_modelAboutToBeReset_3767); + methods += new qt_gsi::GenericMethod ("emit_modelReset", "@brief Emitter for signal void QSqlTableModel::modelReset()\nCall this method to emit this signal.", false, &_init_emitter_modelReset_3767, &_call_emitter_modelReset_3767); methods += new qt_gsi::GenericMethod ("moveColumns", "@brief Virtual method bool QSqlTableModel::moveColumns(const QModelIndex &sourceParent, int sourceColumn, int count, const QModelIndex &destinationParent, int destinationChild)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_moveColumns_6659_0, &_call_cbs_moveColumns_6659_0); methods += new qt_gsi::GenericMethod ("moveColumns", "@hide", false, &_init_cbs_moveColumns_6659_0, &_call_cbs_moveColumns_6659_0, &_set_callback_cbs_moveColumns_6659_0); methods += new qt_gsi::GenericMethod ("moveRows", "@brief Virtual method bool QSqlTableModel::moveRows(const QModelIndex &sourceParent, int sourceRow, int count, const QModelIndex &destinationParent, int destinationChild)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_moveRows_6659_0, &_call_cbs_moveRows_6659_0); methods += new qt_gsi::GenericMethod ("moveRows", "@hide", false, &_init_cbs_moveRows_6659_0, &_call_cbs_moveRows_6659_0, &_set_callback_cbs_moveRows_6659_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QSqlTableModel::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*orderByClause", "@brief Virtual method QString QSqlTableModel::orderByClause()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_orderByClause_c0_0, &_call_cbs_orderByClause_c0_0); methods += new qt_gsi::GenericMethod ("*orderByClause", "@hide", true, &_init_cbs_orderByClause_c0_0, &_call_cbs_orderByClause_c0_0, &_set_callback_cbs_orderByClause_c0_0); methods += new qt_gsi::GenericMethod ("*persistentIndexList", "@brief Method QList QSqlTableModel::persistentIndexList()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_persistentIndexList_c0, &_call_fp_persistentIndexList_c0); @@ -4120,6 +4637,12 @@ static gsi::Methods methods_QSqlTableModel_Adaptor () { methods += new qt_gsi::GenericMethod ("roleNames", "@hide", true, &_init_cbs_roleNames_c0_0, &_call_cbs_roleNames_c0_0, &_set_callback_cbs_roleNames_c0_0); methods += new qt_gsi::GenericMethod ("rowCount", "@brief Virtual method int QSqlTableModel::rowCount(const QModelIndex &parent)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_rowCount_c2395_1, &_call_cbs_rowCount_c2395_1); methods += new qt_gsi::GenericMethod ("rowCount", "@hide", true, &_init_cbs_rowCount_c2395_1, &_call_cbs_rowCount_c2395_1, &_set_callback_cbs_rowCount_c2395_1); + methods += new qt_gsi::GenericMethod ("emit_rowsAboutToBeInserted", "@brief Emitter for signal void QSqlTableModel::rowsAboutToBeInserted(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_rowsAboutToBeInserted_7372, &_call_emitter_rowsAboutToBeInserted_7372); + methods += new qt_gsi::GenericMethod ("emit_rowsAboutToBeMoved", "@brief Emitter for signal void QSqlTableModel::rowsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow)\nCall this method to emit this signal.", false, &_init_emitter_rowsAboutToBeMoved_10318, &_call_emitter_rowsAboutToBeMoved_10318); + methods += new qt_gsi::GenericMethod ("emit_rowsAboutToBeRemoved", "@brief Emitter for signal void QSqlTableModel::rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_rowsAboutToBeRemoved_7372, &_call_emitter_rowsAboutToBeRemoved_7372); + methods += new qt_gsi::GenericMethod ("emit_rowsInserted", "@brief Emitter for signal void QSqlTableModel::rowsInserted(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_rowsInserted_7372, &_call_emitter_rowsInserted_7372); + methods += new qt_gsi::GenericMethod ("emit_rowsMoved", "@brief Emitter for signal void QSqlTableModel::rowsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row)\nCall this method to emit this signal.", false, &_init_emitter_rowsMoved_10318, &_call_emitter_rowsMoved_10318); + methods += new qt_gsi::GenericMethod ("emit_rowsRemoved", "@brief Emitter for signal void QSqlTableModel::rowsRemoved(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_rowsRemoved_7372, &_call_emitter_rowsRemoved_7372); methods += new qt_gsi::GenericMethod ("select", "@brief Virtual method bool QSqlTableModel::select()\nThis method can be reimplemented in a derived class.", false, &_init_cbs_select_0_0, &_call_cbs_select_0_0); methods += new qt_gsi::GenericMethod ("select", "@hide", false, &_init_cbs_select_0_0, &_call_cbs_select_0_0, &_set_callback_cbs_select_0_0); methods += new qt_gsi::GenericMethod ("selectRow", "@brief Virtual method bool QSqlTableModel::selectRow(int row)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_selectRow_767_0, &_call_cbs_selectRow_767_0); diff --git a/src/gsiqt/qt5/QtSvg/gsiDeclQGraphicsSvgItem.cc b/src/gsiqt/qt5/QtSvg/gsiDeclQGraphicsSvgItem.cc index 719c3645d..eeed53005 100644 --- a/src/gsiqt/qt5/QtSvg/gsiDeclQGraphicsSvgItem.cc +++ b/src/gsiqt/qt5/QtSvg/gsiDeclQGraphicsSvgItem.cc @@ -345,19 +345,6 @@ static gsi::Methods methods_QGraphicsSvgItem () { methods += new qt_gsi::GenericMethod ("setMaximumCacheSize|maximumCacheSize=", "@brief Method void QGraphicsSvgItem::setMaximumCacheSize(const QSize &size)\n", false, &_init_f_setMaximumCacheSize_1805, &_call_f_setMaximumCacheSize_1805); methods += new qt_gsi::GenericMethod ("setSharedRenderer", "@brief Method void QGraphicsSvgItem::setSharedRenderer(QSvgRenderer *renderer)\n", false, &_init_f_setSharedRenderer_1830, &_call_f_setSharedRenderer_1830); methods += new qt_gsi::GenericMethod ("type", "@brief Method int QGraphicsSvgItem::type()\nThis is a reimplementation of QGraphicsItem::type", true, &_init_f_type_c0, &_call_f_type_c0); - methods += gsi::qt_signal ("childrenChanged()", "childrenChanged", "@brief Signal declaration for QGraphicsSvgItem::childrenChanged()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QGraphicsSvgItem::destroyed(QObject *)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("enabledChanged()", "enabledChanged", "@brief Signal declaration for QGraphicsSvgItem::enabledChanged()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("heightChanged()", "heightChanged", "@brief Signal declaration for QGraphicsSvgItem::heightChanged()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("opacityChanged()", "opacityChanged", "@brief Signal declaration for QGraphicsSvgItem::opacityChanged()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("parentChanged()", "parentChanged", "@brief Signal declaration for QGraphicsSvgItem::parentChanged()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("rotationChanged()", "rotationChanged", "@brief Signal declaration for QGraphicsSvgItem::rotationChanged()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("scaleChanged()", "scaleChanged", "@brief Signal declaration for QGraphicsSvgItem::scaleChanged()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("visibleChanged()", "visibleChanged", "@brief Signal declaration for QGraphicsSvgItem::visibleChanged()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("widthChanged()", "widthChanged", "@brief Signal declaration for QGraphicsSvgItem::widthChanged()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("xChanged()", "xChanged", "@brief Signal declaration for QGraphicsSvgItem::xChanged()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("yChanged()", "yChanged", "@brief Signal declaration for QGraphicsSvgItem::yChanged()\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("zChanged()", "zChanged", "@brief Signal declaration for QGraphicsSvgItem::zChanged()\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QGraphicsSvgItem::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QGraphicsSvgItem::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -474,12 +461,6 @@ public: } } - // [emitter impl] void QGraphicsSvgItem::childrenChanged() - void emitter_QGraphicsSvgItem_childrenChanged_0() - { - emit QGraphicsSvgItem::childrenChanged(); - } - // [adaptor impl] bool QGraphicsSvgItem::collidesWithItem(const QGraphicsItem *other, Qt::ItemSelectionMode mode) bool cbs_collidesWithItem_c4977_1(const QGraphicsItem *other, const qt_gsi::Converter::target_type & mode) const { @@ -525,18 +506,6 @@ public: } } - // [emitter impl] void QGraphicsSvgItem::destroyed(QObject *) - void emitter_QGraphicsSvgItem_destroyed_1302(QObject *arg1) - { - emit QGraphicsSvgItem::destroyed(arg1); - } - - // [emitter impl] void QGraphicsSvgItem::enabledChanged() - void emitter_QGraphicsSvgItem_enabledChanged_0() - { - emit QGraphicsSvgItem::enabledChanged(); - } - // [adaptor impl] bool QGraphicsSvgItem::eventFilter(QObject *, QEvent *) bool cbs_eventFilter_2411_0(QObject *arg1, QEvent *arg2) { @@ -552,12 +521,6 @@ public: } } - // [emitter impl] void QGraphicsSvgItem::heightChanged() - void emitter_QGraphicsSvgItem_heightChanged_0() - { - emit QGraphicsSvgItem::heightChanged(); - } - // [adaptor impl] bool QGraphicsSvgItem::isObscuredBy(const QGraphicsItem *item) bool cbs_isObscuredBy_c2614_0(const QGraphicsItem *item) const { @@ -573,12 +536,6 @@ public: } } - // [emitter impl] void QGraphicsSvgItem::opacityChanged() - void emitter_QGraphicsSvgItem_opacityChanged_0() - { - emit QGraphicsSvgItem::opacityChanged(); - } - // [adaptor impl] QPainterPath QGraphicsSvgItem::opaqueArea() QPainterPath cbs_opaqueArea_c0_0() const { @@ -609,24 +566,6 @@ public: } } - // [emitter impl] void QGraphicsSvgItem::parentChanged() - void emitter_QGraphicsSvgItem_parentChanged_0() - { - emit QGraphicsSvgItem::parentChanged(); - } - - // [emitter impl] void QGraphicsSvgItem::rotationChanged() - void emitter_QGraphicsSvgItem_rotationChanged_0() - { - emit QGraphicsSvgItem::rotationChanged(); - } - - // [emitter impl] void QGraphicsSvgItem::scaleChanged() - void emitter_QGraphicsSvgItem_scaleChanged_0() - { - emit QGraphicsSvgItem::scaleChanged(); - } - // [adaptor impl] QPainterPath QGraphicsSvgItem::shape() QPainterPath cbs_shape_c0_0() const { @@ -657,36 +596,6 @@ public: } } - // [emitter impl] void QGraphicsSvgItem::visibleChanged() - void emitter_QGraphicsSvgItem_visibleChanged_0() - { - emit QGraphicsSvgItem::visibleChanged(); - } - - // [emitter impl] void QGraphicsSvgItem::widthChanged() - void emitter_QGraphicsSvgItem_widthChanged_0() - { - emit QGraphicsSvgItem::widthChanged(); - } - - // [emitter impl] void QGraphicsSvgItem::xChanged() - void emitter_QGraphicsSvgItem_xChanged_0() - { - emit QGraphicsSvgItem::xChanged(); - } - - // [emitter impl] void QGraphicsSvgItem::yChanged() - void emitter_QGraphicsSvgItem_yChanged_0() - { - emit QGraphicsSvgItem::yChanged(); - } - - // [emitter impl] void QGraphicsSvgItem::zChanged() - void emitter_QGraphicsSvgItem_zChanged_0() - { - emit QGraphicsSvgItem::zChanged(); - } - // [adaptor impl] void QGraphicsSvgItem::childEvent(QChildEvent *) void cbs_childEvent_1701_0(QChildEvent *arg1) { @@ -1303,20 +1212,6 @@ static void _set_callback_cbs_childEvent_1701_0 (void *cls, const gsi::Callback } -// emitter void QGraphicsSvgItem::childrenChanged() - -static void _init_emitter_childrenChanged_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_childrenChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QGraphicsSvgItem_Adaptor *)cls)->emitter_QGraphicsSvgItem_childrenChanged_0 (); -} - - // bool QGraphicsSvgItem::collidesWithItem(const QGraphicsItem *other, Qt::ItemSelectionMode mode) static void _init_cbs_collidesWithItem_c4977_1 (qt_gsi::GenericMethod *decl) @@ -1440,24 +1335,6 @@ static void _set_callback_cbs_customEvent_1217_0 (void *cls, const gsi::Callback } -// emitter void QGraphicsSvgItem::destroyed(QObject *) - -static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - ((QGraphicsSvgItem_Adaptor *)cls)->emitter_QGraphicsSvgItem_destroyed_1302 (arg1); -} - - // void QGraphicsSvgItem::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -1578,20 +1455,6 @@ static void _set_callback_cbs_dropEvent_3315_0 (void *cls, const gsi::Callback & } -// emitter void QGraphicsSvgItem::enabledChanged() - -static void _init_emitter_enabledChanged_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_enabledChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QGraphicsSvgItem_Adaptor *)cls)->emitter_QGraphicsSvgItem_enabledChanged_0 (); -} - - // bool QGraphicsSvgItem::event(QEvent *ev) static void _init_cbs_event_1217_0 (qt_gsi::GenericMethod *decl) @@ -1712,20 +1575,6 @@ static void _set_callback_cbs_focusOutEvent_1729_0 (void *cls, const gsi::Callba } -// emitter void QGraphicsSvgItem::heightChanged() - -static void _init_emitter_heightChanged_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_heightChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QGraphicsSvgItem_Adaptor *)cls)->emitter_QGraphicsSvgItem_heightChanged_0 (); -} - - // void QGraphicsSvgItem::hoverEnterEvent(QGraphicsSceneHoverEvent *event) static void _init_cbs_hoverEnterEvent_3044_0 (qt_gsi::GenericMethod *decl) @@ -2056,20 +1905,6 @@ static void _set_callback_cbs_mouseReleaseEvent_3049_0 (void *cls, const gsi::Ca } -// emitter void QGraphicsSvgItem::opacityChanged() - -static void _init_emitter_opacityChanged_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_opacityChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QGraphicsSvgItem_Adaptor *)cls)->emitter_QGraphicsSvgItem_opacityChanged_0 (); -} - - // QPainterPath QGraphicsSvgItem::opaqueArea() static void _init_cbs_opaqueArea_c0_0 (qt_gsi::GenericMethod *decl) @@ -2119,20 +1954,6 @@ static void _set_callback_cbs_paint_6301_1 (void *cls, const gsi::Callback &cb) } -// emitter void QGraphicsSvgItem::parentChanged() - -static void _init_emitter_parentChanged_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_parentChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QGraphicsSvgItem_Adaptor *)cls)->emitter_QGraphicsSvgItem_parentChanged_0 (); -} - - // exposed void QGraphicsSvgItem::prepareGeometryChange() static void _init_fp_prepareGeometryChange_0 (qt_gsi::GenericMethod *decl) @@ -2181,34 +2002,6 @@ static void _call_fp_removeFromIndex_0 (const qt_gsi::GenericMethod * /*decl*/, } -// emitter void QGraphicsSvgItem::rotationChanged() - -static void _init_emitter_rotationChanged_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_rotationChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QGraphicsSvgItem_Adaptor *)cls)->emitter_QGraphicsSvgItem_rotationChanged_0 (); -} - - -// emitter void QGraphicsSvgItem::scaleChanged() - -static void _init_emitter_scaleChanged_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_scaleChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QGraphicsSvgItem_Adaptor *)cls)->emitter_QGraphicsSvgItem_scaleChanged_0 (); -} - - // bool QGraphicsSvgItem::sceneEvent(QEvent *event) static void _init_cbs_sceneEvent_1217_0 (qt_gsi::GenericMethod *decl) @@ -2413,20 +2206,6 @@ static void _call_fp_updateMicroFocus_0 (const qt_gsi::GenericMethod * /*decl*/, } -// emitter void QGraphicsSvgItem::visibleChanged() - -static void _init_emitter_visibleChanged_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_visibleChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QGraphicsSvgItem_Adaptor *)cls)->emitter_QGraphicsSvgItem_visibleChanged_0 (); -} - - // void QGraphicsSvgItem::wheelEvent(QGraphicsSceneWheelEvent *event) static void _init_cbs_wheelEvent_3029_0 (qt_gsi::GenericMethod *decl) @@ -2451,62 +2230,6 @@ static void _set_callback_cbs_wheelEvent_3029_0 (void *cls, const gsi::Callback } -// emitter void QGraphicsSvgItem::widthChanged() - -static void _init_emitter_widthChanged_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_widthChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QGraphicsSvgItem_Adaptor *)cls)->emitter_QGraphicsSvgItem_widthChanged_0 (); -} - - -// emitter void QGraphicsSvgItem::xChanged() - -static void _init_emitter_xChanged_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_xChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QGraphicsSvgItem_Adaptor *)cls)->emitter_QGraphicsSvgItem_xChanged_0 (); -} - - -// emitter void QGraphicsSvgItem::yChanged() - -static void _init_emitter_yChanged_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_yChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QGraphicsSvgItem_Adaptor *)cls)->emitter_QGraphicsSvgItem_yChanged_0 (); -} - - -// emitter void QGraphicsSvgItem::zChanged() - -static void _init_emitter_zChanged_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_zChanged_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QGraphicsSvgItem_Adaptor *)cls)->emitter_QGraphicsSvgItem_zChanged_0 (); -} - - namespace gsi { @@ -2523,7 +2246,6 @@ static gsi::Methods methods_QGraphicsSvgItem_Adaptor () { methods += new qt_gsi::GenericMethod ("boundingRect", "@hide", true, &_init_cbs_boundingRect_c0_0, &_call_cbs_boundingRect_c0_0, &_set_callback_cbs_boundingRect_c0_0); methods += new qt_gsi::GenericMethod ("*childEvent", "@brief Virtual method void QGraphicsSvgItem::childEvent(QChildEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); - methods += new qt_gsi::GenericMethod ("emit_childrenChanged", "@brief Emitter for signal void QGraphicsSvgItem::childrenChanged()\nCall this method to emit this signal.", false, &_init_emitter_childrenChanged_0, &_call_emitter_childrenChanged_0); methods += new qt_gsi::GenericMethod ("collidesWithItem", "@brief Virtual method bool QGraphicsSvgItem::collidesWithItem(const QGraphicsItem *other, Qt::ItemSelectionMode mode)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_collidesWithItem_c4977_1, &_call_cbs_collidesWithItem_c4977_1); methods += new qt_gsi::GenericMethod ("collidesWithItem", "@hide", true, &_init_cbs_collidesWithItem_c4977_1, &_call_cbs_collidesWithItem_c4977_1, &_set_callback_cbs_collidesWithItem_c4977_1); methods += new qt_gsi::GenericMethod ("collidesWithPath", "@brief Virtual method bool QGraphicsSvgItem::collidesWithPath(const QPainterPath &path, Qt::ItemSelectionMode mode)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_collidesWithPath_c4877_1, &_call_cbs_collidesWithPath_c4877_1); @@ -2534,7 +2256,6 @@ static gsi::Methods methods_QGraphicsSvgItem_Adaptor () { methods += new qt_gsi::GenericMethod ("*contextMenuEvent", "@hide", false, &_init_cbs_contextMenuEvent_3674_0, &_call_cbs_contextMenuEvent_3674_0, &_set_callback_cbs_contextMenuEvent_3674_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QGraphicsSvgItem::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); - methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QGraphicsSvgItem::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QGraphicsSvgItem::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*dragEnterEvent", "@brief Virtual method void QGraphicsSvgItem::dragEnterEvent(QGraphicsSceneDragDropEvent *event)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_dragEnterEvent_3315_0, &_call_cbs_dragEnterEvent_3315_0); @@ -2545,7 +2266,6 @@ static gsi::Methods methods_QGraphicsSvgItem_Adaptor () { methods += new qt_gsi::GenericMethod ("*dragMoveEvent", "@hide", false, &_init_cbs_dragMoveEvent_3315_0, &_call_cbs_dragMoveEvent_3315_0, &_set_callback_cbs_dragMoveEvent_3315_0); methods += new qt_gsi::GenericMethod ("*dropEvent", "@brief Virtual method void QGraphicsSvgItem::dropEvent(QGraphicsSceneDragDropEvent *event)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_dropEvent_3315_0, &_call_cbs_dropEvent_3315_0); methods += new qt_gsi::GenericMethod ("*dropEvent", "@hide", false, &_init_cbs_dropEvent_3315_0, &_call_cbs_dropEvent_3315_0, &_set_callback_cbs_dropEvent_3315_0); - methods += new qt_gsi::GenericMethod ("emit_enabledChanged", "@brief Emitter for signal void QGraphicsSvgItem::enabledChanged()\nCall this method to emit this signal.", false, &_init_emitter_enabledChanged_0, &_call_emitter_enabledChanged_0); methods += new qt_gsi::GenericMethod ("*event", "@brief Virtual method bool QGraphicsSvgItem::event(QEvent *ev)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0); methods += new qt_gsi::GenericMethod ("*event", "@hide", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0, &_set_callback_cbs_event_1217_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QGraphicsSvgItem::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); @@ -2556,7 +2276,6 @@ static gsi::Methods methods_QGraphicsSvgItem_Adaptor () { methods += new qt_gsi::GenericMethod ("*focusInEvent", "@hide", false, &_init_cbs_focusInEvent_1729_0, &_call_cbs_focusInEvent_1729_0, &_set_callback_cbs_focusInEvent_1729_0); methods += new qt_gsi::GenericMethod ("*focusOutEvent", "@brief Virtual method void QGraphicsSvgItem::focusOutEvent(QFocusEvent *event)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_focusOutEvent_1729_0, &_call_cbs_focusOutEvent_1729_0); methods += new qt_gsi::GenericMethod ("*focusOutEvent", "@hide", false, &_init_cbs_focusOutEvent_1729_0, &_call_cbs_focusOutEvent_1729_0, &_set_callback_cbs_focusOutEvent_1729_0); - methods += new qt_gsi::GenericMethod ("emit_heightChanged", "@brief Emitter for signal void QGraphicsSvgItem::heightChanged()\nCall this method to emit this signal.", false, &_init_emitter_heightChanged_0, &_call_emitter_heightChanged_0); methods += new qt_gsi::GenericMethod ("*hoverEnterEvent", "@brief Virtual method void QGraphicsSvgItem::hoverEnterEvent(QGraphicsSceneHoverEvent *event)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_hoverEnterEvent_3044_0, &_call_cbs_hoverEnterEvent_3044_0); methods += new qt_gsi::GenericMethod ("*hoverEnterEvent", "@hide", false, &_init_cbs_hoverEnterEvent_3044_0, &_call_cbs_hoverEnterEvent_3044_0, &_set_callback_cbs_hoverEnterEvent_3044_0); methods += new qt_gsi::GenericMethod ("*hoverLeaveEvent", "@brief Virtual method void QGraphicsSvgItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_hoverLeaveEvent_3044_0, &_call_cbs_hoverLeaveEvent_3044_0); @@ -2584,17 +2303,13 @@ static gsi::Methods methods_QGraphicsSvgItem_Adaptor () { methods += new qt_gsi::GenericMethod ("*mousePressEvent", "@hide", false, &_init_cbs_mousePressEvent_3049_0, &_call_cbs_mousePressEvent_3049_0, &_set_callback_cbs_mousePressEvent_3049_0); methods += new qt_gsi::GenericMethod ("*mouseReleaseEvent", "@brief Virtual method void QGraphicsSvgItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_mouseReleaseEvent_3049_0, &_call_cbs_mouseReleaseEvent_3049_0); methods += new qt_gsi::GenericMethod ("*mouseReleaseEvent", "@hide", false, &_init_cbs_mouseReleaseEvent_3049_0, &_call_cbs_mouseReleaseEvent_3049_0, &_set_callback_cbs_mouseReleaseEvent_3049_0); - methods += new qt_gsi::GenericMethod ("emit_opacityChanged", "@brief Emitter for signal void QGraphicsSvgItem::opacityChanged()\nCall this method to emit this signal.", false, &_init_emitter_opacityChanged_0, &_call_emitter_opacityChanged_0); methods += new qt_gsi::GenericMethod ("opaqueArea", "@brief Virtual method QPainterPath QGraphicsSvgItem::opaqueArea()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_opaqueArea_c0_0, &_call_cbs_opaqueArea_c0_0); methods += new qt_gsi::GenericMethod ("opaqueArea", "@hide", true, &_init_cbs_opaqueArea_c0_0, &_call_cbs_opaqueArea_c0_0, &_set_callback_cbs_opaqueArea_c0_0); methods += new qt_gsi::GenericMethod ("paint", "@brief Virtual method void QGraphicsSvgItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_paint_6301_1, &_call_cbs_paint_6301_1); methods += new qt_gsi::GenericMethod ("paint", "@hide", false, &_init_cbs_paint_6301_1, &_call_cbs_paint_6301_1, &_set_callback_cbs_paint_6301_1); - methods += new qt_gsi::GenericMethod ("emit_parentChanged", "@brief Emitter for signal void QGraphicsSvgItem::parentChanged()\nCall this method to emit this signal.", false, &_init_emitter_parentChanged_0, &_call_emitter_parentChanged_0); methods += new qt_gsi::GenericMethod ("*prepareGeometryChange", "@brief Method void QGraphicsSvgItem::prepareGeometryChange()\nThis method is protected and can only be called from inside a derived class.", false, &_init_fp_prepareGeometryChange_0, &_call_fp_prepareGeometryChange_0); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QGraphicsSvgItem::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*removeFromIndex", "@brief Method void QGraphicsSvgItem::removeFromIndex()\nThis method is protected and can only be called from inside a derived class.", false, &_init_fp_removeFromIndex_0, &_call_fp_removeFromIndex_0); - methods += new qt_gsi::GenericMethod ("emit_rotationChanged", "@brief Emitter for signal void QGraphicsSvgItem::rotationChanged()\nCall this method to emit this signal.", false, &_init_emitter_rotationChanged_0, &_call_emitter_rotationChanged_0); - methods += new qt_gsi::GenericMethod ("emit_scaleChanged", "@brief Emitter for signal void QGraphicsSvgItem::scaleChanged()\nCall this method to emit this signal.", false, &_init_emitter_scaleChanged_0, &_call_emitter_scaleChanged_0); methods += new qt_gsi::GenericMethod ("*sceneEvent", "@brief Virtual method bool QGraphicsSvgItem::sceneEvent(QEvent *event)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_sceneEvent_1217_0, &_call_cbs_sceneEvent_1217_0); methods += new qt_gsi::GenericMethod ("*sceneEvent", "@hide", false, &_init_cbs_sceneEvent_1217_0, &_call_cbs_sceneEvent_1217_0, &_set_callback_cbs_sceneEvent_1217_0); methods += new qt_gsi::GenericMethod ("*sceneEventFilter", "@brief Virtual method bool QGraphicsSvgItem::sceneEventFilter(QGraphicsItem *watched, QEvent *event)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_sceneEventFilter_3028_0, &_call_cbs_sceneEventFilter_3028_0); @@ -2612,13 +2327,8 @@ static gsi::Methods methods_QGraphicsSvgItem_Adaptor () { methods += new qt_gsi::GenericMethod ("type", "@brief Virtual method int QGraphicsSvgItem::type()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_type_c0_0, &_call_cbs_type_c0_0); methods += new qt_gsi::GenericMethod ("type", "@hide", true, &_init_cbs_type_c0_0, &_call_cbs_type_c0_0, &_set_callback_cbs_type_c0_0); methods += new qt_gsi::GenericMethod ("*updateMicroFocus", "@brief Method void QGraphicsSvgItem::updateMicroFocus()\nThis method is protected and can only be called from inside a derived class.", false, &_init_fp_updateMicroFocus_0, &_call_fp_updateMicroFocus_0); - methods += new qt_gsi::GenericMethod ("emit_visibleChanged", "@brief Emitter for signal void QGraphicsSvgItem::visibleChanged()\nCall this method to emit this signal.", false, &_init_emitter_visibleChanged_0, &_call_emitter_visibleChanged_0); methods += new qt_gsi::GenericMethod ("*wheelEvent", "@brief Virtual method void QGraphicsSvgItem::wheelEvent(QGraphicsSceneWheelEvent *event)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_wheelEvent_3029_0, &_call_cbs_wheelEvent_3029_0); methods += new qt_gsi::GenericMethod ("*wheelEvent", "@hide", false, &_init_cbs_wheelEvent_3029_0, &_call_cbs_wheelEvent_3029_0, &_set_callback_cbs_wheelEvent_3029_0); - methods += new qt_gsi::GenericMethod ("emit_widthChanged", "@brief Emitter for signal void QGraphicsSvgItem::widthChanged()\nCall this method to emit this signal.", false, &_init_emitter_widthChanged_0, &_call_emitter_widthChanged_0); - methods += new qt_gsi::GenericMethod ("emit_xChanged", "@brief Emitter for signal void QGraphicsSvgItem::xChanged()\nCall this method to emit this signal.", false, &_init_emitter_xChanged_0, &_call_emitter_xChanged_0); - methods += new qt_gsi::GenericMethod ("emit_yChanged", "@brief Emitter for signal void QGraphicsSvgItem::yChanged()\nCall this method to emit this signal.", false, &_init_emitter_yChanged_0, &_call_emitter_yChanged_0); - methods += new qt_gsi::GenericMethod ("emit_zChanged", "@brief Emitter for signal void QGraphicsSvgItem::zChanged()\nCall this method to emit this signal.", false, &_init_emitter_zChanged_0, &_call_emitter_zChanged_0); return methods; } diff --git a/src/gsiqt/qt5/QtSvg/gsiDeclQSvgRenderer.cc b/src/gsiqt/qt5/QtSvg/gsiDeclQSvgRenderer.cc index 09bd830cf..0ce29c9c2 100644 --- a/src/gsiqt/qt5/QtSvg/gsiDeclQSvgRenderer.cc +++ b/src/gsiqt/qt5/QtSvg/gsiDeclQSvgRenderer.cc @@ -334,6 +334,22 @@ static void _call_f_render_5097 (const qt_gsi::GenericMethod * /*decl*/, void *c } +// void QSvgRenderer::repaintNeeded() + + +static void _init_f_repaintNeeded_0 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_f_repaintNeeded_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + __SUPPRESS_UNUSED_WARNING(ret); + ((QSvgRenderer *)cls)->repaintNeeded (); +} + + // void QSvgRenderer::setCurrentFrame(int) @@ -515,14 +531,13 @@ static gsi::Methods methods_QSvgRenderer () { methods += new qt_gsi::GenericMethod ("render", "@brief Method void QSvgRenderer::render(QPainter *p)\n", false, &_init_f_render_1426, &_call_f_render_1426); methods += new qt_gsi::GenericMethod ("render", "@brief Method void QSvgRenderer::render(QPainter *p, const QRectF &bounds)\n", false, &_init_f_render_3180, &_call_f_render_3180); methods += new qt_gsi::GenericMethod ("render", "@brief Method void QSvgRenderer::render(QPainter *p, const QString &elementId, const QRectF &bounds)\n", false, &_init_f_render_5097, &_call_f_render_5097); + methods += new qt_gsi::GenericMethod ("repaintNeeded", "@brief Method void QSvgRenderer::repaintNeeded()\n", false, &_init_f_repaintNeeded_0, &_call_f_repaintNeeded_0); methods += new qt_gsi::GenericMethod ("setCurrentFrame|currentFrame=", "@brief Method void QSvgRenderer::setCurrentFrame(int)\n", false, &_init_f_setCurrentFrame_767, &_call_f_setCurrentFrame_767); methods += new qt_gsi::GenericMethod ("setFramesPerSecond|framesPerSecond=", "@brief Method void QSvgRenderer::setFramesPerSecond(int num)\n", false, &_init_f_setFramesPerSecond_767, &_call_f_setFramesPerSecond_767); methods += new qt_gsi::GenericMethod ("setViewBox|viewBox=", "@brief Method void QSvgRenderer::setViewBox(const QRect &viewbox)\n", false, &_init_f_setViewBox_1792, &_call_f_setViewBox_1792); methods += new qt_gsi::GenericMethod ("setViewBox|viewBox=", "@brief Method void QSvgRenderer::setViewBox(const QRectF &viewbox)\n", false, &_init_f_setViewBox_1862, &_call_f_setViewBox_1862); methods += new qt_gsi::GenericMethod (":viewBox", "@brief Method QRect QSvgRenderer::viewBox()\n", true, &_init_f_viewBox_c0, &_call_f_viewBox_c0); methods += new qt_gsi::GenericMethod ("viewBoxF", "@brief Method QRectF QSvgRenderer::viewBoxF()\n", true, &_init_f_viewBoxF_c0, &_call_f_viewBoxF_c0); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QSvgRenderer::destroyed(QObject *)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("repaintNeeded()", "repaintNeeded", "@brief Signal declaration for QSvgRenderer::repaintNeeded()\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QSvgRenderer::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QSvgRenderer::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -613,12 +628,6 @@ public: return QSvgRenderer::senderSignalIndex(); } - // [emitter impl] void QSvgRenderer::destroyed(QObject *) - void emitter_QSvgRenderer_destroyed_1302(QObject *arg1) - { - emit QSvgRenderer::destroyed(arg1); - } - // [adaptor impl] bool QSvgRenderer::event(QEvent *) bool cbs_event_1217_0(QEvent *arg1) { @@ -649,12 +658,6 @@ public: } } - // [emitter impl] void QSvgRenderer::repaintNeeded() - void emitter_QSvgRenderer_repaintNeeded_0() - { - emit QSvgRenderer::repaintNeeded(); - } - // [adaptor impl] void QSvgRenderer::childEvent(QChildEvent *) void cbs_childEvent_1701_0(QChildEvent *arg1) { @@ -854,24 +857,6 @@ static void _set_callback_cbs_customEvent_1217_0 (void *cls, const gsi::Callback } -// emitter void QSvgRenderer::destroyed(QObject *) - -static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - ((QSvgRenderer_Adaptor *)cls)->emitter_QSvgRenderer_destroyed_1302 (arg1); -} - - // void QSvgRenderer::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -981,20 +966,6 @@ static void _call_fp_receivers_c1731 (const qt_gsi::GenericMethod * /*decl*/, vo } -// emitter void QSvgRenderer::repaintNeeded() - -static void _init_emitter_repaintNeeded_0 (qt_gsi::GenericMethod *decl) -{ - decl->set_return (); -} - -static void _call_emitter_repaintNeeded_0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - ((QSvgRenderer_Adaptor *)cls)->emitter_QSvgRenderer_repaintNeeded_0 (); -} - - // exposed QObject *QSvgRenderer::sender() static void _init_fp_sender_c0 (qt_gsi::GenericMethod *decl) @@ -1062,7 +1033,6 @@ static gsi::Methods methods_QSvgRenderer_Adaptor () { methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QSvgRenderer::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); - methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QSvgRenderer::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QSvgRenderer::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("event", "@brief Virtual method bool QSvgRenderer::event(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0); @@ -1071,7 +1041,6 @@ static gsi::Methods methods_QSvgRenderer_Adaptor () { methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QSvgRenderer::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QSvgRenderer::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); - methods += new qt_gsi::GenericMethod ("emit_repaintNeeded", "@brief Emitter for signal void QSvgRenderer::repaintNeeded()\nCall this method to emit this signal.", false, &_init_emitter_repaintNeeded_0, &_call_emitter_repaintNeeded_0); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QSvgRenderer::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QSvgRenderer::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); methods += new qt_gsi::GenericMethod ("*timerEvent", "@brief Virtual method void QSvgRenderer::timerEvent(QTimerEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_timerEvent_1730_0, &_call_cbs_timerEvent_1730_0); diff --git a/src/gsiqt/qt5/QtSvg/gsiDeclQSvgWidget.cc b/src/gsiqt/qt5/QtSvg/gsiDeclQSvgWidget.cc index 4a1b6c838..539ce680d 100644 --- a/src/gsiqt/qt5/QtSvg/gsiDeclQSvgWidget.cc +++ b/src/gsiqt/qt5/QtSvg/gsiDeclQSvgWidget.cc @@ -231,11 +231,6 @@ static gsi::Methods methods_QSvgWidget () { methods += new qt_gsi::GenericMethod ("load", "@brief Method void QSvgWidget::load(const QByteArray &contents)\n", false, &_init_f_load_2309, &_call_f_load_2309); methods += new qt_gsi::GenericMethod ("renderer", "@brief Method QSvgRenderer *QSvgWidget::renderer()\n", true, &_init_f_renderer_c0, &_call_f_renderer_c0); methods += new qt_gsi::GenericMethod (":sizeHint", "@brief Method QSize QSvgWidget::sizeHint()\nThis is a reimplementation of QWidget::sizeHint", true, &_init_f_sizeHint_c0, &_call_f_sizeHint_c0); - methods += gsi::qt_signal ("customContextMenuRequested(const QPoint &)", "customContextMenuRequested", gsi::arg("pos"), "@brief Signal declaration for QSvgWidget::customContextMenuRequested(const QPoint &pos)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QSvgWidget::destroyed(QObject *)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("windowIconChanged(const QIcon &)", "windowIconChanged", gsi::arg("icon"), "@brief Signal declaration for QSvgWidget::windowIconChanged(const QIcon &icon)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("windowIconTextChanged(const QString &)", "windowIconTextChanged", gsi::arg("iconText"), "@brief Signal declaration for QSvgWidget::windowIconTextChanged(const QString &iconText)\nYou can bind a procedure to this signal."); - methods += gsi::qt_signal ("windowTitleChanged(const QString &)", "windowTitleChanged", gsi::arg("title"), "@brief Signal declaration for QSvgWidget::windowTitleChanged(const QString &title)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QSvgWidget::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QSvgWidget::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -327,18 +322,6 @@ public: QSvgWidget::updateMicroFocus(); } - // [emitter impl] void QSvgWidget::customContextMenuRequested(const QPoint &pos) - void emitter_QSvgWidget_customContextMenuRequested_1916(const QPoint &pos) - { - emit QSvgWidget::customContextMenuRequested(pos); - } - - // [emitter impl] void QSvgWidget::destroyed(QObject *) - void emitter_QSvgWidget_destroyed_1302(QObject *arg1) - { - emit QSvgWidget::destroyed(arg1); - } - // [adaptor impl] bool QSvgWidget::eventFilter(QObject *, QEvent *) bool cbs_eventFilter_2411_0(QObject *arg1, QEvent *arg2) { @@ -459,24 +442,6 @@ public: } } - // [emitter impl] void QSvgWidget::windowIconChanged(const QIcon &icon) - void emitter_QSvgWidget_windowIconChanged_1787(const QIcon &icon) - { - emit QSvgWidget::windowIconChanged(icon); - } - - // [emitter impl] void QSvgWidget::windowIconTextChanged(const QString &iconText) - void emitter_QSvgWidget_windowIconTextChanged_2025(const QString &iconText) - { - emit QSvgWidget::windowIconTextChanged(iconText); - } - - // [emitter impl] void QSvgWidget::windowTitleChanged(const QString &title) - void emitter_QSvgWidget_windowTitleChanged_2025(const QString &title) - { - emit QSvgWidget::windowTitleChanged(title); - } - // [adaptor impl] void QSvgWidget::actionEvent(QActionEvent *) void cbs_actionEvent_1823_0(QActionEvent *arg1) { @@ -1265,24 +1230,6 @@ static void _call_fp_create_2208 (const qt_gsi::GenericMethod * /*decl*/, void * } -// emitter void QSvgWidget::customContextMenuRequested(const QPoint &pos) - -static void _init_emitter_customContextMenuRequested_1916 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("pos"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_customContextMenuRequested_1916 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const QPoint &arg1 = gsi::arg_reader() (args, heap); - ((QSvgWidget_Adaptor *)cls)->emitter_QSvgWidget_customContextMenuRequested_1916 (arg1); -} - - // void QSvgWidget::customEvent(QEvent *) static void _init_cbs_customEvent_1217_0 (qt_gsi::GenericMethod *decl) @@ -1329,24 +1276,6 @@ static void _call_fp_destroy_1620 (const qt_gsi::GenericMethod * /*decl*/, void } -// emitter void QSvgWidget::destroyed(QObject *) - -static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - ((QSvgWidget_Adaptor *)cls)->emitter_QSvgWidget_destroyed_1302 (arg1); -} - - // void QSvgWidget::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -2366,60 +2295,6 @@ static void _set_callback_cbs_wheelEvent_1718_0 (void *cls, const gsi::Callback } -// emitter void QSvgWidget::windowIconChanged(const QIcon &icon) - -static void _init_emitter_windowIconChanged_1787 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("icon"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_windowIconChanged_1787 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const QIcon &arg1 = gsi::arg_reader() (args, heap); - ((QSvgWidget_Adaptor *)cls)->emitter_QSvgWidget_windowIconChanged_1787 (arg1); -} - - -// emitter void QSvgWidget::windowIconTextChanged(const QString &iconText) - -static void _init_emitter_windowIconTextChanged_2025 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("iconText"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_windowIconTextChanged_2025 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const QString &arg1 = gsi::arg_reader() (args, heap); - ((QSvgWidget_Adaptor *)cls)->emitter_QSvgWidget_windowIconTextChanged_2025 (arg1); -} - - -// emitter void QSvgWidget::windowTitleChanged(const QString &title) - -static void _init_emitter_windowTitleChanged_2025 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("title"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_windowTitleChanged_2025 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - const QString &arg1 = gsi::arg_reader() (args, heap); - ((QSvgWidget_Adaptor *)cls)->emitter_QSvgWidget_windowTitleChanged_2025 (arg1); -} - - namespace gsi { @@ -2440,11 +2315,9 @@ static gsi::Methods methods_QSvgWidget_Adaptor () { methods += new qt_gsi::GenericMethod ("*contextMenuEvent", "@brief Virtual method void QSvgWidget::contextMenuEvent(QContextMenuEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_contextMenuEvent_2363_0, &_call_cbs_contextMenuEvent_2363_0); methods += new qt_gsi::GenericMethod ("*contextMenuEvent", "@hide", false, &_init_cbs_contextMenuEvent_2363_0, &_call_cbs_contextMenuEvent_2363_0, &_set_callback_cbs_contextMenuEvent_2363_0); methods += new qt_gsi::GenericMethod ("*qt_create", "@brief Method void QSvgWidget::create(WId, bool initializeWindow, bool destroyOldWindow)\nThis method is protected and can only be called from inside a derived class.", false, &_init_fp_create_2208, &_call_fp_create_2208); - methods += new qt_gsi::GenericMethod ("emit_customContextMenuRequested", "@brief Emitter for signal void QSvgWidget::customContextMenuRequested(const QPoint &pos)\nCall this method to emit this signal.", false, &_init_emitter_customContextMenuRequested_1916, &_call_emitter_customContextMenuRequested_1916); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QSvgWidget::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*qt_destroy", "@brief Method void QSvgWidget::destroy(bool destroyWindow, bool destroySubWindows)\nThis method is protected and can only be called from inside a derived class.", false, &_init_fp_destroy_1620, &_call_fp_destroy_1620); - methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QSvgWidget::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QSvgWidget::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*dragEnterEvent", "@brief Virtual method void QSvgWidget::dragEnterEvent(QDragEnterEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_dragEnterEvent_2109_0, &_call_cbs_dragEnterEvent_2109_0); @@ -2530,9 +2403,6 @@ static gsi::Methods methods_QSvgWidget_Adaptor () { methods += new qt_gsi::GenericMethod ("*updateMicroFocus", "@brief Method void QSvgWidget::updateMicroFocus()\nThis method is protected and can only be called from inside a derived class.", false, &_init_fp_updateMicroFocus_0, &_call_fp_updateMicroFocus_0); methods += new qt_gsi::GenericMethod ("*wheelEvent", "@brief Virtual method void QSvgWidget::wheelEvent(QWheelEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_wheelEvent_1718_0, &_call_cbs_wheelEvent_1718_0); methods += new qt_gsi::GenericMethod ("*wheelEvent", "@hide", false, &_init_cbs_wheelEvent_1718_0, &_call_cbs_wheelEvent_1718_0, &_set_callback_cbs_wheelEvent_1718_0); - methods += new qt_gsi::GenericMethod ("emit_windowIconChanged", "@brief Emitter for signal void QSvgWidget::windowIconChanged(const QIcon &icon)\nCall this method to emit this signal.", false, &_init_emitter_windowIconChanged_1787, &_call_emitter_windowIconChanged_1787); - methods += new qt_gsi::GenericMethod ("emit_windowIconTextChanged", "@brief Emitter for signal void QSvgWidget::windowIconTextChanged(const QString &iconText)\nCall this method to emit this signal.", false, &_init_emitter_windowIconTextChanged_2025, &_call_emitter_windowIconTextChanged_2025); - methods += new qt_gsi::GenericMethod ("emit_windowTitleChanged", "@brief Emitter for signal void QSvgWidget::windowTitleChanged(const QString &title)\nCall this method to emit this signal.", false, &_init_emitter_windowTitleChanged_2025, &_call_emitter_windowTitleChanged_2025); return methods; } diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQAbstractButton.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQAbstractButton.cc index d4f2f0e27..fbba5b7ee 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQAbstractButton.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQAbstractButton.cc @@ -638,6 +638,7 @@ static gsi::Methods methods_QAbstractButton () { methods += gsi::qt_signal ("clicked(bool)", "clicked", gsi::arg("checked"), "@brief Signal declaration for QAbstractButton::clicked(bool checked)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("customContextMenuRequested(const QPoint &)", "customContextMenuRequested", gsi::arg("pos"), "@brief Signal declaration for QAbstractButton::customContextMenuRequested(const QPoint &pos)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QAbstractButton::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QAbstractButton::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("pressed()", "pressed", "@brief Signal declaration for QAbstractButton::pressed()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("released()", "released", "@brief Signal declaration for QAbstractButton::released()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("toggled(bool)", "toggled", gsi::arg("checked"), "@brief Signal declaration for QAbstractButton::toggled(bool checked)\nYou can bind a procedure to this signal."); @@ -816,6 +817,13 @@ public: } } + // [emitter impl] void QAbstractButton::objectNameChanged(const QString &objectName) + void emitter_QAbstractButton_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QAbstractButton::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QPaintEngine *QAbstractButton::paintEngine() QPaintEngine * cbs_paintEngine_c0_0() const { @@ -2586,6 +2594,24 @@ static void _set_callback_cbs_nextCheckState_0_0 (void *cls, const gsi::Callback } +// emitter void QAbstractButton::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QAbstractButton_Adaptor *)cls)->emitter_QAbstractButton_objectNameChanged_4567 (arg1); +} + + // QPaintEngine *QAbstractButton::paintEngine() static void _init_cbs_paintEngine_c0_0 (qt_gsi::GenericMethod *decl) @@ -3085,6 +3111,7 @@ static gsi::Methods methods_QAbstractButton_Adaptor () { methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nextCheckState", "@brief Virtual method void QAbstractButton::nextCheckState()\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nextCheckState_0_0, &_call_cbs_nextCheckState_0_0); methods += new qt_gsi::GenericMethod ("*nextCheckState", "@hide", false, &_init_cbs_nextCheckState_0_0, &_call_cbs_nextCheckState_0_0, &_set_callback_cbs_nextCheckState_0_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QAbstractButton::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("paintEngine", "@brief Virtual method QPaintEngine *QAbstractButton::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@hide", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0, &_set_callback_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("*paintEvent", "@brief Virtual method void QAbstractButton::paintEvent(QPaintEvent *e)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_paintEvent_1725_0, &_call_cbs_paintEvent_1725_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQAbstractItemDelegate.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQAbstractItemDelegate.cc index ba67a20f5..42dea5131 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQAbstractItemDelegate.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQAbstractItemDelegate.cc @@ -403,6 +403,7 @@ static gsi::Methods methods_QAbstractItemDelegate () { methods += gsi::qt_signal::target_type & > ("closeEditor(QWidget *, QAbstractItemDelegate::EndEditHint)", "closeEditor", gsi::arg("editor"), gsi::arg("hint"), "@brief Signal declaration for QAbstractItemDelegate::closeEditor(QWidget *editor, QAbstractItemDelegate::EndEditHint hint)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("commitData(QWidget *)", "commitData", gsi::arg("editor"), "@brief Signal declaration for QAbstractItemDelegate::commitData(QWidget *editor)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QAbstractItemDelegate::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QAbstractItemDelegate::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("sizeHintChanged(const QModelIndex &)", "sizeHintChanged", gsi::arg("arg1"), "@brief Signal declaration for QAbstractItemDelegate::sizeHintChanged(const QModelIndex &)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("elidedText", "@brief Static method QString QAbstractItemDelegate::elidedText(const QFontMetrics &fontMetrics, int width, Qt::TextElideMode mode, const QString &text)\nThis method is static and can be called without an instance.", &_init_f_elidedText_7038, &_call_f_elidedText_7038); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QAbstractItemDelegate::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); @@ -567,6 +568,13 @@ public: } } + // [emitter impl] void QAbstractItemDelegate::objectNameChanged(const QString &objectName) + void emitter_QAbstractItemDelegate_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QAbstractItemDelegate::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] void QAbstractItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) void cbs_paint_c6971_0(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const { @@ -1082,6 +1090,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QAbstractItemDelegate::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QAbstractItemDelegate_Adaptor *)cls)->emitter_QAbstractItemDelegate_objectNameChanged_4567 (arg1); +} + + // void QAbstractItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) static void _init_cbs_paint_c6971_0 (qt_gsi::GenericMethod *decl) @@ -1362,6 +1388,7 @@ static gsi::Methods methods_QAbstractItemDelegate_Adaptor () { methods += new qt_gsi::GenericMethod ("helpEvent", "@brief Virtual method bool QAbstractItemDelegate::helpEvent(QHelpEvent *event, QAbstractItemView *view, const QStyleOptionViewItem &option, const QModelIndex &index)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_helpEvent_9380_0, &_call_cbs_helpEvent_9380_0); methods += new qt_gsi::GenericMethod ("helpEvent", "@hide", false, &_init_cbs_helpEvent_9380_0, &_call_cbs_helpEvent_9380_0, &_set_callback_cbs_helpEvent_9380_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QAbstractItemDelegate::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QAbstractItemDelegate::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("paint", "@brief Virtual method void QAbstractItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paint_c6971_0, &_call_cbs_paint_c6971_0); methods += new qt_gsi::GenericMethod ("paint", "@hide", true, &_init_cbs_paint_c6971_0, &_call_cbs_paint_c6971_0, &_set_callback_cbs_paint_c6971_0); methods += new qt_gsi::GenericMethod ("paintingRoles", "@brief Virtual method QVector QAbstractItemDelegate::paintingRoles()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintingRoles_c0_0, &_call_cbs_paintingRoles_c0_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQAbstractItemView.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQAbstractItemView.cc index ab440e197..1d70ae17d 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQAbstractItemView.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQAbstractItemView.cc @@ -1472,6 +1472,7 @@ static gsi::Methods methods_QAbstractItemView () { methods += gsi::qt_signal ("doubleClicked(const QModelIndex &)", "doubleClicked", gsi::arg("index"), "@brief Signal declaration for QAbstractItemView::doubleClicked(const QModelIndex &index)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("entered(const QModelIndex &)", "entered", gsi::arg("index"), "@brief Signal declaration for QAbstractItemView::entered(const QModelIndex &index)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("iconSizeChanged(const QSize &)", "iconSizeChanged", gsi::arg("size"), "@brief Signal declaration for QAbstractItemView::iconSizeChanged(const QSize &size)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QAbstractItemView::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("pressed(const QModelIndex &)", "pressed", gsi::arg("index"), "@brief Signal declaration for QAbstractItemView::pressed(const QModelIndex &index)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("viewportEntered()", "viewportEntered", "@brief Signal declaration for QAbstractItemView::viewportEntered()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconChanged(const QIcon &)", "windowIconChanged", gsi::arg("icon"), "@brief Signal declaration for QAbstractItemView::windowIconChanged(const QIcon &icon)\nYou can bind a procedure to this signal."); @@ -1804,6 +1805,13 @@ public: } } + // [emitter impl] void QAbstractItemView::objectNameChanged(const QString &objectName) + void emitter_QAbstractItemView_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QAbstractItemView::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QPaintEngine *QAbstractItemView::paintEngine() QPaintEngine * cbs_paintEngine_c0_0() const { @@ -4633,6 +4641,24 @@ static void _set_callback_cbs_nativeEvent_4678_0 (void *cls, const gsi::Callback } +// emitter void QAbstractItemView::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QAbstractItemView_Adaptor *)cls)->emitter_QAbstractItemView_objectNameChanged_4567 (arg1); +} + + // QPaintEngine *QAbstractItemView::paintEngine() static void _init_cbs_paintEngine_c0_0 (qt_gsi::GenericMethod *decl) @@ -6036,6 +6062,7 @@ static gsi::Methods methods_QAbstractItemView_Adaptor () { methods += new qt_gsi::GenericMethod ("*moveEvent", "@hide", false, &_init_cbs_moveEvent_1624_0, &_call_cbs_moveEvent_1624_0, &_set_callback_cbs_moveEvent_1624_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@brief Virtual method bool QAbstractItemView::nativeEvent(const QByteArray &eventType, void *message, long int *result)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QAbstractItemView::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("paintEngine", "@brief Virtual method QPaintEngine *QAbstractItemView::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@hide", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0, &_set_callback_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("*paintEvent", "@brief Virtual method void QAbstractItemView::paintEvent(QPaintEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_paintEvent_1725_0, &_call_cbs_paintEvent_1725_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQAbstractScrollArea.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQAbstractScrollArea.cc index f0212bae6..d81ed6ffe 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQAbstractScrollArea.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQAbstractScrollArea.cc @@ -532,6 +532,7 @@ static gsi::Methods methods_QAbstractScrollArea () { methods += new qt_gsi::GenericMethod (":viewport", "@brief Method QWidget *QAbstractScrollArea::viewport()\n", true, &_init_f_viewport_c0, &_call_f_viewport_c0); methods += gsi::qt_signal ("customContextMenuRequested(const QPoint &)", "customContextMenuRequested", gsi::arg("pos"), "@brief Signal declaration for QAbstractScrollArea::customContextMenuRequested(const QPoint &pos)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QAbstractScrollArea::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QAbstractScrollArea::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconChanged(const QIcon &)", "windowIconChanged", gsi::arg("icon"), "@brief Signal declaration for QAbstractScrollArea::windowIconChanged(const QIcon &icon)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconTextChanged(const QString &)", "windowIconTextChanged", gsi::arg("iconText"), "@brief Signal declaration for QAbstractScrollArea::windowIconTextChanged(const QString &iconText)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowTitleChanged(const QString &)", "windowTitleChanged", gsi::arg("title"), "@brief Signal declaration for QAbstractScrollArea::windowTitleChanged(const QString &title)\nYou can bind a procedure to this signal."); @@ -711,6 +712,13 @@ public: } } + // [emitter impl] void QAbstractScrollArea::objectNameChanged(const QString &objectName) + void emitter_QAbstractScrollArea_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QAbstractScrollArea::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QPaintEngine *QAbstractScrollArea::paintEngine() QPaintEngine * cbs_paintEngine_c0_0() const { @@ -2450,6 +2458,24 @@ static void _set_callback_cbs_nativeEvent_4678_0 (void *cls, const gsi::Callback } +// emitter void QAbstractScrollArea::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QAbstractScrollArea_Adaptor *)cls)->emitter_QAbstractScrollArea_objectNameChanged_4567 (arg1); +} + + // QPaintEngine *QAbstractScrollArea::paintEngine() static void _init_cbs_paintEngine_c0_0 (qt_gsi::GenericMethod *decl) @@ -3052,6 +3078,7 @@ static gsi::Methods methods_QAbstractScrollArea_Adaptor () { methods += new qt_gsi::GenericMethod ("*moveEvent", "@hide", false, &_init_cbs_moveEvent_1624_0, &_call_cbs_moveEvent_1624_0, &_set_callback_cbs_moveEvent_1624_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@brief Virtual method bool QAbstractScrollArea::nativeEvent(const QByteArray &eventType, void *message, long int *result)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QAbstractScrollArea::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("paintEngine", "@brief Virtual method QPaintEngine *QAbstractScrollArea::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@hide", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0, &_set_callback_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("*paintEvent", "@brief Virtual method void QAbstractScrollArea::paintEvent(QPaintEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_paintEvent_1725_0, &_call_cbs_paintEvent_1725_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQAbstractSlider.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQAbstractSlider.cc index 9633b8927..3a025e8b9 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQAbstractSlider.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQAbstractSlider.cc @@ -611,6 +611,7 @@ static gsi::Methods methods_QAbstractSlider () { methods += gsi::qt_signal ("actionTriggered(int)", "actionTriggered", gsi::arg("action"), "@brief Signal declaration for QAbstractSlider::actionTriggered(int action)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("customContextMenuRequested(const QPoint &)", "customContextMenuRequested", gsi::arg("pos"), "@brief Signal declaration for QAbstractSlider::customContextMenuRequested(const QPoint &pos)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QAbstractSlider::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QAbstractSlider::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("rangeChanged(int, int)", "rangeChanged", gsi::arg("min"), gsi::arg("max"), "@brief Signal declaration for QAbstractSlider::rangeChanged(int min, int max)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("sliderMoved(int)", "sliderMoved", gsi::arg("position"), "@brief Signal declaration for QAbstractSlider::sliderMoved(int position)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("sliderPressed()", "sliderPressed", "@brief Signal declaration for QAbstractSlider::sliderPressed()\nYou can bind a procedure to this signal."); @@ -801,6 +802,13 @@ public: } } + // [emitter impl] void QAbstractSlider::objectNameChanged(const QString &objectName) + void emitter_QAbstractSlider_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QAbstractSlider::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QPaintEngine *QAbstractSlider::paintEngine() QPaintEngine * cbs_paintEngine_c0_0() const { @@ -2487,6 +2495,24 @@ static void _set_callback_cbs_nativeEvent_4678_0 (void *cls, const gsi::Callback } +// emitter void QAbstractSlider::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QAbstractSlider_Adaptor *)cls)->emitter_QAbstractSlider_objectNameChanged_4567 (arg1); +} + + // QPaintEngine *QAbstractSlider::paintEngine() static void _init_cbs_paintEngine_c0_0 (qt_gsi::GenericMethod *decl) @@ -3082,6 +3108,7 @@ static gsi::Methods methods_QAbstractSlider_Adaptor () { methods += new qt_gsi::GenericMethod ("*moveEvent", "@hide", false, &_init_cbs_moveEvent_1624_0, &_call_cbs_moveEvent_1624_0, &_set_callback_cbs_moveEvent_1624_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@brief Virtual method bool QAbstractSlider::nativeEvent(const QByteArray &eventType, void *message, long int *result)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QAbstractSlider::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("paintEngine", "@brief Virtual method QPaintEngine *QAbstractSlider::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@hide", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0, &_set_callback_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("*paintEvent", "@brief Virtual method void QAbstractSlider::paintEvent(QPaintEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_paintEvent_1725_0, &_call_cbs_paintEvent_1725_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQAbstractSpinBox.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQAbstractSpinBox.cc index edeb5280a..77abcb528 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQAbstractSpinBox.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQAbstractSpinBox.cc @@ -785,6 +785,7 @@ static gsi::Methods methods_QAbstractSpinBox () { methods += gsi::qt_signal ("customContextMenuRequested(const QPoint &)", "customContextMenuRequested", gsi::arg("pos"), "@brief Signal declaration for QAbstractSpinBox::customContextMenuRequested(const QPoint &pos)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QAbstractSpinBox::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("editingFinished()", "editingFinished", "@brief Signal declaration for QAbstractSpinBox::editingFinished()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QAbstractSpinBox::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconChanged(const QIcon &)", "windowIconChanged", gsi::arg("icon"), "@brief Signal declaration for QAbstractSpinBox::windowIconChanged(const QIcon &icon)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconTextChanged(const QString &)", "windowIconTextChanged", gsi::arg("iconText"), "@brief Signal declaration for QAbstractSpinBox::windowIconTextChanged(const QString &iconText)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowTitleChanged(const QString &)", "windowTitleChanged", gsi::arg("title"), "@brief Signal declaration for QAbstractSpinBox::windowTitleChanged(const QString &title)\nYou can bind a procedure to this signal."); @@ -1020,6 +1021,13 @@ public: } } + // [emitter impl] void QAbstractSpinBox::objectNameChanged(const QString &objectName) + void emitter_QAbstractSpinBox_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QAbstractSpinBox::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QPaintEngine *QAbstractSpinBox::paintEngine() QPaintEngine * cbs_paintEngine_c0_0() const { @@ -2768,6 +2776,24 @@ static void _set_callback_cbs_nativeEvent_4678_0 (void *cls, const gsi::Callback } +// emitter void QAbstractSpinBox::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QAbstractSpinBox_Adaptor *)cls)->emitter_QAbstractSpinBox_objectNameChanged_4567 (arg1); +} + + // QPaintEngine *QAbstractSpinBox::paintEngine() static void _init_cbs_paintEngine_c0_0 (qt_gsi::GenericMethod *decl) @@ -3309,6 +3335,7 @@ static gsi::Methods methods_QAbstractSpinBox_Adaptor () { methods += new qt_gsi::GenericMethod ("*moveEvent", "@hide", false, &_init_cbs_moveEvent_1624_0, &_call_cbs_moveEvent_1624_0, &_set_callback_cbs_moveEvent_1624_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@brief Virtual method bool QAbstractSpinBox::nativeEvent(const QByteArray &eventType, void *message, long int *result)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QAbstractSpinBox::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("paintEngine", "@brief Virtual method QPaintEngine *QAbstractSpinBox::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@hide", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0, &_set_callback_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("*paintEvent", "@brief Virtual method void QAbstractSpinBox::paintEvent(QPaintEvent *event)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_paintEvent_1725_0, &_call_cbs_paintEvent_1725_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQAction.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQAction.cc index d1401d8aa..5ac4c15d3 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQAction.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQAction.cc @@ -1106,6 +1106,7 @@ static gsi::Methods methods_QAction () { methods += gsi::qt_signal ("changed()", "changed", "@brief Signal declaration for QAction::changed()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QAction::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("hovered()", "hovered", "@brief Signal declaration for QAction::hovered()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QAction::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("toggled(bool)", "toggled", gsi::arg("arg1"), "@brief Signal declaration for QAction::toggled(bool)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("triggered(bool)", "triggered", gsi::arg("checked"), "@brief Signal declaration for QAction::triggered(bool checked)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QAction::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); @@ -1201,6 +1202,13 @@ public: emit QAction::hovered(); } + // [emitter impl] void QAction::objectNameChanged(const QString &objectName) + void emitter_QAction_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QAction::objectNameChanged(const QString &objectName)'"); + } + // [emitter impl] void QAction::toggled(bool) void emitter_QAction_toggled_864(bool arg1) { @@ -1546,6 +1554,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QAction::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QAction_Adaptor *)cls)->emitter_QAction_objectNameChanged_4567 (arg1); +} + + // exposed int QAction::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -1676,6 +1702,7 @@ static gsi::Methods methods_QAction_Adaptor () { methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("emit_hovered", "@brief Emitter for signal void QAction::hovered()\nCall this method to emit this signal.", false, &_init_emitter_hovered_0, &_call_emitter_hovered_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QAction::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QAction::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QAction::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QAction::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QAction::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQActionGroup.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQActionGroup.cc index 029125016..b7c15b693 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQActionGroup.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQActionGroup.cc @@ -363,6 +363,7 @@ static gsi::Methods methods_QActionGroup () { methods += new qt_gsi::GenericMethod ("setVisible|visible=", "@brief Method void QActionGroup::setVisible(bool)\n", false, &_init_f_setVisible_864, &_call_f_setVisible_864); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QActionGroup::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("hovered(QAction *)", "hovered", gsi::arg("arg1"), "@brief Signal declaration for QActionGroup::hovered(QAction *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QActionGroup::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("triggered(QAction *)", "triggered", gsi::arg("arg1"), "@brief Signal declaration for QActionGroup::triggered(QAction *)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QActionGroup::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QActionGroup::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); @@ -454,6 +455,13 @@ public: emit QActionGroup::hovered(arg1); } + // [emitter impl] void QActionGroup::objectNameChanged(const QString &objectName) + void emitter_QActionGroup_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QActionGroup::objectNameChanged(const QString &objectName)'"); + } + // [emitter impl] void QActionGroup::triggered(QAction *) void emitter_QActionGroup_triggered_1309(QAction *arg1) { @@ -723,6 +731,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QActionGroup::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QActionGroup_Adaptor *)cls)->emitter_QActionGroup_objectNameChanged_4567 (arg1); +} + + // exposed int QActionGroup::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -832,6 +858,7 @@ static gsi::Methods methods_QActionGroup_Adaptor () { methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("emit_hovered", "@brief Emitter for signal void QActionGroup::hovered(QAction *)\nCall this method to emit this signal.", false, &_init_emitter_hovered_1309, &_call_emitter_hovered_1309); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QActionGroup::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QActionGroup::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QActionGroup::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QActionGroup::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QActionGroup::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQApplication.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQApplication.cc index b4b3a4b4a..eb56cbc0e 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQApplication.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQApplication.cc @@ -1078,6 +1078,7 @@ static gsi::Methods methods_QApplication () { methods += new qt_gsi::GenericMethod ("setAutoSipEnabled|autoSipEnabled=", "@brief Method void QApplication::setAutoSipEnabled(const bool enabled)\n", false, &_init_f_setAutoSipEnabled_1559, &_call_f_setAutoSipEnabled_1559); methods += new qt_gsi::GenericMethod ("setStyleSheet|styleSheet=", "@brief Method void QApplication::setStyleSheet(const QString &sheet)\n", false, &_init_f_setStyleSheet_2025, &_call_f_setStyleSheet_2025); methods += new qt_gsi::GenericMethod (":styleSheet", "@brief Method QString QApplication::styleSheet()\n", true, &_init_f_styleSheet_c0, &_call_f_styleSheet_c0); + methods += gsi::qt_signal ("aboutToQuit()", "aboutToQuit", "@brief Signal declaration for QApplication::aboutToQuit()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("applicationNameChanged()", "applicationNameChanged", "@brief Signal declaration for QApplication::applicationNameChanged()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal::target_type & > ("applicationStateChanged(Qt::ApplicationState)", "applicationStateChanged", gsi::arg("state"), "@brief Signal declaration for QApplication::applicationStateChanged(Qt::ApplicationState state)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("applicationVersionChanged()", "applicationVersionChanged", "@brief Signal declaration for QApplication::applicationVersionChanged()\nYou can bind a procedure to this signal."); @@ -1089,6 +1090,7 @@ static gsi::Methods methods_QApplication () { methods += gsi::qt_signal ("fontDatabaseChanged()", "fontDatabaseChanged", "@brief Signal declaration for QApplication::fontDatabaseChanged()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("lastWindowClosed()", "lastWindowClosed", "@brief Signal declaration for QApplication::lastWindowClosed()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal::target_type & > ("layoutDirectionChanged(Qt::LayoutDirection)", "layoutDirectionChanged", gsi::arg("direction"), "@brief Signal declaration for QApplication::layoutDirectionChanged(Qt::LayoutDirection direction)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QApplication::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("organizationDomainChanged()", "organizationDomainChanged", "@brief Signal declaration for QApplication::organizationDomainChanged()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("organizationNameChanged()", "organizationNameChanged", "@brief Signal declaration for QApplication::organizationNameChanged()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("paletteChanged(const QPalette &)", "paletteChanged", gsi::arg("pal"), "@brief Signal declaration for QApplication::paletteChanged(const QPalette &pal)\nYou can bind a procedure to this signal."); @@ -1207,6 +1209,12 @@ public: return QApplication::senderSignalIndex(); } + // [emitter impl] void QApplication::aboutToQuit() + void emitter_QApplication_aboutToQuit_3584() + { + throw tl::Exception ("Can't emit private signal 'void QApplication::aboutToQuit()'"); + } + // [emitter impl] void QApplication::applicationNameChanged() void emitter_QApplication_applicationNameChanged_0() { @@ -1303,6 +1311,13 @@ public: } } + // [emitter impl] void QApplication::objectNameChanged(const QString &objectName) + void emitter_QApplication_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QApplication::objectNameChanged(const QString &objectName)'"); + } + // [emitter impl] void QApplication::organizationDomainChanged() void emitter_QApplication_organizationDomainChanged_0() { @@ -1425,6 +1440,20 @@ public: QApplication_Adaptor::~QApplication_Adaptor() { } +// emitter void QApplication::aboutToQuit() + +static void _init_emitter_aboutToQuit_3584 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_emitter_aboutToQuit_3584 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + ((QApplication_Adaptor *)cls)->emitter_QApplication_aboutToQuit_3584 (); +} + + // emitter void QApplication::applicationNameChanged() static void _init_emitter_applicationNameChanged_0 (qt_gsi::GenericMethod *decl) @@ -1775,6 +1804,24 @@ static void _set_callback_cbs_notify_2411_0 (void *cls, const gsi::Callback &cb) } +// emitter void QApplication::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QApplication_Adaptor *)cls)->emitter_QApplication_objectNameChanged_4567 (arg1); +} + + // emitter void QApplication::organizationDomainChanged() static void _init_emitter_organizationDomainChanged_0 (qt_gsi::GenericMethod *decl) @@ -1952,6 +1999,7 @@ gsi::Class &qtdecl_QApplication (); static gsi::Methods methods_QApplication_Adaptor () { gsi::Methods methods; + methods += new qt_gsi::GenericMethod ("emit_aboutToQuit", "@brief Emitter for signal void QApplication::aboutToQuit()\nCall this method to emit this signal.", false, &_init_emitter_aboutToQuit_3584, &_call_emitter_aboutToQuit_3584); methods += new qt_gsi::GenericMethod ("emit_applicationNameChanged", "@brief Emitter for signal void QApplication::applicationNameChanged()\nCall this method to emit this signal.", false, &_init_emitter_applicationNameChanged_0, &_call_emitter_applicationNameChanged_0); methods += new qt_gsi::GenericMethod ("emit_applicationStateChanged", "@brief Emitter for signal void QApplication::applicationStateChanged(Qt::ApplicationState state)\nCall this method to emit this signal.", false, &_init_emitter_applicationStateChanged_2402, &_call_emitter_applicationStateChanged_2402); methods += new qt_gsi::GenericMethod ("emit_applicationVersionChanged", "@brief Emitter for signal void QApplication::applicationVersionChanged()\nCall this method to emit this signal.", false, &_init_emitter_applicationVersionChanged_0, &_call_emitter_applicationVersionChanged_0); @@ -1976,6 +2024,7 @@ static gsi::Methods methods_QApplication_Adaptor () { methods += new qt_gsi::GenericMethod ("emit_layoutDirectionChanged", "@brief Emitter for signal void QApplication::layoutDirectionChanged(Qt::LayoutDirection direction)\nCall this method to emit this signal.", false, &_init_emitter_layoutDirectionChanged_2316, &_call_emitter_layoutDirectionChanged_2316); methods += new qt_gsi::GenericMethod ("notify", "@brief Virtual method bool QApplication::notify(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_notify_2411_0, &_call_cbs_notify_2411_0); methods += new qt_gsi::GenericMethod ("notify", "@hide", false, &_init_cbs_notify_2411_0, &_call_cbs_notify_2411_0, &_set_callback_cbs_notify_2411_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QApplication::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("emit_organizationDomainChanged", "@brief Emitter for signal void QApplication::organizationDomainChanged()\nCall this method to emit this signal.", false, &_init_emitter_organizationDomainChanged_0, &_call_emitter_organizationDomainChanged_0); methods += new qt_gsi::GenericMethod ("emit_organizationNameChanged", "@brief Emitter for signal void QApplication::organizationNameChanged()\nCall this method to emit this signal.", false, &_init_emitter_organizationNameChanged_0, &_call_emitter_organizationNameChanged_0); methods += new qt_gsi::GenericMethod ("emit_paletteChanged", "@brief Emitter for signal void QApplication::paletteChanged(const QPalette &pal)\nCall this method to emit this signal.", false, &_init_emitter_paletteChanged_2113, &_call_emitter_paletteChanged_2113); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQBoxLayout.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQBoxLayout.cc index da5525e65..fda0afc3f 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQBoxLayout.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQBoxLayout.cc @@ -807,6 +807,7 @@ static gsi::Methods methods_QBoxLayout () { methods += new qt_gsi::GenericMethod ("stretch", "@brief Method int QBoxLayout::stretch(int index)\n", true, &_init_f_stretch_c767, &_call_f_stretch_c767); methods += new qt_gsi::GenericMethod ("takeAt", "@brief Method QLayoutItem *QBoxLayout::takeAt(int)\nThis is a reimplementation of QLayout::takeAt", false, &_init_f_takeAt_767, &_call_f_takeAt_767); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QBoxLayout::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QBoxLayout::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QBoxLayout::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QBoxLayout::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -1147,6 +1148,13 @@ public: } } + // [emitter impl] void QBoxLayout::objectNameChanged(const QString &objectName) + void emitter_QBoxLayout_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QBoxLayout::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] void QBoxLayout::setGeometry(const QRect &) void cbs_setGeometry_1792_0(const QRect &arg1) { @@ -1872,6 +1880,24 @@ static void _set_callback_cbs_minimumSize_c0_0 (void *cls, const gsi::Callback & } +// emitter void QBoxLayout::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QBoxLayout_Adaptor *)cls)->emitter_QBoxLayout_objectNameChanged_4567 (arg1); +} + + // exposed int QBoxLayout::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -2119,6 +2145,7 @@ static gsi::Methods methods_QBoxLayout_Adaptor () { methods += new qt_gsi::GenericMethod ("minimumHeightForWidth", "@hide", true, &_init_cbs_minimumHeightForWidth_c767_0, &_call_cbs_minimumHeightForWidth_c767_0, &_set_callback_cbs_minimumHeightForWidth_c767_0); methods += new qt_gsi::GenericMethod ("minimumSize", "@brief Virtual method QSize QBoxLayout::minimumSize()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_minimumSize_c0_0, &_call_cbs_minimumSize_c0_0); methods += new qt_gsi::GenericMethod ("minimumSize", "@hide", true, &_init_cbs_minimumSize_c0_0, &_call_cbs_minimumSize_c0_0, &_set_callback_cbs_minimumSize_c0_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QBoxLayout::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QBoxLayout::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QBoxLayout::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QBoxLayout::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQButtonGroup.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQButtonGroup.cc index 9ade1938f..92d74e8ed 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQButtonGroup.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQButtonGroup.cc @@ -315,6 +315,7 @@ static gsi::Methods methods_QButtonGroup () { methods += gsi::qt_signal ("buttonToggled(QAbstractButton *, bool)", "buttonToggled_object", gsi::arg("arg1"), gsi::arg("arg2"), "@brief Signal declaration for QButtonGroup::buttonToggled(QAbstractButton *, bool)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("buttonToggled(int, bool)", "buttonToggled_int", gsi::arg("arg1"), gsi::arg("arg2"), "@brief Signal declaration for QButtonGroup::buttonToggled(int, bool)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QButtonGroup::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QButtonGroup::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QButtonGroup::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QButtonGroup::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -453,6 +454,13 @@ public: } } + // [emitter impl] void QButtonGroup::objectNameChanged(const QString &objectName) + void emitter_QButtonGroup_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QButtonGroup::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] void QButtonGroup::childEvent(QChildEvent *) void cbs_childEvent_1701_0(QChildEvent *arg1) { @@ -848,6 +856,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QButtonGroup::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QButtonGroup_Adaptor *)cls)->emitter_QButtonGroup_objectNameChanged_4567 (arg1); +} + + // exposed int QButtonGroup::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -946,6 +972,7 @@ static gsi::Methods methods_QButtonGroup_Adaptor () { methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QButtonGroup::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QButtonGroup::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QButtonGroup::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QButtonGroup::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QButtonGroup::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QButtonGroup::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQCalendarWidget.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQCalendarWidget.cc index 490689ecd..b05672b6b 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQCalendarWidget.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQCalendarWidget.cc @@ -925,6 +925,7 @@ static gsi::Methods methods_QCalendarWidget () { methods += gsi::qt_signal ("currentPageChanged(int, int)", "currentPageChanged", gsi::arg("year"), gsi::arg("month"), "@brief Signal declaration for QCalendarWidget::currentPageChanged(int year, int month)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("customContextMenuRequested(const QPoint &)", "customContextMenuRequested", gsi::arg("pos"), "@brief Signal declaration for QCalendarWidget::customContextMenuRequested(const QPoint &pos)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QCalendarWidget::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QCalendarWidget::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("selectionChanged()", "selectionChanged", "@brief Signal declaration for QCalendarWidget::selectionChanged()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconChanged(const QIcon &)", "windowIconChanged", gsi::arg("icon"), "@brief Signal declaration for QCalendarWidget::windowIconChanged(const QIcon &icon)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconTextChanged(const QString &)", "windowIconTextChanged", gsi::arg("iconText"), "@brief Signal declaration for QCalendarWidget::windowIconTextChanged(const QString &iconText)\nYou can bind a procedure to this signal."); @@ -1108,6 +1109,13 @@ public: } } + // [emitter impl] void QCalendarWidget::objectNameChanged(const QString &objectName) + void emitter_QCalendarWidget_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QCalendarWidget::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QPaintEngine *QCalendarWidget::paintEngine() QPaintEngine * cbs_paintEngine_c0_0() const { @@ -2824,6 +2832,24 @@ static void _set_callback_cbs_nativeEvent_4678_0 (void *cls, const gsi::Callback } +// emitter void QCalendarWidget::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QCalendarWidget_Adaptor *)cls)->emitter_QCalendarWidget_objectNameChanged_4567 (arg1); +} + + // void QCalendarWidget::paintCell(QPainter *painter, const QRect &rect, const QDate &date) static void _init_cbs_paintCell_c4778_0 (qt_gsi::GenericMethod *decl) @@ -3351,6 +3377,7 @@ static gsi::Methods methods_QCalendarWidget_Adaptor () { methods += new qt_gsi::GenericMethod ("*moveEvent", "@hide", false, &_init_cbs_moveEvent_1624_0, &_call_cbs_moveEvent_1624_0, &_set_callback_cbs_moveEvent_1624_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@brief Virtual method bool QCalendarWidget::nativeEvent(const QByteArray &eventType, void *message, long int *result)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QCalendarWidget::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*paintCell", "@brief Virtual method void QCalendarWidget::paintCell(QPainter *painter, const QRect &rect, const QDate &date)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintCell_c4778_0, &_call_cbs_paintCell_c4778_0); methods += new qt_gsi::GenericMethod ("*paintCell", "@hide", true, &_init_cbs_paintCell_c4778_0, &_call_cbs_paintCell_c4778_0, &_set_callback_cbs_paintCell_c4778_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@brief Virtual method QPaintEngine *QCalendarWidget::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQCheckBox.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQCheckBox.cc index c757b8502..bf91222fe 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQCheckBox.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQCheckBox.cc @@ -267,6 +267,7 @@ static gsi::Methods methods_QCheckBox () { methods += gsi::qt_signal ("clicked(bool)", "clicked", gsi::arg("checked"), "@brief Signal declaration for QCheckBox::clicked(bool checked)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("customContextMenuRequested(const QPoint &)", "customContextMenuRequested", gsi::arg("pos"), "@brief Signal declaration for QCheckBox::customContextMenuRequested(const QPoint &pos)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QCheckBox::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QCheckBox::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("pressed()", "pressed", "@brief Signal declaration for QCheckBox::pressed()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("released()", "released", "@brief Signal declaration for QCheckBox::released()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("stateChanged(int)", "stateChanged", gsi::arg("arg1"), "@brief Signal declaration for QCheckBox::stateChanged(int)\nYou can bind a procedure to this signal."); @@ -463,6 +464,13 @@ public: } } + // [emitter impl] void QCheckBox::objectNameChanged(const QString &objectName) + void emitter_QCheckBox_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QCheckBox::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QPaintEngine *QCheckBox::paintEngine() QPaintEngine * cbs_paintEngine_c0_0() const { @@ -2278,6 +2286,24 @@ static void _set_callback_cbs_nextCheckState_0_0 (void *cls, const gsi::Callback } +// emitter void QCheckBox::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QCheckBox_Adaptor *)cls)->emitter_QCheckBox_objectNameChanged_4567 (arg1); +} + + // QPaintEngine *QCheckBox::paintEngine() static void _init_cbs_paintEngine_c0_0 (qt_gsi::GenericMethod *decl) @@ -2797,6 +2823,7 @@ static gsi::Methods methods_QCheckBox_Adaptor () { methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nextCheckState", "@brief Virtual method void QCheckBox::nextCheckState()\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nextCheckState_0_0, &_call_cbs_nextCheckState_0_0); methods += new qt_gsi::GenericMethod ("*nextCheckState", "@hide", false, &_init_cbs_nextCheckState_0_0, &_call_cbs_nextCheckState_0_0, &_set_callback_cbs_nextCheckState_0_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QCheckBox::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("paintEngine", "@brief Virtual method QPaintEngine *QCheckBox::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@hide", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0, &_set_callback_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("*paintEvent", "@brief Virtual method void QCheckBox::paintEvent(QPaintEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_paintEvent_1725_0, &_call_cbs_paintEvent_1725_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQColorDialog.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQColorDialog.cc index b798d95c4..59e97ed58 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQColorDialog.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQColorDialog.cc @@ -511,6 +511,7 @@ static gsi::Methods methods_QColorDialog () { methods += gsi::qt_signal ("customContextMenuRequested(const QPoint &)", "customContextMenuRequested", gsi::arg("pos"), "@brief Signal declaration for QColorDialog::customContextMenuRequested(const QPoint &pos)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QColorDialog::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("finished(int)", "finished", gsi::arg("result"), "@brief Signal declaration for QColorDialog::finished(int result)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QColorDialog::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("rejected()", "rejected", "@brief Signal declaration for QColorDialog::rejected()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconChanged(const QIcon &)", "windowIconChanged", gsi::arg("icon"), "@brief Signal declaration for QColorDialog::windowIconChanged(const QIcon &icon)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconTextChanged(const QString &)", "windowIconTextChanged", gsi::arg("iconText"), "@brief Signal declaration for QColorDialog::windowIconTextChanged(const QString &iconText)\nYou can bind a procedure to this signal."); @@ -744,6 +745,13 @@ public: } } + // [emitter impl] void QColorDialog::objectNameChanged(const QString &objectName) + void emitter_QColorDialog_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QColorDialog::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] void QColorDialog::open() void cbs_open_0_0() { @@ -2608,6 +2616,24 @@ static void _set_callback_cbs_nativeEvent_4678_0 (void *cls, const gsi::Callback } +// emitter void QColorDialog::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QColorDialog_Adaptor *)cls)->emitter_QColorDialog_objectNameChanged_4567 (arg1); +} + + // void QColorDialog::open() static void _init_cbs_open_0_0 (qt_gsi::GenericMethod *decl) @@ -3120,6 +3146,7 @@ static gsi::Methods methods_QColorDialog_Adaptor () { methods += new qt_gsi::GenericMethod ("*moveEvent", "@hide", false, &_init_cbs_moveEvent_1624_0, &_call_cbs_moveEvent_1624_0, &_set_callback_cbs_moveEvent_1624_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@brief Virtual method bool QColorDialog::nativeEvent(const QByteArray &eventType, void *message, long int *result)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QColorDialog::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("open", "@brief Virtual method void QColorDialog::open()\nThis method can be reimplemented in a derived class.", false, &_init_cbs_open_0_0, &_call_cbs_open_0_0); methods += new qt_gsi::GenericMethod ("open", "@hide", false, &_init_cbs_open_0_0, &_call_cbs_open_0_0, &_set_callback_cbs_open_0_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@brief Virtual method QPaintEngine *QColorDialog::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQColumnView.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQColumnView.cc index 87c3d1e01..b830cb713 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQColumnView.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQColumnView.cc @@ -443,6 +443,7 @@ static gsi::Methods methods_QColumnView () { methods += gsi::qt_signal ("doubleClicked(const QModelIndex &)", "doubleClicked", gsi::arg("index"), "@brief Signal declaration for QColumnView::doubleClicked(const QModelIndex &index)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("entered(const QModelIndex &)", "entered", gsi::arg("index"), "@brief Signal declaration for QColumnView::entered(const QModelIndex &index)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("iconSizeChanged(const QSize &)", "iconSizeChanged", gsi::arg("size"), "@brief Signal declaration for QColumnView::iconSizeChanged(const QSize &size)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QColumnView::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("pressed(const QModelIndex &)", "pressed", gsi::arg("index"), "@brief Signal declaration for QColumnView::pressed(const QModelIndex &index)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("updatePreviewWidget(const QModelIndex &)", "updatePreviewWidget", gsi::arg("index"), "@brief Signal declaration for QColumnView::updatePreviewWidget(const QModelIndex &index)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("viewportEntered()", "viewportEntered", "@brief Signal declaration for QColumnView::viewportEntered()\nYou can bind a procedure to this signal."); @@ -780,6 +781,13 @@ public: } } + // [emitter impl] void QColumnView::objectNameChanged(const QString &objectName) + void emitter_QColumnView_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QColumnView::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QPaintEngine *QColumnView::paintEngine() QPaintEngine * cbs_paintEngine_c0_0() const { @@ -3664,6 +3672,24 @@ static void _set_callback_cbs_nativeEvent_4678_0 (void *cls, const gsi::Callback } +// emitter void QColumnView::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QColumnView_Adaptor *)cls)->emitter_QColumnView_objectNameChanged_4567 (arg1); +} + + // QPaintEngine *QColumnView::paintEngine() static void _init_cbs_paintEngine_c0_0 (qt_gsi::GenericMethod *decl) @@ -5088,6 +5114,7 @@ static gsi::Methods methods_QColumnView_Adaptor () { methods += new qt_gsi::GenericMethod ("*moveEvent", "@hide", false, &_init_cbs_moveEvent_1624_0, &_call_cbs_moveEvent_1624_0, &_set_callback_cbs_moveEvent_1624_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@brief Virtual method bool QColumnView::nativeEvent(const QByteArray &eventType, void *message, long int *result)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QColumnView::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("paintEngine", "@brief Virtual method QPaintEngine *QColumnView::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@hide", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0, &_set_callback_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("*paintEvent", "@brief Virtual method void QColumnView::paintEvent(QPaintEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_paintEvent_1725_0, &_call_cbs_paintEvent_1725_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQComboBox.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQComboBox.cc index bb94f19b7..0b67d5648 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQComboBox.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQComboBox.cc @@ -1530,6 +1530,7 @@ static gsi::Methods methods_QComboBox () { methods += gsi::qt_signal ("editTextChanged(const QString &)", "editTextChanged", gsi::arg("arg1"), "@brief Signal declaration for QComboBox::editTextChanged(const QString &)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("highlighted(int)", "highlighted", gsi::arg("index"), "@brief Signal declaration for QComboBox::highlighted(int index)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("highlighted(const QString &)", "highlighted_qs", gsi::arg("arg1"), "@brief Signal declaration for QComboBox::highlighted(const QString &)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QComboBox::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconChanged(const QIcon &)", "windowIconChanged", gsi::arg("icon"), "@brief Signal declaration for QComboBox::windowIconChanged(const QIcon &icon)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconTextChanged(const QString &)", "windowIconTextChanged", gsi::arg("iconText"), "@brief Signal declaration for QComboBox::windowIconTextChanged(const QString &iconText)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowTitleChanged(const QString &)", "windowTitleChanged", gsi::arg("title"), "@brief Signal declaration for QComboBox::windowTitleChanged(const QString &title)\nYou can bind a procedure to this signal."); @@ -1782,6 +1783,13 @@ public: } } + // [emitter impl] void QComboBox::objectNameChanged(const QString &objectName) + void emitter_QComboBox_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QComboBox::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QPaintEngine *QComboBox::paintEngine() QPaintEngine * cbs_paintEngine_c0_0() const { @@ -3589,6 +3597,24 @@ static void _set_callback_cbs_nativeEvent_4678_0 (void *cls, const gsi::Callback } +// emitter void QComboBox::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QComboBox_Adaptor *)cls)->emitter_QComboBox_objectNameChanged_4567 (arg1); +} + + // QPaintEngine *QComboBox::paintEngine() static void _init_cbs_paintEngine_c0_0 (qt_gsi::GenericMethod *decl) @@ -4066,6 +4092,7 @@ static gsi::Methods methods_QComboBox_Adaptor () { methods += new qt_gsi::GenericMethod ("*moveEvent", "@hide", false, &_init_cbs_moveEvent_1624_0, &_call_cbs_moveEvent_1624_0, &_set_callback_cbs_moveEvent_1624_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@brief Virtual method bool QComboBox::nativeEvent(const QByteArray &eventType, void *message, long int *result)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QComboBox::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("paintEngine", "@brief Virtual method QPaintEngine *QComboBox::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@hide", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0, &_set_callback_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("*paintEvent", "@brief Virtual method void QComboBox::paintEvent(QPaintEvent *e)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_paintEvent_1725_0, &_call_cbs_paintEvent_1725_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQCommandLinkButton.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQCommandLinkButton.cc index 6303fb185..c2cb14b40 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQCommandLinkButton.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQCommandLinkButton.cc @@ -199,6 +199,7 @@ static gsi::Methods methods_QCommandLinkButton () { methods += gsi::qt_signal ("clicked(bool)", "clicked", gsi::arg("checked"), "@brief Signal declaration for QCommandLinkButton::clicked(bool checked)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("customContextMenuRequested(const QPoint &)", "customContextMenuRequested", gsi::arg("pos"), "@brief Signal declaration for QCommandLinkButton::customContextMenuRequested(const QPoint &pos)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QCommandLinkButton::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QCommandLinkButton::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("pressed()", "pressed", "@brief Signal declaration for QCommandLinkButton::pressed()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("released()", "released", "@brief Signal declaration for QCommandLinkButton::released()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("toggled(bool)", "toggled", gsi::arg("checked"), "@brief Signal declaration for QCommandLinkButton::toggled(bool checked)\nYou can bind a procedure to this signal."); @@ -376,6 +377,13 @@ public: } } + // [emitter impl] void QCommandLinkButton::objectNameChanged(const QString &objectName) + void emitter_QCommandLinkButton_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QCommandLinkButton::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QPaintEngine *QCommandLinkButton::paintEngine() QPaintEngine * cbs_paintEngine_c0_0() const { @@ -2239,6 +2247,24 @@ static void _set_callback_cbs_nextCheckState_0_0 (void *cls, const gsi::Callback } +// emitter void QCommandLinkButton::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QCommandLinkButton_Adaptor *)cls)->emitter_QCommandLinkButton_objectNameChanged_4567 (arg1); +} + + // QPaintEngine *QCommandLinkButton::paintEngine() static void _init_cbs_paintEngine_c0_0 (qt_gsi::GenericMethod *decl) @@ -2741,6 +2767,7 @@ static gsi::Methods methods_QCommandLinkButton_Adaptor () { methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nextCheckState", "@brief Virtual method void QCommandLinkButton::nextCheckState()\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nextCheckState_0_0, &_call_cbs_nextCheckState_0_0); methods += new qt_gsi::GenericMethod ("*nextCheckState", "@hide", false, &_init_cbs_nextCheckState_0_0, &_call_cbs_nextCheckState_0_0, &_set_callback_cbs_nextCheckState_0_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QCommandLinkButton::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("paintEngine", "@brief Virtual method QPaintEngine *QCommandLinkButton::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@hide", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0, &_set_callback_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("*paintEvent", "@brief Virtual method void QCommandLinkButton::paintEvent(QPaintEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_paintEvent_1725_0, &_call_cbs_paintEvent_1725_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQCommonStyle.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQCommonStyle.cc index 7770dc238..2cb0dda53 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQCommonStyle.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQCommonStyle.cc @@ -599,6 +599,7 @@ static gsi::Methods methods_QCommonStyle () { methods += new qt_gsi::GenericMethod ("unpolish", "@brief Method void QCommonStyle::unpolish(QWidget *widget)\nThis is a reimplementation of QStyle::unpolish", false, &_init_f_unpolish_1315, &_call_f_unpolish_1315); methods += new qt_gsi::GenericMethod ("unpolish", "@brief Method void QCommonStyle::unpolish(QApplication *application)\nThis is a reimplementation of QStyle::unpolish", false, &_init_f_unpolish_1843, &_call_f_unpolish_1843); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QCommonStyle::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QCommonStyle::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QCommonStyle::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QCommonStyle::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -833,6 +834,13 @@ public: } } + // [emitter impl] void QCommonStyle::objectNameChanged(const QString &objectName) + void emitter_QCommonStyle_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QCommonStyle::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] int QCommonStyle::pixelMetric(QStyle::PixelMetric m, const QStyleOption *opt, const QWidget *widget) int cbs_pixelMetric_c6642_2(const qt_gsi::Converter::target_type & m, const QStyleOption *opt, const QWidget *widget) const { @@ -1626,6 +1634,24 @@ static void _set_callback_cbs_layoutSpacing_c11697_2 (void *cls, const gsi::Call } +// emitter void QCommonStyle::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QCommonStyle_Adaptor *)cls)->emitter_QCommonStyle_objectNameChanged_4567 (arg1); +} + + // int QCommonStyle::pixelMetric(QStyle::PixelMetric m, const QStyleOption *opt, const QWidget *widget) static void _init_cbs_pixelMetric_c6642_2 (qt_gsi::GenericMethod *decl) @@ -2087,6 +2113,7 @@ static gsi::Methods methods_QCommonStyle_Adaptor () { methods += new qt_gsi::GenericMethod ("itemTextRect", "@hide", true, &_init_cbs_itemTextRect_c7544_0, &_call_cbs_itemTextRect_c7544_0, &_set_callback_cbs_itemTextRect_c7544_0); methods += new qt_gsi::GenericMethod ("layoutSpacing", "@brief Virtual method int QCommonStyle::layoutSpacing(QSizePolicy::ControlType control1, QSizePolicy::ControlType control2, Qt::Orientation orientation, const QStyleOption *option, const QWidget *widget)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_layoutSpacing_c11697_2, &_call_cbs_layoutSpacing_c11697_2); methods += new qt_gsi::GenericMethod ("layoutSpacing", "@hide", true, &_init_cbs_layoutSpacing_c11697_2, &_call_cbs_layoutSpacing_c11697_2, &_set_callback_cbs_layoutSpacing_c11697_2); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QCommonStyle::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("pixelMetric", "@brief Virtual method int QCommonStyle::pixelMetric(QStyle::PixelMetric m, const QStyleOption *opt, const QWidget *widget)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_pixelMetric_c6642_2, &_call_cbs_pixelMetric_c6642_2); methods += new qt_gsi::GenericMethod ("pixelMetric", "@hide", true, &_init_cbs_pixelMetric_c6642_2, &_call_cbs_pixelMetric_c6642_2, &_set_callback_cbs_pixelMetric_c6642_2); methods += new qt_gsi::GenericMethod ("polish", "@brief Virtual method void QCommonStyle::polish(QPalette &)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_polish_1418_0, &_call_cbs_polish_1418_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQCompleter.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQCompleter.cc index d22cc533a..e102393f0 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQCompleter.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQCompleter.cc @@ -726,6 +726,7 @@ static gsi::Methods methods_QCompleter () { methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QCompleter::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("highlighted(const QString &)", "highlighted_qs", gsi::arg("text"), "@brief Signal declaration for QCompleter::highlighted(const QString &text)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("highlighted(const QModelIndex &)", "highlighted", gsi::arg("index"), "@brief Signal declaration for QCompleter::highlighted(const QModelIndex &index)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QCompleter::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QCompleter::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QCompleter::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -834,6 +835,13 @@ public: emit QCompleter::highlighted(index); } + // [emitter impl] void QCompleter::objectNameChanged(const QString &objectName) + void emitter_QCompleter_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QCompleter::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QString QCompleter::pathFromIndex(const QModelIndex &index) QString cbs_pathFromIndex_c2395_0(const QModelIndex &index) const { @@ -1255,6 +1263,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QCompleter::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QCompleter_Adaptor *)cls)->emitter_QCompleter_objectNameChanged_4567 (arg1); +} + + // QString QCompleter::pathFromIndex(const QModelIndex &index) static void _init_cbs_pathFromIndex_c2395_0 (qt_gsi::GenericMethod *decl) @@ -1397,6 +1423,7 @@ static gsi::Methods methods_QCompleter_Adaptor () { methods += new qt_gsi::GenericMethod ("emit_highlighted_qs", "@brief Emitter for signal void QCompleter::highlighted(const QString &text)\nCall this method to emit this signal.", false, &_init_emitter_highlighted_2025, &_call_emitter_highlighted_2025); methods += new qt_gsi::GenericMethod ("emit_highlighted", "@brief Emitter for signal void QCompleter::highlighted(const QModelIndex &index)\nCall this method to emit this signal.", false, &_init_emitter_highlighted_2395, &_call_emitter_highlighted_2395); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QCompleter::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QCompleter::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("pathFromIndex", "@brief Virtual method QString QCompleter::pathFromIndex(const QModelIndex &index)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_pathFromIndex_c2395_0, &_call_cbs_pathFromIndex_c2395_0); methods += new qt_gsi::GenericMethod ("pathFromIndex", "@hide", true, &_init_cbs_pathFromIndex_c2395_0, &_call_cbs_pathFromIndex_c2395_0, &_set_callback_cbs_pathFromIndex_c2395_0); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QCompleter::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQDataWidgetMapper.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQDataWidgetMapper.cc index ee2bcc259..a468f6262 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQDataWidgetMapper.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQDataWidgetMapper.cc @@ -610,6 +610,7 @@ static gsi::Methods methods_QDataWidgetMapper () { methods += new qt_gsi::GenericMethod ("toPrevious", "@brief Method void QDataWidgetMapper::toPrevious()\n", false, &_init_f_toPrevious_0, &_call_f_toPrevious_0); methods += gsi::qt_signal ("currentIndexChanged(int)", "currentIndexChanged", gsi::arg("index"), "@brief Signal declaration for QDataWidgetMapper::currentIndexChanged(int index)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QDataWidgetMapper::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QDataWidgetMapper::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QDataWidgetMapper::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QDataWidgetMapper::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -706,6 +707,13 @@ public: } } + // [emitter impl] void QDataWidgetMapper::objectNameChanged(const QString &objectName) + void emitter_QDataWidgetMapper_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QDataWidgetMapper::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] void QDataWidgetMapper::setCurrentIndex(int index) void cbs_setCurrentIndex_767_0(int index) { @@ -985,6 +993,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QDataWidgetMapper::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QDataWidgetMapper_Adaptor *)cls)->emitter_QDataWidgetMapper_objectNameChanged_4567 (arg1); +} + + // exposed int QDataWidgetMapper::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -1100,6 +1126,7 @@ static gsi::Methods methods_QDataWidgetMapper_Adaptor () { methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QDataWidgetMapper::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QDataWidgetMapper::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QDataWidgetMapper::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QDataWidgetMapper::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QDataWidgetMapper::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QDataWidgetMapper::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQDateEdit.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQDateEdit.cc index 93f6df8d1..02eeadcbc 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQDateEdit.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQDateEdit.cc @@ -167,6 +167,7 @@ static gsi::Methods methods_QDateEdit () { methods += gsi::qt_signal ("dateTimeChanged(const QDateTime &)", "dateTimeChanged", gsi::arg("dateTime"), "@brief Signal declaration for QDateEdit::dateTimeChanged(const QDateTime &dateTime)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QDateEdit::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("editingFinished()", "editingFinished", "@brief Signal declaration for QDateEdit::editingFinished()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QDateEdit::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("timeChanged(const QTime &)", "timeChanged", gsi::arg("time"), "@brief Signal declaration for QDateEdit::timeChanged(const QTime &time)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("userDateChanged(const QDate &)", "userDateChanged", gsi::arg("date"), "@brief Signal declaration for QDateEdit::userDateChanged(const QDate &date)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconChanged(const QIcon &)", "windowIconChanged", gsi::arg("icon"), "@brief Signal declaration for QDateEdit::windowIconChanged(const QIcon &icon)\nYou can bind a procedure to this signal."); @@ -413,6 +414,13 @@ public: } } + // [emitter impl] void QDateEdit::objectNameChanged(const QString &objectName) + void emitter_QDateEdit_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QDateEdit::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QPaintEngine *QDateEdit::paintEngine() QPaintEngine * cbs_paintEngine_c0_0() const { @@ -2300,6 +2308,24 @@ static void _set_callback_cbs_nativeEvent_4678_0 (void *cls, const gsi::Callback } +// emitter void QDateEdit::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QDateEdit_Adaptor *)cls)->emitter_QDateEdit_objectNameChanged_4567 (arg1); +} + + // QPaintEngine *QDateEdit::paintEngine() static void _init_cbs_paintEngine_c0_0 (qt_gsi::GenericMethod *decl) @@ -2905,6 +2931,7 @@ static gsi::Methods methods_QDateEdit_Adaptor () { methods += new qt_gsi::GenericMethod ("*moveEvent", "@hide", false, &_init_cbs_moveEvent_1624_0, &_call_cbs_moveEvent_1624_0, &_set_callback_cbs_moveEvent_1624_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@brief Virtual method bool QDateEdit::nativeEvent(const QByteArray &eventType, void *message, long int *result)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QDateEdit::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("paintEngine", "@brief Virtual method QPaintEngine *QDateEdit::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@hide", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0, &_set_callback_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("*paintEvent", "@brief Virtual method void QDateEdit::paintEvent(QPaintEvent *event)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_paintEvent_1725_0, &_call_cbs_paintEvent_1725_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQDateTimeEdit.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQDateTimeEdit.cc index c99745d54..3bc5c7939 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQDateTimeEdit.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQDateTimeEdit.cc @@ -1063,6 +1063,7 @@ static gsi::Methods methods_QDateTimeEdit () { methods += gsi::qt_signal ("dateTimeChanged(const QDateTime &)", "dateTimeChanged", gsi::arg("dateTime"), "@brief Signal declaration for QDateTimeEdit::dateTimeChanged(const QDateTime &dateTime)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QDateTimeEdit::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("editingFinished()", "editingFinished", "@brief Signal declaration for QDateTimeEdit::editingFinished()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QDateTimeEdit::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("timeChanged(const QTime &)", "timeChanged", gsi::arg("time"), "@brief Signal declaration for QDateTimeEdit::timeChanged(const QTime &time)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconChanged(const QIcon &)", "windowIconChanged", gsi::arg("icon"), "@brief Signal declaration for QDateTimeEdit::windowIconChanged(const QIcon &icon)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconTextChanged(const QString &)", "windowIconTextChanged", gsi::arg("iconText"), "@brief Signal declaration for QDateTimeEdit::windowIconTextChanged(const QString &iconText)\nYou can bind a procedure to this signal."); @@ -1332,6 +1333,13 @@ public: } } + // [emitter impl] void QDateTimeEdit::objectNameChanged(const QString &objectName) + void emitter_QDateTimeEdit_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QDateTimeEdit::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QPaintEngine *QDateTimeEdit::paintEngine() QPaintEngine * cbs_paintEngine_c0_0() const { @@ -3255,6 +3263,24 @@ static void _set_callback_cbs_nativeEvent_4678_0 (void *cls, const gsi::Callback } +// emitter void QDateTimeEdit::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QDateTimeEdit_Adaptor *)cls)->emitter_QDateTimeEdit_objectNameChanged_4567 (arg1); +} + + // QPaintEngine *QDateTimeEdit::paintEngine() static void _init_cbs_paintEngine_c0_0 (qt_gsi::GenericMethod *decl) @@ -3844,6 +3870,7 @@ static gsi::Methods methods_QDateTimeEdit_Adaptor () { methods += new qt_gsi::GenericMethod ("*moveEvent", "@hide", false, &_init_cbs_moveEvent_1624_0, &_call_cbs_moveEvent_1624_0, &_set_callback_cbs_moveEvent_1624_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@brief Virtual method bool QDateTimeEdit::nativeEvent(const QByteArray &eventType, void *message, long int *result)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QDateTimeEdit::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("paintEngine", "@brief Virtual method QPaintEngine *QDateTimeEdit::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@hide", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0, &_set_callback_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("*paintEvent", "@brief Virtual method void QDateTimeEdit::paintEvent(QPaintEvent *event)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_paintEvent_1725_0, &_call_cbs_paintEvent_1725_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQDesktopWidget.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQDesktopWidget.cc index b3c3cfd7e..88828a897 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQDesktopWidget.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQDesktopWidget.cc @@ -402,6 +402,7 @@ static gsi::Methods methods_QDesktopWidget () { methods += new qt_gsi::GenericMethod ("screenNumber", "@brief Method int QDesktopWidget::screenNumber(const QPoint &)\n", true, &_init_f_screenNumber_c1916, &_call_f_screenNumber_c1916); methods += gsi::qt_signal ("customContextMenuRequested(const QPoint &)", "customContextMenuRequested", gsi::arg("pos"), "@brief Signal declaration for QDesktopWidget::customContextMenuRequested(const QPoint &pos)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QDesktopWidget::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QDesktopWidget::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("resized(int)", "resized", gsi::arg("arg1"), "@brief Signal declaration for QDesktopWidget::resized(int)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("screenCountChanged(int)", "screenCountChanged", gsi::arg("arg1"), "@brief Signal declaration for QDesktopWidget::screenCountChanged(int)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconChanged(const QIcon &)", "windowIconChanged", gsi::arg("icon"), "@brief Signal declaration for QDesktopWidget::windowIconChanged(const QIcon &icon)\nYou can bind a procedure to this signal."); @@ -568,6 +569,13 @@ public: } } + // [emitter impl] void QDesktopWidget::objectNameChanged(const QString &objectName) + void emitter_QDesktopWidget_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QDesktopWidget::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QPaintEngine *QDesktopWidget::paintEngine() QPaintEngine * cbs_paintEngine_c0_0() const { @@ -2204,6 +2212,24 @@ static void _set_callback_cbs_nativeEvent_4678_0 (void *cls, const gsi::Callback } +// emitter void QDesktopWidget::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QDesktopWidget_Adaptor *)cls)->emitter_QDesktopWidget_objectNameChanged_4567 (arg1); +} + + // QPaintEngine *QDesktopWidget::paintEngine() static void _init_cbs_paintEngine_c0_0 (qt_gsi::GenericMethod *decl) @@ -2704,6 +2730,7 @@ static gsi::Methods methods_QDesktopWidget_Adaptor () { methods += new qt_gsi::GenericMethod ("*moveEvent", "@hide", false, &_init_cbs_moveEvent_1624_0, &_call_cbs_moveEvent_1624_0, &_set_callback_cbs_moveEvent_1624_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@brief Virtual method bool QDesktopWidget::nativeEvent(const QByteArray &eventType, void *message, long int *result)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QDesktopWidget::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("paintEngine", "@brief Virtual method QPaintEngine *QDesktopWidget::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@hide", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0, &_set_callback_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("*paintEvent", "@brief Virtual method void QDesktopWidget::paintEvent(QPaintEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_paintEvent_1725_0, &_call_cbs_paintEvent_1725_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQDial.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQDial.cc index b691eb152..155e1e112 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQDial.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQDial.cc @@ -319,6 +319,7 @@ static gsi::Methods methods_QDial () { methods += gsi::qt_signal ("actionTriggered(int)", "actionTriggered", gsi::arg("action"), "@brief Signal declaration for QDial::actionTriggered(int action)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("customContextMenuRequested(const QPoint &)", "customContextMenuRequested", gsi::arg("pos"), "@brief Signal declaration for QDial::customContextMenuRequested(const QPoint &pos)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QDial::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QDial::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("rangeChanged(int, int)", "rangeChanged", gsi::arg("min"), gsi::arg("max"), "@brief Signal declaration for QDial::rangeChanged(int min, int max)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("sliderMoved(int)", "sliderMoved", gsi::arg("position"), "@brief Signal declaration for QDial::sliderMoved(int position)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("sliderPressed()", "sliderPressed", "@brief Signal declaration for QDial::sliderPressed()\nYou can bind a procedure to this signal."); @@ -514,6 +515,13 @@ public: } } + // [emitter impl] void QDial::objectNameChanged(const QString &objectName) + void emitter_QDial_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QDial::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QPaintEngine *QDial::paintEngine() QPaintEngine * cbs_paintEngine_c0_0() const { @@ -2219,6 +2227,24 @@ static void _set_callback_cbs_nativeEvent_4678_0 (void *cls, const gsi::Callback } +// emitter void QDial::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QDial_Adaptor *)cls)->emitter_QDial_objectNameChanged_4567 (arg1); +} + + // QPaintEngine *QDial::paintEngine() static void _init_cbs_paintEngine_c0_0 (qt_gsi::GenericMethod *decl) @@ -2815,6 +2841,7 @@ static gsi::Methods methods_QDial_Adaptor () { methods += new qt_gsi::GenericMethod ("*moveEvent", "@hide", false, &_init_cbs_moveEvent_1624_0, &_call_cbs_moveEvent_1624_0, &_set_callback_cbs_moveEvent_1624_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@brief Virtual method bool QDial::nativeEvent(const QByteArray &eventType, void *message, long int *result)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QDial::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("paintEngine", "@brief Virtual method QPaintEngine *QDial::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@hide", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0, &_set_callback_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("*paintEvent", "@brief Virtual method void QDial::paintEvent(QPaintEvent *pe)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_paintEvent_1725_0, &_call_cbs_paintEvent_1725_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQDialog.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQDialog.cc index 87b94e255..f66d00cb8 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQDialog.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQDialog.cc @@ -491,6 +491,7 @@ static gsi::Methods methods_QDialog () { methods += gsi::qt_signal ("customContextMenuRequested(const QPoint &)", "customContextMenuRequested", gsi::arg("pos"), "@brief Signal declaration for QDialog::customContextMenuRequested(const QPoint &pos)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QDialog::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("finished(int)", "finished", gsi::arg("result"), "@brief Signal declaration for QDialog::finished(int result)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QDialog::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("rejected()", "rejected", "@brief Signal declaration for QDialog::rejected()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconChanged(const QIcon &)", "windowIconChanged", gsi::arg("icon"), "@brief Signal declaration for QDialog::windowIconChanged(const QIcon &icon)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconTextChanged(const QString &)", "windowIconTextChanged", gsi::arg("iconText"), "@brief Signal declaration for QDialog::windowIconTextChanged(const QString &iconText)\nYou can bind a procedure to this signal."); @@ -714,6 +715,13 @@ public: } } + // [emitter impl] void QDialog::objectNameChanged(const QString &objectName) + void emitter_QDialog_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QDialog::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] void QDialog::open() void cbs_open_0_0() { @@ -2509,6 +2517,24 @@ static void _set_callback_cbs_nativeEvent_4678_0 (void *cls, const gsi::Callback } +// emitter void QDialog::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QDialog_Adaptor *)cls)->emitter_QDialog_objectNameChanged_4567 (arg1); +} + + // void QDialog::open() static void _init_cbs_open_0_0 (qt_gsi::GenericMethod *decl) @@ -3018,6 +3044,7 @@ static gsi::Methods methods_QDialog_Adaptor () { methods += new qt_gsi::GenericMethod ("*moveEvent", "@hide", false, &_init_cbs_moveEvent_1624_0, &_call_cbs_moveEvent_1624_0, &_set_callback_cbs_moveEvent_1624_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@brief Virtual method bool QDialog::nativeEvent(const QByteArray &eventType, void *message, long int *result)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QDialog::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("open", "@brief Virtual method void QDialog::open()\nThis method can be reimplemented in a derived class.", false, &_init_cbs_open_0_0, &_call_cbs_open_0_0); methods += new qt_gsi::GenericMethod ("open", "@hide", false, &_init_cbs_open_0_0, &_call_cbs_open_0_0, &_set_callback_cbs_open_0_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@brief Virtual method QPaintEngine *QDialog::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQDialogButtonBox.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQDialogButtonBox.cc index 31a94c765..eea9dbc42 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQDialogButtonBox.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQDialogButtonBox.cc @@ -455,6 +455,7 @@ static gsi::Methods methods_QDialogButtonBox () { methods += gsi::qt_signal ("customContextMenuRequested(const QPoint &)", "customContextMenuRequested", gsi::arg("pos"), "@brief Signal declaration for QDialogButtonBox::customContextMenuRequested(const QPoint &pos)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QDialogButtonBox::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("helpRequested()", "helpRequested", "@brief Signal declaration for QDialogButtonBox::helpRequested()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QDialogButtonBox::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("rejected()", "rejected", "@brief Signal declaration for QDialogButtonBox::rejected()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconChanged(const QIcon &)", "windowIconChanged", gsi::arg("icon"), "@brief Signal declaration for QDialogButtonBox::windowIconChanged(const QIcon &icon)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconTextChanged(const QString &)", "windowIconTextChanged", gsi::arg("iconText"), "@brief Signal declaration for QDialogButtonBox::windowIconTextChanged(const QString &iconText)\nYou can bind a procedure to this signal."); @@ -679,6 +680,13 @@ public: } } + // [emitter impl] void QDialogButtonBox::objectNameChanged(const QString &objectName) + void emitter_QDialogButtonBox_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QDialogButtonBox::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QPaintEngine *QDialogButtonBox::paintEngine() QPaintEngine * cbs_paintEngine_c0_0() const { @@ -2419,6 +2427,24 @@ static void _set_callback_cbs_nativeEvent_4678_0 (void *cls, const gsi::Callback } +// emitter void QDialogButtonBox::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QDialogButtonBox_Adaptor *)cls)->emitter_QDialogButtonBox_objectNameChanged_4567 (arg1); +} + + // QPaintEngine *QDialogButtonBox::paintEngine() static void _init_cbs_paintEngine_c0_0 (qt_gsi::GenericMethod *decl) @@ -2885,6 +2911,7 @@ static gsi::Methods methods_QDialogButtonBox_Adaptor () { methods += new qt_gsi::GenericMethod ("*moveEvent", "@hide", false, &_init_cbs_moveEvent_1624_0, &_call_cbs_moveEvent_1624_0, &_set_callback_cbs_moveEvent_1624_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@brief Virtual method bool QDialogButtonBox::nativeEvent(const QByteArray &eventType, void *message, long int *result)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QDialogButtonBox::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("paintEngine", "@brief Virtual method QPaintEngine *QDialogButtonBox::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@hide", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0, &_set_callback_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("*paintEvent", "@brief Virtual method void QDialogButtonBox::paintEvent(QPaintEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_paintEvent_1725_0, &_call_cbs_paintEvent_1725_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQDirModel.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQDirModel.cc index be5fda6a4..f30c0f80d 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQDirModel.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQDirModel.cc @@ -910,11 +910,26 @@ static gsi::Methods methods_QDirModel () { methods += new qt_gsi::GenericMethod ("sort", "@brief Method void QDirModel::sort(int column, Qt::SortOrder order)\nThis is a reimplementation of QAbstractItemModel::sort", false, &_init_f_sort_2340, &_call_f_sort_2340); methods += new qt_gsi::GenericMethod (":sorting", "@brief Method QFlags QDirModel::sorting()\n", true, &_init_f_sorting_c0, &_call_f_sorting_c0); methods += new qt_gsi::GenericMethod ("supportedDropActions", "@brief Method QFlags QDirModel::supportedDropActions()\nThis is a reimplementation of QAbstractItemModel::supportedDropActions", true, &_init_f_supportedDropActions_c0, &_call_f_supportedDropActions_c0); + methods += gsi::qt_signal ("columnsAboutToBeInserted(const QModelIndex &, int, int)", "columnsAboutToBeInserted", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QDirModel::columnsAboutToBeInserted(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("columnsAboutToBeMoved(const QModelIndex &, int, int, const QModelIndex &, int)", "columnsAboutToBeMoved", gsi::arg("sourceParent"), gsi::arg("sourceStart"), gsi::arg("sourceEnd"), gsi::arg("destinationParent"), gsi::arg("destinationColumn"), "@brief Signal declaration for QDirModel::columnsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("columnsAboutToBeRemoved(const QModelIndex &, int, int)", "columnsAboutToBeRemoved", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QDirModel::columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("columnsInserted(const QModelIndex &, int, int)", "columnsInserted", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QDirModel::columnsInserted(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("columnsMoved(const QModelIndex &, int, int, const QModelIndex &, int)", "columnsMoved", gsi::arg("parent"), gsi::arg("start"), gsi::arg("end"), gsi::arg("destination"), gsi::arg("column"), "@brief Signal declaration for QDirModel::columnsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("columnsRemoved(const QModelIndex &, int, int)", "columnsRemoved", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QDirModel::columnsRemoved(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal & > ("dataChanged(const QModelIndex &, const QModelIndex &, const QVector &)", "dataChanged", gsi::arg("topLeft"), gsi::arg("bottomRight"), gsi::arg("roles"), "@brief Signal declaration for QDirModel::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector &roles)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QDirModel::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal::target_type &, int, int > ("headerDataChanged(Qt::Orientation, int, int)", "headerDataChanged", gsi::arg("orientation"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QDirModel::headerDataChanged(Qt::Orientation orientation, int first, int last)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal &, const qt_gsi::Converter::target_type & > ("layoutAboutToBeChanged(const QList &, QAbstractItemModel::LayoutChangeHint)", "layoutAboutToBeChanged", gsi::arg("parents"), gsi::arg("hint"), "@brief Signal declaration for QDirModel::layoutAboutToBeChanged(const QList &parents, QAbstractItemModel::LayoutChangeHint hint)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal &, const qt_gsi::Converter::target_type & > ("layoutChanged(const QList &, QAbstractItemModel::LayoutChangeHint)", "layoutChanged", gsi::arg("parents"), gsi::arg("hint"), "@brief Signal declaration for QDirModel::layoutChanged(const QList &parents, QAbstractItemModel::LayoutChangeHint hint)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("modelAboutToBeReset()", "modelAboutToBeReset", "@brief Signal declaration for QDirModel::modelAboutToBeReset()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("modelReset()", "modelReset", "@brief Signal declaration for QDirModel::modelReset()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QDirModel::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsAboutToBeInserted(const QModelIndex &, int, int)", "rowsAboutToBeInserted", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QDirModel::rowsAboutToBeInserted(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsAboutToBeMoved(const QModelIndex &, int, int, const QModelIndex &, int)", "rowsAboutToBeMoved", gsi::arg("sourceParent"), gsi::arg("sourceStart"), gsi::arg("sourceEnd"), gsi::arg("destinationParent"), gsi::arg("destinationRow"), "@brief Signal declaration for QDirModel::rowsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsAboutToBeRemoved(const QModelIndex &, int, int)", "rowsAboutToBeRemoved", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QDirModel::rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsInserted(const QModelIndex &, int, int)", "rowsInserted", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QDirModel::rowsInserted(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsMoved(const QModelIndex &, int, int, const QModelIndex &, int)", "rowsMoved", gsi::arg("parent"), gsi::arg("start"), gsi::arg("end"), gsi::arg("destination"), gsi::arg("row"), "@brief Signal declaration for QDirModel::rowsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsRemoved(const QModelIndex &, int, int)", "rowsRemoved", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QDirModel::rowsRemoved(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QDirModel::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QDirModel::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -1151,6 +1166,64 @@ public: } } + // [emitter impl] void QDirModel::columnsAboutToBeInserted(const QModelIndex &parent, int first, int last) + void emitter_QDirModel_columnsAboutToBeInserted_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QDirModel::columnsAboutToBeInserted(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QDirModel::columnsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn) + void emitter_QDirModel_columnsAboutToBeMoved_10318(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn) + { + __SUPPRESS_UNUSED_WARNING (sourceParent); + __SUPPRESS_UNUSED_WARNING (sourceStart); + __SUPPRESS_UNUSED_WARNING (sourceEnd); + __SUPPRESS_UNUSED_WARNING (destinationParent); + __SUPPRESS_UNUSED_WARNING (destinationColumn); + throw tl::Exception ("Can't emit private signal 'void QDirModel::columnsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn)'"); + } + + // [emitter impl] void QDirModel::columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last) + void emitter_QDirModel_columnsAboutToBeRemoved_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QDirModel::columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QDirModel::columnsInserted(const QModelIndex &parent, int first, int last) + void emitter_QDirModel_columnsInserted_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QDirModel::columnsInserted(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QDirModel::columnsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column) + void emitter_QDirModel_columnsMoved_10318(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (start); + __SUPPRESS_UNUSED_WARNING (end); + __SUPPRESS_UNUSED_WARNING (destination); + __SUPPRESS_UNUSED_WARNING (column); + throw tl::Exception ("Can't emit private signal 'void QDirModel::columnsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column)'"); + } + + // [emitter impl] void QDirModel::columnsRemoved(const QModelIndex &parent, int first, int last) + void emitter_QDirModel_columnsRemoved_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QDirModel::columnsRemoved(const QModelIndex &parent, int first, int last)'"); + } + // [adaptor impl] QVariant QDirModel::data(const QModelIndex &index, int role) QVariant cbs_data_c3054_1(const QModelIndex &index, int role) const { @@ -1406,6 +1479,18 @@ public: } } + // [emitter impl] void QDirModel::modelAboutToBeReset() + void emitter_QDirModel_modelAboutToBeReset_3767() + { + throw tl::Exception ("Can't emit private signal 'void QDirModel::modelAboutToBeReset()'"); + } + + // [emitter impl] void QDirModel::modelReset() + void emitter_QDirModel_modelReset_3767() + { + throw tl::Exception ("Can't emit private signal 'void QDirModel::modelReset()'"); + } + // [adaptor impl] bool QDirModel::moveColumns(const QModelIndex &sourceParent, int sourceColumn, int count, const QModelIndex &destinationParent, int destinationChild) bool cbs_moveColumns_6659_0(const QModelIndex &sourceParent, int sourceColumn, int count, const QModelIndex &destinationParent, int destinationChild) { @@ -1436,6 +1521,13 @@ public: } } + // [emitter impl] void QDirModel::objectNameChanged(const QString &objectName) + void emitter_QDirModel_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QDirModel::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QModelIndex QDirModel::parent(const QModelIndex &child) QModelIndex cbs_parent_c2395_0(const QModelIndex &child) const { @@ -1526,6 +1618,64 @@ public: } } + // [emitter impl] void QDirModel::rowsAboutToBeInserted(const QModelIndex &parent, int first, int last) + void emitter_QDirModel_rowsAboutToBeInserted_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QDirModel::rowsAboutToBeInserted(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QDirModel::rowsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow) + void emitter_QDirModel_rowsAboutToBeMoved_10318(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow) + { + __SUPPRESS_UNUSED_WARNING (sourceParent); + __SUPPRESS_UNUSED_WARNING (sourceStart); + __SUPPRESS_UNUSED_WARNING (sourceEnd); + __SUPPRESS_UNUSED_WARNING (destinationParent); + __SUPPRESS_UNUSED_WARNING (destinationRow); + throw tl::Exception ("Can't emit private signal 'void QDirModel::rowsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow)'"); + } + + // [emitter impl] void QDirModel::rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last) + void emitter_QDirModel_rowsAboutToBeRemoved_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QDirModel::rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QDirModel::rowsInserted(const QModelIndex &parent, int first, int last) + void emitter_QDirModel_rowsInserted_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QDirModel::rowsInserted(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QDirModel::rowsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row) + void emitter_QDirModel_rowsMoved_10318(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (start); + __SUPPRESS_UNUSED_WARNING (end); + __SUPPRESS_UNUSED_WARNING (destination); + __SUPPRESS_UNUSED_WARNING (row); + throw tl::Exception ("Can't emit private signal 'void QDirModel::rowsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row)'"); + } + + // [emitter impl] void QDirModel::rowsRemoved(const QModelIndex &parent, int first, int last) + void emitter_QDirModel_rowsRemoved_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QDirModel::rowsRemoved(const QModelIndex &parent, int first, int last)'"); + } + // [adaptor impl] bool QDirModel::setData(const QModelIndex &index, const QVariant &value, int role) bool cbs_setData_5065_1(const QModelIndex &index, const QVariant &value, int role) { @@ -2157,6 +2307,162 @@ static void _set_callback_cbs_columnCount_c2395_1 (void *cls, const gsi::Callbac } +// emitter void QDirModel::columnsAboutToBeInserted(const QModelIndex &parent, int first, int last) + +static void _init_emitter_columnsAboutToBeInserted_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_columnsAboutToBeInserted_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QDirModel_Adaptor *)cls)->emitter_QDirModel_columnsAboutToBeInserted_7372 (arg1, arg2, arg3); +} + + +// emitter void QDirModel::columnsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn) + +static void _init_emitter_columnsAboutToBeMoved_10318 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("sourceParent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("sourceStart"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("sourceEnd"); + decl->add_arg (argspec_2); + static gsi::ArgSpecBase argspec_3 ("destinationParent"); + decl->add_arg (argspec_3); + static gsi::ArgSpecBase argspec_4 ("destinationColumn"); + decl->add_arg (argspec_4); + decl->set_return (); +} + +static void _call_emitter_columnsAboutToBeMoved_10318 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + const QModelIndex &arg4 = gsi::arg_reader() (args, heap); + int arg5 = gsi::arg_reader() (args, heap); + ((QDirModel_Adaptor *)cls)->emitter_QDirModel_columnsAboutToBeMoved_10318 (arg1, arg2, arg3, arg4, arg5); +} + + +// emitter void QDirModel::columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last) + +static void _init_emitter_columnsAboutToBeRemoved_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_columnsAboutToBeRemoved_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QDirModel_Adaptor *)cls)->emitter_QDirModel_columnsAboutToBeRemoved_7372 (arg1, arg2, arg3); +} + + +// emitter void QDirModel::columnsInserted(const QModelIndex &parent, int first, int last) + +static void _init_emitter_columnsInserted_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_columnsInserted_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QDirModel_Adaptor *)cls)->emitter_QDirModel_columnsInserted_7372 (arg1, arg2, arg3); +} + + +// emitter void QDirModel::columnsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column) + +static void _init_emitter_columnsMoved_10318 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("start"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("end"); + decl->add_arg (argspec_2); + static gsi::ArgSpecBase argspec_3 ("destination"); + decl->add_arg (argspec_3); + static gsi::ArgSpecBase argspec_4 ("column"); + decl->add_arg (argspec_4); + decl->set_return (); +} + +static void _call_emitter_columnsMoved_10318 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + const QModelIndex &arg4 = gsi::arg_reader() (args, heap); + int arg5 = gsi::arg_reader() (args, heap); + ((QDirModel_Adaptor *)cls)->emitter_QDirModel_columnsMoved_10318 (arg1, arg2, arg3, arg4, arg5); +} + + +// emitter void QDirModel::columnsRemoved(const QModelIndex &parent, int first, int last) + +static void _init_emitter_columnsRemoved_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_columnsRemoved_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QDirModel_Adaptor *)cls)->emitter_QDirModel_columnsRemoved_7372 (arg1, arg2, arg3); +} + + // exposed QModelIndex QDirModel::createIndex(int row, int column, void *data) static void _init_fp_createIndex_c2374 (qt_gsi::GenericMethod *decl) @@ -2929,6 +3235,34 @@ static void _set_callback_cbs_mimeTypes_c0_0 (void *cls, const gsi::Callback &cb } +// emitter void QDirModel::modelAboutToBeReset() + +static void _init_emitter_modelAboutToBeReset_3767 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_emitter_modelAboutToBeReset_3767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + ((QDirModel_Adaptor *)cls)->emitter_QDirModel_modelAboutToBeReset_3767 (); +} + + +// emitter void QDirModel::modelReset() + +static void _init_emitter_modelReset_3767 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_emitter_modelReset_3767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + ((QDirModel_Adaptor *)cls)->emitter_QDirModel_modelReset_3767 (); +} + + // bool QDirModel::moveColumns(const QModelIndex &sourceParent, int sourceColumn, int count, const QModelIndex &destinationParent, int destinationChild) static void _init_cbs_moveColumns_6659_0 (qt_gsi::GenericMethod *decl) @@ -2999,6 +3333,24 @@ static void _set_callback_cbs_moveRows_6659_0 (void *cls, const gsi::Callback &c } +// emitter void QDirModel::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QDirModel_Adaptor *)cls)->emitter_QDirModel_objectNameChanged_4567 (arg1); +} + + // QModelIndex QDirModel::parent(const QModelIndex &child) static void _init_cbs_parent_c2395_0 (qt_gsi::GenericMethod *decl) @@ -3189,6 +3541,162 @@ static void _set_callback_cbs_rowCount_c2395_1 (void *cls, const gsi::Callback & } +// emitter void QDirModel::rowsAboutToBeInserted(const QModelIndex &parent, int first, int last) + +static void _init_emitter_rowsAboutToBeInserted_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_rowsAboutToBeInserted_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QDirModel_Adaptor *)cls)->emitter_QDirModel_rowsAboutToBeInserted_7372 (arg1, arg2, arg3); +} + + +// emitter void QDirModel::rowsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow) + +static void _init_emitter_rowsAboutToBeMoved_10318 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("sourceParent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("sourceStart"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("sourceEnd"); + decl->add_arg (argspec_2); + static gsi::ArgSpecBase argspec_3 ("destinationParent"); + decl->add_arg (argspec_3); + static gsi::ArgSpecBase argspec_4 ("destinationRow"); + decl->add_arg (argspec_4); + decl->set_return (); +} + +static void _call_emitter_rowsAboutToBeMoved_10318 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + const QModelIndex &arg4 = gsi::arg_reader() (args, heap); + int arg5 = gsi::arg_reader() (args, heap); + ((QDirModel_Adaptor *)cls)->emitter_QDirModel_rowsAboutToBeMoved_10318 (arg1, arg2, arg3, arg4, arg5); +} + + +// emitter void QDirModel::rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last) + +static void _init_emitter_rowsAboutToBeRemoved_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_rowsAboutToBeRemoved_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QDirModel_Adaptor *)cls)->emitter_QDirModel_rowsAboutToBeRemoved_7372 (arg1, arg2, arg3); +} + + +// emitter void QDirModel::rowsInserted(const QModelIndex &parent, int first, int last) + +static void _init_emitter_rowsInserted_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_rowsInserted_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QDirModel_Adaptor *)cls)->emitter_QDirModel_rowsInserted_7372 (arg1, arg2, arg3); +} + + +// emitter void QDirModel::rowsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row) + +static void _init_emitter_rowsMoved_10318 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("start"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("end"); + decl->add_arg (argspec_2); + static gsi::ArgSpecBase argspec_3 ("destination"); + decl->add_arg (argspec_3); + static gsi::ArgSpecBase argspec_4 ("row"); + decl->add_arg (argspec_4); + decl->set_return (); +} + +static void _call_emitter_rowsMoved_10318 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + const QModelIndex &arg4 = gsi::arg_reader() (args, heap); + int arg5 = gsi::arg_reader() (args, heap); + ((QDirModel_Adaptor *)cls)->emitter_QDirModel_rowsMoved_10318 (arg1, arg2, arg3, arg4, arg5); +} + + +// emitter void QDirModel::rowsRemoved(const QModelIndex &parent, int first, int last) + +static void _init_emitter_rowsRemoved_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_rowsRemoved_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QDirModel_Adaptor *)cls)->emitter_QDirModel_rowsRemoved_7372 (arg1, arg2, arg3); +} + + // exposed QObject *QDirModel::sender() static void _init_fp_sender_c0 (qt_gsi::GenericMethod *decl) @@ -3492,6 +4000,12 @@ static gsi::Methods methods_QDirModel_Adaptor () { methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("columnCount", "@brief Virtual method int QDirModel::columnCount(const QModelIndex &parent)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_columnCount_c2395_1, &_call_cbs_columnCount_c2395_1); methods += new qt_gsi::GenericMethod ("columnCount", "@hide", true, &_init_cbs_columnCount_c2395_1, &_call_cbs_columnCount_c2395_1, &_set_callback_cbs_columnCount_c2395_1); + methods += new qt_gsi::GenericMethod ("emit_columnsAboutToBeInserted", "@brief Emitter for signal void QDirModel::columnsAboutToBeInserted(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_columnsAboutToBeInserted_7372, &_call_emitter_columnsAboutToBeInserted_7372); + methods += new qt_gsi::GenericMethod ("emit_columnsAboutToBeMoved", "@brief Emitter for signal void QDirModel::columnsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn)\nCall this method to emit this signal.", false, &_init_emitter_columnsAboutToBeMoved_10318, &_call_emitter_columnsAboutToBeMoved_10318); + methods += new qt_gsi::GenericMethod ("emit_columnsAboutToBeRemoved", "@brief Emitter for signal void QDirModel::columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_columnsAboutToBeRemoved_7372, &_call_emitter_columnsAboutToBeRemoved_7372); + methods += new qt_gsi::GenericMethod ("emit_columnsInserted", "@brief Emitter for signal void QDirModel::columnsInserted(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_columnsInserted_7372, &_call_emitter_columnsInserted_7372); + methods += new qt_gsi::GenericMethod ("emit_columnsMoved", "@brief Emitter for signal void QDirModel::columnsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column)\nCall this method to emit this signal.", false, &_init_emitter_columnsMoved_10318, &_call_emitter_columnsMoved_10318); + methods += new qt_gsi::GenericMethod ("emit_columnsRemoved", "@brief Emitter for signal void QDirModel::columnsRemoved(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_columnsRemoved_7372, &_call_emitter_columnsRemoved_7372); methods += new qt_gsi::GenericMethod ("*createIndex", "@brief Method QModelIndex QDirModel::createIndex(int row, int column, void *data)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_createIndex_c2374, &_call_fp_createIndex_c2374); methods += new qt_gsi::GenericMethod ("*createIndex", "@brief Method QModelIndex QDirModel::createIndex(int row, int column, quintptr id)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_createIndex_c2657, &_call_fp_createIndex_c2657); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QDirModel::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); @@ -3543,10 +4057,13 @@ static gsi::Methods methods_QDirModel_Adaptor () { methods += new qt_gsi::GenericMethod ("mimeData", "@hide", true, &_init_cbs_mimeData_c3010_0, &_call_cbs_mimeData_c3010_0, &_set_callback_cbs_mimeData_c3010_0); methods += new qt_gsi::GenericMethod ("mimeTypes", "@brief Virtual method QStringList QDirModel::mimeTypes()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_mimeTypes_c0_0, &_call_cbs_mimeTypes_c0_0); methods += new qt_gsi::GenericMethod ("mimeTypes", "@hide", true, &_init_cbs_mimeTypes_c0_0, &_call_cbs_mimeTypes_c0_0, &_set_callback_cbs_mimeTypes_c0_0); + methods += new qt_gsi::GenericMethod ("emit_modelAboutToBeReset", "@brief Emitter for signal void QDirModel::modelAboutToBeReset()\nCall this method to emit this signal.", false, &_init_emitter_modelAboutToBeReset_3767, &_call_emitter_modelAboutToBeReset_3767); + methods += new qt_gsi::GenericMethod ("emit_modelReset", "@brief Emitter for signal void QDirModel::modelReset()\nCall this method to emit this signal.", false, &_init_emitter_modelReset_3767, &_call_emitter_modelReset_3767); methods += new qt_gsi::GenericMethod ("moveColumns", "@brief Virtual method bool QDirModel::moveColumns(const QModelIndex &sourceParent, int sourceColumn, int count, const QModelIndex &destinationParent, int destinationChild)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_moveColumns_6659_0, &_call_cbs_moveColumns_6659_0); methods += new qt_gsi::GenericMethod ("moveColumns", "@hide", false, &_init_cbs_moveColumns_6659_0, &_call_cbs_moveColumns_6659_0, &_set_callback_cbs_moveColumns_6659_0); methods += new qt_gsi::GenericMethod ("moveRows", "@brief Virtual method bool QDirModel::moveRows(const QModelIndex &sourceParent, int sourceRow, int count, const QModelIndex &destinationParent, int destinationChild)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_moveRows_6659_0, &_call_cbs_moveRows_6659_0); methods += new qt_gsi::GenericMethod ("moveRows", "@hide", false, &_init_cbs_moveRows_6659_0, &_call_cbs_moveRows_6659_0, &_set_callback_cbs_moveRows_6659_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QDirModel::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("parent", "@brief Virtual method QModelIndex QDirModel::parent(const QModelIndex &child)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_parent_c2395_0, &_call_cbs_parent_c2395_0); methods += new qt_gsi::GenericMethod ("parent", "@hide", true, &_init_cbs_parent_c2395_0, &_call_cbs_parent_c2395_0, &_set_callback_cbs_parent_c2395_0); methods += new qt_gsi::GenericMethod ("*persistentIndexList", "@brief Method QList QDirModel::persistentIndexList()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_persistentIndexList_c0, &_call_fp_persistentIndexList_c0); @@ -3562,6 +4079,12 @@ static gsi::Methods methods_QDirModel_Adaptor () { methods += new qt_gsi::GenericMethod ("roleNames", "@hide", true, &_init_cbs_roleNames_c0_0, &_call_cbs_roleNames_c0_0, &_set_callback_cbs_roleNames_c0_0); methods += new qt_gsi::GenericMethod ("rowCount", "@brief Virtual method int QDirModel::rowCount(const QModelIndex &parent)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_rowCount_c2395_1, &_call_cbs_rowCount_c2395_1); methods += new qt_gsi::GenericMethod ("rowCount", "@hide", true, &_init_cbs_rowCount_c2395_1, &_call_cbs_rowCount_c2395_1, &_set_callback_cbs_rowCount_c2395_1); + methods += new qt_gsi::GenericMethod ("emit_rowsAboutToBeInserted", "@brief Emitter for signal void QDirModel::rowsAboutToBeInserted(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_rowsAboutToBeInserted_7372, &_call_emitter_rowsAboutToBeInserted_7372); + methods += new qt_gsi::GenericMethod ("emit_rowsAboutToBeMoved", "@brief Emitter for signal void QDirModel::rowsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow)\nCall this method to emit this signal.", false, &_init_emitter_rowsAboutToBeMoved_10318, &_call_emitter_rowsAboutToBeMoved_10318); + methods += new qt_gsi::GenericMethod ("emit_rowsAboutToBeRemoved", "@brief Emitter for signal void QDirModel::rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_rowsAboutToBeRemoved_7372, &_call_emitter_rowsAboutToBeRemoved_7372); + methods += new qt_gsi::GenericMethod ("emit_rowsInserted", "@brief Emitter for signal void QDirModel::rowsInserted(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_rowsInserted_7372, &_call_emitter_rowsInserted_7372); + methods += new qt_gsi::GenericMethod ("emit_rowsMoved", "@brief Emitter for signal void QDirModel::rowsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row)\nCall this method to emit this signal.", false, &_init_emitter_rowsMoved_10318, &_call_emitter_rowsMoved_10318); + methods += new qt_gsi::GenericMethod ("emit_rowsRemoved", "@brief Emitter for signal void QDirModel::rowsRemoved(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_rowsRemoved_7372, &_call_emitter_rowsRemoved_7372); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QDirModel::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QDirModel::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); methods += new qt_gsi::GenericMethod ("setData", "@brief Virtual method bool QDirModel::setData(const QModelIndex &index, const QVariant &value, int role)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_setData_5065_1, &_call_cbs_setData_5065_1); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQDockWidget.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQDockWidget.cc index 19f8e18e9..67a8f9ec3 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQDockWidget.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQDockWidget.cc @@ -383,6 +383,7 @@ static gsi::Methods methods_QDockWidget () { methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QDockWidget::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal::target_type & > ("dockLocationChanged(Qt::DockWidgetArea)", "dockLocationChanged", gsi::arg("area"), "@brief Signal declaration for QDockWidget::dockLocationChanged(Qt::DockWidgetArea area)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal > ("featuresChanged(QFlags)", "featuresChanged", gsi::arg("features"), "@brief Signal declaration for QDockWidget::featuresChanged(QFlags features)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QDockWidget::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("topLevelChanged(bool)", "topLevelChanged", gsi::arg("topLevel"), "@brief Signal declaration for QDockWidget::topLevelChanged(bool topLevel)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("visibilityChanged(bool)", "visibilityChanged", gsi::arg("visible"), "@brief Signal declaration for QDockWidget::visibilityChanged(bool visible)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconChanged(const QIcon &)", "windowIconChanged", gsi::arg("icon"), "@brief Signal declaration for QDockWidget::windowIconChanged(const QIcon &icon)\nYou can bind a procedure to this signal."); @@ -601,6 +602,13 @@ public: } } + // [emitter impl] void QDockWidget::objectNameChanged(const QString &objectName) + void emitter_QDockWidget_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QDockWidget::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QPaintEngine *QDockWidget::paintEngine() QPaintEngine * cbs_paintEngine_c0_0() const { @@ -2335,6 +2343,24 @@ static void _set_callback_cbs_nativeEvent_4678_0 (void *cls, const gsi::Callback } +// emitter void QDockWidget::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QDockWidget_Adaptor *)cls)->emitter_QDockWidget_objectNameChanged_4567 (arg1); +} + + // QPaintEngine *QDockWidget::paintEngine() static void _init_cbs_paintEngine_c0_0 (qt_gsi::GenericMethod *decl) @@ -2822,6 +2848,7 @@ static gsi::Methods methods_QDockWidget_Adaptor () { methods += new qt_gsi::GenericMethod ("*moveEvent", "@hide", false, &_init_cbs_moveEvent_1624_0, &_call_cbs_moveEvent_1624_0, &_set_callback_cbs_moveEvent_1624_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@brief Virtual method bool QDockWidget::nativeEvent(const QByteArray &eventType, void *message, long int *result)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QDockWidget::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("paintEngine", "@brief Virtual method QPaintEngine *QDockWidget::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@hide", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0, &_set_callback_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("*paintEvent", "@brief Virtual method void QDockWidget::paintEvent(QPaintEvent *event)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_paintEvent_1725_0, &_call_cbs_paintEvent_1725_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQDoubleSpinBox.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQDoubleSpinBox.cc index e17a09606..db4402891 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQDoubleSpinBox.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQDoubleSpinBox.cc @@ -544,6 +544,7 @@ static gsi::Methods methods_QDoubleSpinBox () { methods += gsi::qt_signal ("customContextMenuRequested(const QPoint &)", "customContextMenuRequested", gsi::arg("pos"), "@brief Signal declaration for QDoubleSpinBox::customContextMenuRequested(const QPoint &pos)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QDoubleSpinBox::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("editingFinished()", "editingFinished", "@brief Signal declaration for QDoubleSpinBox::editingFinished()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QDoubleSpinBox::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("valueChanged(double)", "valueChanged", gsi::arg("arg1"), "@brief Signal declaration for QDoubleSpinBox::valueChanged(double)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("valueChanged(const QString &)", "valueChanged_qs", gsi::arg("arg1"), "@brief Signal declaration for QDoubleSpinBox::valueChanged(const QString &)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconChanged(const QIcon &)", "windowIconChanged", gsi::arg("icon"), "@brief Signal declaration for QDoubleSpinBox::windowIconChanged(const QIcon &icon)\nYou can bind a procedure to this signal."); @@ -781,6 +782,13 @@ public: } } + // [emitter impl] void QDoubleSpinBox::objectNameChanged(const QString &objectName) + void emitter_QDoubleSpinBox_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QDoubleSpinBox::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QPaintEngine *QDoubleSpinBox::paintEngine() QPaintEngine * cbs_paintEngine_c0_0() const { @@ -2573,6 +2581,24 @@ static void _set_callback_cbs_nativeEvent_4678_0 (void *cls, const gsi::Callback } +// emitter void QDoubleSpinBox::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QDoubleSpinBox_Adaptor *)cls)->emitter_QDoubleSpinBox_objectNameChanged_4567 (arg1); +} + + // QPaintEngine *QDoubleSpinBox::paintEngine() static void _init_cbs_paintEngine_c0_0 (qt_gsi::GenericMethod *decl) @@ -3196,6 +3222,7 @@ static gsi::Methods methods_QDoubleSpinBox_Adaptor () { methods += new qt_gsi::GenericMethod ("*moveEvent", "@hide", false, &_init_cbs_moveEvent_1624_0, &_call_cbs_moveEvent_1624_0, &_set_callback_cbs_moveEvent_1624_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@brief Virtual method bool QDoubleSpinBox::nativeEvent(const QByteArray &eventType, void *message, long int *result)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QDoubleSpinBox::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("paintEngine", "@brief Virtual method QPaintEngine *QDoubleSpinBox::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@hide", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0, &_set_callback_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("*paintEvent", "@brief Virtual method void QDoubleSpinBox::paintEvent(QPaintEvent *event)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_paintEvent_1725_0, &_call_cbs_paintEvent_1725_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQErrorMessage.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQErrorMessage.cc index 451e6c800..68ff96869 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQErrorMessage.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQErrorMessage.cc @@ -220,6 +220,7 @@ static gsi::Methods methods_QErrorMessage () { methods += gsi::qt_signal ("customContextMenuRequested(const QPoint &)", "customContextMenuRequested", gsi::arg("pos"), "@brief Signal declaration for QErrorMessage::customContextMenuRequested(const QPoint &pos)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QErrorMessage::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("finished(int)", "finished", gsi::arg("result"), "@brief Signal declaration for QErrorMessage::finished(int result)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QErrorMessage::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("rejected()", "rejected", "@brief Signal declaration for QErrorMessage::rejected()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconChanged(const QIcon &)", "windowIconChanged", gsi::arg("icon"), "@brief Signal declaration for QErrorMessage::windowIconChanged(const QIcon &icon)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconTextChanged(const QString &)", "windowIconTextChanged", gsi::arg("iconText"), "@brief Signal declaration for QErrorMessage::windowIconTextChanged(const QString &iconText)\nYou can bind a procedure to this signal."); @@ -423,6 +424,13 @@ public: } } + // [emitter impl] void QErrorMessage::objectNameChanged(const QString &objectName) + void emitter_QErrorMessage_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QErrorMessage::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] void QErrorMessage::open() void cbs_open_0_0() { @@ -2230,6 +2238,24 @@ static void _set_callback_cbs_nativeEvent_4678_0 (void *cls, const gsi::Callback } +// emitter void QErrorMessage::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QErrorMessage_Adaptor *)cls)->emitter_QErrorMessage_objectNameChanged_4567 (arg1); +} + + // void QErrorMessage::open() static void _init_cbs_open_0_0 (qt_gsi::GenericMethod *decl) @@ -2739,6 +2765,7 @@ static gsi::Methods methods_QErrorMessage_Adaptor () { methods += new qt_gsi::GenericMethod ("*moveEvent", "@hide", false, &_init_cbs_moveEvent_1624_0, &_call_cbs_moveEvent_1624_0, &_set_callback_cbs_moveEvent_1624_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@brief Virtual method bool QErrorMessage::nativeEvent(const QByteArray &eventType, void *message, long int *result)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QErrorMessage::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("open", "@brief Virtual method void QErrorMessage::open()\nThis method can be reimplemented in a derived class.", false, &_init_cbs_open_0_0, &_call_cbs_open_0_0); methods += new qt_gsi::GenericMethod ("open", "@hide", false, &_init_cbs_open_0_0, &_call_cbs_open_0_0, &_set_callback_cbs_open_0_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@brief Virtual method QPaintEngine *QErrorMessage::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQFileDialog.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQFileDialog.cc index c516548ee..f9671d44b 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQFileDialog.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQFileDialog.cc @@ -1507,6 +1507,7 @@ static gsi::Methods methods_QFileDialog () { methods += gsi::qt_signal ("filesSelected(const QStringList &)", "filesSelected", gsi::arg("files"), "@brief Signal declaration for QFileDialog::filesSelected(const QStringList &files)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("filterSelected(const QString &)", "filterSelected", gsi::arg("filter"), "@brief Signal declaration for QFileDialog::filterSelected(const QString &filter)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("finished(int)", "finished", gsi::arg("result"), "@brief Signal declaration for QFileDialog::finished(int result)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QFileDialog::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("rejected()", "rejected", "@brief Signal declaration for QFileDialog::rejected()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("urlSelected(const QUrl &)", "urlSelected", gsi::arg("url"), "@brief Signal declaration for QFileDialog::urlSelected(const QUrl &url)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal & > ("urlsSelected(const QList &)", "urlsSelected", gsi::arg("urls"), "@brief Signal declaration for QFileDialog::urlsSelected(const QList &urls)\nYou can bind a procedure to this signal."); @@ -1770,6 +1771,13 @@ public: } } + // [emitter impl] void QFileDialog::objectNameChanged(const QString &objectName) + void emitter_QFileDialog_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QFileDialog::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] void QFileDialog::open() void cbs_open_0_0() { @@ -3760,6 +3768,24 @@ static void _set_callback_cbs_nativeEvent_4678_0 (void *cls, const gsi::Callback } +// emitter void QFileDialog::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QFileDialog_Adaptor *)cls)->emitter_QFileDialog_objectNameChanged_4567 (arg1); +} + + // void QFileDialog::open() static void _init_cbs_open_0_0 (qt_gsi::GenericMethod *decl) @@ -4313,6 +4339,7 @@ static gsi::Methods methods_QFileDialog_Adaptor () { methods += new qt_gsi::GenericMethod ("*moveEvent", "@hide", false, &_init_cbs_moveEvent_1624_0, &_call_cbs_moveEvent_1624_0, &_set_callback_cbs_moveEvent_1624_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@brief Virtual method bool QFileDialog::nativeEvent(const QByteArray &eventType, void *message, long int *result)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QFileDialog::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("open", "@brief Virtual method void QFileDialog::open()\nThis method can be reimplemented in a derived class.", false, &_init_cbs_open_0_0, &_call_cbs_open_0_0); methods += new qt_gsi::GenericMethod ("open", "@hide", false, &_init_cbs_open_0_0, &_call_cbs_open_0_0, &_set_callback_cbs_open_0_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@brief Virtual method QPaintEngine *QFileDialog::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQFileSystemModel.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQFileSystemModel.cc index 298e51247..117be42bb 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQFileSystemModel.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQFileSystemModel.cc @@ -1031,6 +1031,12 @@ static gsi::Methods methods_QFileSystemModel () { methods += new qt_gsi::GenericMethod ("sort", "@brief Method void QFileSystemModel::sort(int column, Qt::SortOrder order)\nThis is a reimplementation of QAbstractItemModel::sort", false, &_init_f_sort_2340, &_call_f_sort_2340); methods += new qt_gsi::GenericMethod ("supportedDropActions", "@brief Method QFlags QFileSystemModel::supportedDropActions()\nThis is a reimplementation of QAbstractItemModel::supportedDropActions", true, &_init_f_supportedDropActions_c0, &_call_f_supportedDropActions_c0); methods += new qt_gsi::GenericMethod ("type", "@brief Method QString QFileSystemModel::type(const QModelIndex &index)\n", true, &_init_f_type_c2395, &_call_f_type_c2395); + methods += gsi::qt_signal ("columnsAboutToBeInserted(const QModelIndex &, int, int)", "columnsAboutToBeInserted", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QFileSystemModel::columnsAboutToBeInserted(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("columnsAboutToBeMoved(const QModelIndex &, int, int, const QModelIndex &, int)", "columnsAboutToBeMoved", gsi::arg("sourceParent"), gsi::arg("sourceStart"), gsi::arg("sourceEnd"), gsi::arg("destinationParent"), gsi::arg("destinationColumn"), "@brief Signal declaration for QFileSystemModel::columnsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("columnsAboutToBeRemoved(const QModelIndex &, int, int)", "columnsAboutToBeRemoved", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QFileSystemModel::columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("columnsInserted(const QModelIndex &, int, int)", "columnsInserted", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QFileSystemModel::columnsInserted(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("columnsMoved(const QModelIndex &, int, int, const QModelIndex &, int)", "columnsMoved", gsi::arg("parent"), gsi::arg("start"), gsi::arg("end"), gsi::arg("destination"), gsi::arg("column"), "@brief Signal declaration for QFileSystemModel::columnsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("columnsRemoved(const QModelIndex &, int, int)", "columnsRemoved", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QFileSystemModel::columnsRemoved(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal & > ("dataChanged(const QModelIndex &, const QModelIndex &, const QVector &)", "dataChanged", gsi::arg("topLeft"), gsi::arg("bottomRight"), gsi::arg("roles"), "@brief Signal declaration for QFileSystemModel::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector &roles)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QFileSystemModel::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("directoryLoaded(const QString &)", "directoryLoaded", gsi::arg("path"), "@brief Signal declaration for QFileSystemModel::directoryLoaded(const QString &path)\nYou can bind a procedure to this signal."); @@ -1038,7 +1044,16 @@ static gsi::Methods methods_QFileSystemModel () { methods += gsi::qt_signal::target_type &, int, int > ("headerDataChanged(Qt::Orientation, int, int)", "headerDataChanged", gsi::arg("orientation"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QFileSystemModel::headerDataChanged(Qt::Orientation orientation, int first, int last)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal &, const qt_gsi::Converter::target_type & > ("layoutAboutToBeChanged(const QList &, QAbstractItemModel::LayoutChangeHint)", "layoutAboutToBeChanged", gsi::arg("parents"), gsi::arg("hint"), "@brief Signal declaration for QFileSystemModel::layoutAboutToBeChanged(const QList &parents, QAbstractItemModel::LayoutChangeHint hint)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal &, const qt_gsi::Converter::target_type & > ("layoutChanged(const QList &, QAbstractItemModel::LayoutChangeHint)", "layoutChanged", gsi::arg("parents"), gsi::arg("hint"), "@brief Signal declaration for QFileSystemModel::layoutChanged(const QList &parents, QAbstractItemModel::LayoutChangeHint hint)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("modelAboutToBeReset()", "modelAboutToBeReset", "@brief Signal declaration for QFileSystemModel::modelAboutToBeReset()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("modelReset()", "modelReset", "@brief Signal declaration for QFileSystemModel::modelReset()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QFileSystemModel::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("rootPathChanged(const QString &)", "rootPathChanged", gsi::arg("newPath"), "@brief Signal declaration for QFileSystemModel::rootPathChanged(const QString &newPath)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsAboutToBeInserted(const QModelIndex &, int, int)", "rowsAboutToBeInserted", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QFileSystemModel::rowsAboutToBeInserted(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsAboutToBeMoved(const QModelIndex &, int, int, const QModelIndex &, int)", "rowsAboutToBeMoved", gsi::arg("sourceParent"), gsi::arg("sourceStart"), gsi::arg("sourceEnd"), gsi::arg("destinationParent"), gsi::arg("destinationRow"), "@brief Signal declaration for QFileSystemModel::rowsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsAboutToBeRemoved(const QModelIndex &, int, int)", "rowsAboutToBeRemoved", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QFileSystemModel::rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsInserted(const QModelIndex &, int, int)", "rowsInserted", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QFileSystemModel::rowsInserted(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsMoved(const QModelIndex &, int, int, const QModelIndex &, int)", "rowsMoved", gsi::arg("parent"), gsi::arg("start"), gsi::arg("end"), gsi::arg("destination"), gsi::arg("row"), "@brief Signal declaration for QFileSystemModel::rowsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("rowsRemoved(const QModelIndex &, int, int)", "rowsRemoved", gsi::arg("parent"), gsi::arg("first"), gsi::arg("last"), "@brief Signal declaration for QFileSystemModel::rowsRemoved(const QModelIndex &parent, int first, int last)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QFileSystemModel::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QFileSystemModel::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -1263,6 +1278,64 @@ public: } } + // [emitter impl] void QFileSystemModel::columnsAboutToBeInserted(const QModelIndex &parent, int first, int last) + void emitter_QFileSystemModel_columnsAboutToBeInserted_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QFileSystemModel::columnsAboutToBeInserted(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QFileSystemModel::columnsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn) + void emitter_QFileSystemModel_columnsAboutToBeMoved_10318(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn) + { + __SUPPRESS_UNUSED_WARNING (sourceParent); + __SUPPRESS_UNUSED_WARNING (sourceStart); + __SUPPRESS_UNUSED_WARNING (sourceEnd); + __SUPPRESS_UNUSED_WARNING (destinationParent); + __SUPPRESS_UNUSED_WARNING (destinationColumn); + throw tl::Exception ("Can't emit private signal 'void QFileSystemModel::columnsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn)'"); + } + + // [emitter impl] void QFileSystemModel::columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last) + void emitter_QFileSystemModel_columnsAboutToBeRemoved_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QFileSystemModel::columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QFileSystemModel::columnsInserted(const QModelIndex &parent, int first, int last) + void emitter_QFileSystemModel_columnsInserted_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QFileSystemModel::columnsInserted(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QFileSystemModel::columnsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column) + void emitter_QFileSystemModel_columnsMoved_10318(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (start); + __SUPPRESS_UNUSED_WARNING (end); + __SUPPRESS_UNUSED_WARNING (destination); + __SUPPRESS_UNUSED_WARNING (column); + throw tl::Exception ("Can't emit private signal 'void QFileSystemModel::columnsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column)'"); + } + + // [emitter impl] void QFileSystemModel::columnsRemoved(const QModelIndex &parent, int first, int last) + void emitter_QFileSystemModel_columnsRemoved_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QFileSystemModel::columnsRemoved(const QModelIndex &parent, int first, int last)'"); + } + // [adaptor impl] QVariant QFileSystemModel::data(const QModelIndex &index, int role) QVariant cbs_data_c3054_1(const QModelIndex &index, int role) const { @@ -1515,6 +1588,18 @@ public: } } + // [emitter impl] void QFileSystemModel::modelAboutToBeReset() + void emitter_QFileSystemModel_modelAboutToBeReset_3767() + { + throw tl::Exception ("Can't emit private signal 'void QFileSystemModel::modelAboutToBeReset()'"); + } + + // [emitter impl] void QFileSystemModel::modelReset() + void emitter_QFileSystemModel_modelReset_3767() + { + throw tl::Exception ("Can't emit private signal 'void QFileSystemModel::modelReset()'"); + } + // [adaptor impl] bool QFileSystemModel::moveColumns(const QModelIndex &sourceParent, int sourceColumn, int count, const QModelIndex &destinationParent, int destinationChild) bool cbs_moveColumns_6659_0(const QModelIndex &sourceParent, int sourceColumn, int count, const QModelIndex &destinationParent, int destinationChild) { @@ -1545,6 +1630,13 @@ public: } } + // [emitter impl] void QFileSystemModel::objectNameChanged(const QString &objectName) + void emitter_QFileSystemModel_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QFileSystemModel::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QModelIndex QFileSystemModel::parent(const QModelIndex &child) QModelIndex cbs_parent_c2395_0(const QModelIndex &child) const { @@ -1641,6 +1733,64 @@ public: } } + // [emitter impl] void QFileSystemModel::rowsAboutToBeInserted(const QModelIndex &parent, int first, int last) + void emitter_QFileSystemModel_rowsAboutToBeInserted_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QFileSystemModel::rowsAboutToBeInserted(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QFileSystemModel::rowsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow) + void emitter_QFileSystemModel_rowsAboutToBeMoved_10318(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow) + { + __SUPPRESS_UNUSED_WARNING (sourceParent); + __SUPPRESS_UNUSED_WARNING (sourceStart); + __SUPPRESS_UNUSED_WARNING (sourceEnd); + __SUPPRESS_UNUSED_WARNING (destinationParent); + __SUPPRESS_UNUSED_WARNING (destinationRow); + throw tl::Exception ("Can't emit private signal 'void QFileSystemModel::rowsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow)'"); + } + + // [emitter impl] void QFileSystemModel::rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last) + void emitter_QFileSystemModel_rowsAboutToBeRemoved_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QFileSystemModel::rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QFileSystemModel::rowsInserted(const QModelIndex &parent, int first, int last) + void emitter_QFileSystemModel_rowsInserted_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QFileSystemModel::rowsInserted(const QModelIndex &parent, int first, int last)'"); + } + + // [emitter impl] void QFileSystemModel::rowsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row) + void emitter_QFileSystemModel_rowsMoved_10318(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (start); + __SUPPRESS_UNUSED_WARNING (end); + __SUPPRESS_UNUSED_WARNING (destination); + __SUPPRESS_UNUSED_WARNING (row); + throw tl::Exception ("Can't emit private signal 'void QFileSystemModel::rowsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row)'"); + } + + // [emitter impl] void QFileSystemModel::rowsRemoved(const QModelIndex &parent, int first, int last) + void emitter_QFileSystemModel_rowsRemoved_7372(const QModelIndex &parent, int first, int last) + { + __SUPPRESS_UNUSED_WARNING (parent); + __SUPPRESS_UNUSED_WARNING (first); + __SUPPRESS_UNUSED_WARNING (last); + throw tl::Exception ("Can't emit private signal 'void QFileSystemModel::rowsRemoved(const QModelIndex &parent, int first, int last)'"); + } + // [adaptor impl] bool QFileSystemModel::setData(const QModelIndex &index, const QVariant &value, int role) bool cbs_setData_5065_1(const QModelIndex &index, const QVariant &value, int role) { @@ -2260,6 +2410,162 @@ static void _set_callback_cbs_columnCount_c2395_1 (void *cls, const gsi::Callbac } +// emitter void QFileSystemModel::columnsAboutToBeInserted(const QModelIndex &parent, int first, int last) + +static void _init_emitter_columnsAboutToBeInserted_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_columnsAboutToBeInserted_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QFileSystemModel_Adaptor *)cls)->emitter_QFileSystemModel_columnsAboutToBeInserted_7372 (arg1, arg2, arg3); +} + + +// emitter void QFileSystemModel::columnsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn) + +static void _init_emitter_columnsAboutToBeMoved_10318 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("sourceParent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("sourceStart"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("sourceEnd"); + decl->add_arg (argspec_2); + static gsi::ArgSpecBase argspec_3 ("destinationParent"); + decl->add_arg (argspec_3); + static gsi::ArgSpecBase argspec_4 ("destinationColumn"); + decl->add_arg (argspec_4); + decl->set_return (); +} + +static void _call_emitter_columnsAboutToBeMoved_10318 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + const QModelIndex &arg4 = gsi::arg_reader() (args, heap); + int arg5 = gsi::arg_reader() (args, heap); + ((QFileSystemModel_Adaptor *)cls)->emitter_QFileSystemModel_columnsAboutToBeMoved_10318 (arg1, arg2, arg3, arg4, arg5); +} + + +// emitter void QFileSystemModel::columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last) + +static void _init_emitter_columnsAboutToBeRemoved_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_columnsAboutToBeRemoved_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QFileSystemModel_Adaptor *)cls)->emitter_QFileSystemModel_columnsAboutToBeRemoved_7372 (arg1, arg2, arg3); +} + + +// emitter void QFileSystemModel::columnsInserted(const QModelIndex &parent, int first, int last) + +static void _init_emitter_columnsInserted_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_columnsInserted_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QFileSystemModel_Adaptor *)cls)->emitter_QFileSystemModel_columnsInserted_7372 (arg1, arg2, arg3); +} + + +// emitter void QFileSystemModel::columnsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column) + +static void _init_emitter_columnsMoved_10318 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("start"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("end"); + decl->add_arg (argspec_2); + static gsi::ArgSpecBase argspec_3 ("destination"); + decl->add_arg (argspec_3); + static gsi::ArgSpecBase argspec_4 ("column"); + decl->add_arg (argspec_4); + decl->set_return (); +} + +static void _call_emitter_columnsMoved_10318 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + const QModelIndex &arg4 = gsi::arg_reader() (args, heap); + int arg5 = gsi::arg_reader() (args, heap); + ((QFileSystemModel_Adaptor *)cls)->emitter_QFileSystemModel_columnsMoved_10318 (arg1, arg2, arg3, arg4, arg5); +} + + +// emitter void QFileSystemModel::columnsRemoved(const QModelIndex &parent, int first, int last) + +static void _init_emitter_columnsRemoved_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_columnsRemoved_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QFileSystemModel_Adaptor *)cls)->emitter_QFileSystemModel_columnsRemoved_7372 (arg1, arg2, arg3); +} + + // exposed QModelIndex QFileSystemModel::createIndex(int row, int column, void *data) static void _init_fp_createIndex_c2374 (qt_gsi::GenericMethod *decl) @@ -3074,6 +3380,34 @@ static void _set_callback_cbs_mimeTypes_c0_0 (void *cls, const gsi::Callback &cb } +// emitter void QFileSystemModel::modelAboutToBeReset() + +static void _init_emitter_modelAboutToBeReset_3767 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_emitter_modelAboutToBeReset_3767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + ((QFileSystemModel_Adaptor *)cls)->emitter_QFileSystemModel_modelAboutToBeReset_3767 (); +} + + +// emitter void QFileSystemModel::modelReset() + +static void _init_emitter_modelReset_3767 (qt_gsi::GenericMethod *decl) +{ + decl->set_return (); +} + +static void _call_emitter_modelReset_3767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + ((QFileSystemModel_Adaptor *)cls)->emitter_QFileSystemModel_modelReset_3767 (); +} + + // bool QFileSystemModel::moveColumns(const QModelIndex &sourceParent, int sourceColumn, int count, const QModelIndex &destinationParent, int destinationChild) static void _init_cbs_moveColumns_6659_0 (qt_gsi::GenericMethod *decl) @@ -3144,6 +3478,24 @@ static void _set_callback_cbs_moveRows_6659_0 (void *cls, const gsi::Callback &c } +// emitter void QFileSystemModel::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QFileSystemModel_Adaptor *)cls)->emitter_QFileSystemModel_objectNameChanged_4567 (arg1); +} + + // QModelIndex QFileSystemModel::parent(const QModelIndex &child) static void _init_cbs_parent_c2395_0 (qt_gsi::GenericMethod *decl) @@ -3352,6 +3704,162 @@ static void _set_callback_cbs_rowCount_c2395_1 (void *cls, const gsi::Callback & } +// emitter void QFileSystemModel::rowsAboutToBeInserted(const QModelIndex &parent, int first, int last) + +static void _init_emitter_rowsAboutToBeInserted_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_rowsAboutToBeInserted_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QFileSystemModel_Adaptor *)cls)->emitter_QFileSystemModel_rowsAboutToBeInserted_7372 (arg1, arg2, arg3); +} + + +// emitter void QFileSystemModel::rowsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow) + +static void _init_emitter_rowsAboutToBeMoved_10318 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("sourceParent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("sourceStart"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("sourceEnd"); + decl->add_arg (argspec_2); + static gsi::ArgSpecBase argspec_3 ("destinationParent"); + decl->add_arg (argspec_3); + static gsi::ArgSpecBase argspec_4 ("destinationRow"); + decl->add_arg (argspec_4); + decl->set_return (); +} + +static void _call_emitter_rowsAboutToBeMoved_10318 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + const QModelIndex &arg4 = gsi::arg_reader() (args, heap); + int arg5 = gsi::arg_reader() (args, heap); + ((QFileSystemModel_Adaptor *)cls)->emitter_QFileSystemModel_rowsAboutToBeMoved_10318 (arg1, arg2, arg3, arg4, arg5); +} + + +// emitter void QFileSystemModel::rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last) + +static void _init_emitter_rowsAboutToBeRemoved_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_rowsAboutToBeRemoved_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QFileSystemModel_Adaptor *)cls)->emitter_QFileSystemModel_rowsAboutToBeRemoved_7372 (arg1, arg2, arg3); +} + + +// emitter void QFileSystemModel::rowsInserted(const QModelIndex &parent, int first, int last) + +static void _init_emitter_rowsInserted_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_rowsInserted_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QFileSystemModel_Adaptor *)cls)->emitter_QFileSystemModel_rowsInserted_7372 (arg1, arg2, arg3); +} + + +// emitter void QFileSystemModel::rowsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row) + +static void _init_emitter_rowsMoved_10318 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("start"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("end"); + decl->add_arg (argspec_2); + static gsi::ArgSpecBase argspec_3 ("destination"); + decl->add_arg (argspec_3); + static gsi::ArgSpecBase argspec_4 ("row"); + decl->add_arg (argspec_4); + decl->set_return (); +} + +static void _call_emitter_rowsMoved_10318 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + const QModelIndex &arg4 = gsi::arg_reader() (args, heap); + int arg5 = gsi::arg_reader() (args, heap); + ((QFileSystemModel_Adaptor *)cls)->emitter_QFileSystemModel_rowsMoved_10318 (arg1, arg2, arg3, arg4, arg5); +} + + +// emitter void QFileSystemModel::rowsRemoved(const QModelIndex &parent, int first, int last) + +static void _init_emitter_rowsRemoved_7372 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("parent"); + decl->add_arg (argspec_0); + static gsi::ArgSpecBase argspec_1 ("first"); + decl->add_arg (argspec_1); + static gsi::ArgSpecBase argspec_2 ("last"); + decl->add_arg (argspec_2); + decl->set_return (); +} + +static void _call_emitter_rowsRemoved_7372 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QModelIndex &arg1 = gsi::arg_reader() (args, heap); + int arg2 = gsi::arg_reader() (args, heap); + int arg3 = gsi::arg_reader() (args, heap); + ((QFileSystemModel_Adaptor *)cls)->emitter_QFileSystemModel_rowsRemoved_7372 (arg1, arg2, arg3); +} + + // exposed QObject *QFileSystemModel::sender() static void _init_fp_sender_c0 (qt_gsi::GenericMethod *decl) @@ -3654,6 +4162,12 @@ static gsi::Methods methods_QFileSystemModel_Adaptor () { methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("columnCount", "@brief Virtual method int QFileSystemModel::columnCount(const QModelIndex &parent)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_columnCount_c2395_1, &_call_cbs_columnCount_c2395_1); methods += new qt_gsi::GenericMethod ("columnCount", "@hide", true, &_init_cbs_columnCount_c2395_1, &_call_cbs_columnCount_c2395_1, &_set_callback_cbs_columnCount_c2395_1); + methods += new qt_gsi::GenericMethod ("emit_columnsAboutToBeInserted", "@brief Emitter for signal void QFileSystemModel::columnsAboutToBeInserted(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_columnsAboutToBeInserted_7372, &_call_emitter_columnsAboutToBeInserted_7372); + methods += new qt_gsi::GenericMethod ("emit_columnsAboutToBeMoved", "@brief Emitter for signal void QFileSystemModel::columnsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn)\nCall this method to emit this signal.", false, &_init_emitter_columnsAboutToBeMoved_10318, &_call_emitter_columnsAboutToBeMoved_10318); + methods += new qt_gsi::GenericMethod ("emit_columnsAboutToBeRemoved", "@brief Emitter for signal void QFileSystemModel::columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_columnsAboutToBeRemoved_7372, &_call_emitter_columnsAboutToBeRemoved_7372); + methods += new qt_gsi::GenericMethod ("emit_columnsInserted", "@brief Emitter for signal void QFileSystemModel::columnsInserted(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_columnsInserted_7372, &_call_emitter_columnsInserted_7372); + methods += new qt_gsi::GenericMethod ("emit_columnsMoved", "@brief Emitter for signal void QFileSystemModel::columnsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column)\nCall this method to emit this signal.", false, &_init_emitter_columnsMoved_10318, &_call_emitter_columnsMoved_10318); + methods += new qt_gsi::GenericMethod ("emit_columnsRemoved", "@brief Emitter for signal void QFileSystemModel::columnsRemoved(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_columnsRemoved_7372, &_call_emitter_columnsRemoved_7372); methods += new qt_gsi::GenericMethod ("*createIndex", "@brief Method QModelIndex QFileSystemModel::createIndex(int row, int column, void *data)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_createIndex_c2374, &_call_fp_createIndex_c2374); methods += new qt_gsi::GenericMethod ("*createIndex", "@brief Method QModelIndex QFileSystemModel::createIndex(int row, int column, quintptr id)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_createIndex_c2657, &_call_fp_createIndex_c2657); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QFileSystemModel::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); @@ -3707,10 +4221,13 @@ static gsi::Methods methods_QFileSystemModel_Adaptor () { methods += new qt_gsi::GenericMethod ("mimeData", "@hide", true, &_init_cbs_mimeData_c3010_0, &_call_cbs_mimeData_c3010_0, &_set_callback_cbs_mimeData_c3010_0); methods += new qt_gsi::GenericMethod ("mimeTypes", "@brief Virtual method QStringList QFileSystemModel::mimeTypes()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_mimeTypes_c0_0, &_call_cbs_mimeTypes_c0_0); methods += new qt_gsi::GenericMethod ("mimeTypes", "@hide", true, &_init_cbs_mimeTypes_c0_0, &_call_cbs_mimeTypes_c0_0, &_set_callback_cbs_mimeTypes_c0_0); + methods += new qt_gsi::GenericMethod ("emit_modelAboutToBeReset", "@brief Emitter for signal void QFileSystemModel::modelAboutToBeReset()\nCall this method to emit this signal.", false, &_init_emitter_modelAboutToBeReset_3767, &_call_emitter_modelAboutToBeReset_3767); + methods += new qt_gsi::GenericMethod ("emit_modelReset", "@brief Emitter for signal void QFileSystemModel::modelReset()\nCall this method to emit this signal.", false, &_init_emitter_modelReset_3767, &_call_emitter_modelReset_3767); methods += new qt_gsi::GenericMethod ("moveColumns", "@brief Virtual method bool QFileSystemModel::moveColumns(const QModelIndex &sourceParent, int sourceColumn, int count, const QModelIndex &destinationParent, int destinationChild)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_moveColumns_6659_0, &_call_cbs_moveColumns_6659_0); methods += new qt_gsi::GenericMethod ("moveColumns", "@hide", false, &_init_cbs_moveColumns_6659_0, &_call_cbs_moveColumns_6659_0, &_set_callback_cbs_moveColumns_6659_0); methods += new qt_gsi::GenericMethod ("moveRows", "@brief Virtual method bool QFileSystemModel::moveRows(const QModelIndex &sourceParent, int sourceRow, int count, const QModelIndex &destinationParent, int destinationChild)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_moveRows_6659_0, &_call_cbs_moveRows_6659_0); methods += new qt_gsi::GenericMethod ("moveRows", "@hide", false, &_init_cbs_moveRows_6659_0, &_call_cbs_moveRows_6659_0, &_set_callback_cbs_moveRows_6659_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QFileSystemModel::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("parent", "@brief Virtual method QModelIndex QFileSystemModel::parent(const QModelIndex &child)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_parent_c2395_0, &_call_cbs_parent_c2395_0); methods += new qt_gsi::GenericMethod ("parent", "@hide", true, &_init_cbs_parent_c2395_0, &_call_cbs_parent_c2395_0, &_set_callback_cbs_parent_c2395_0); methods += new qt_gsi::GenericMethod ("*persistentIndexList", "@brief Method QList QFileSystemModel::persistentIndexList()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_persistentIndexList_c0, &_call_fp_persistentIndexList_c0); @@ -3727,6 +4244,12 @@ static gsi::Methods methods_QFileSystemModel_Adaptor () { methods += new qt_gsi::GenericMethod ("emit_rootPathChanged", "@brief Emitter for signal void QFileSystemModel::rootPathChanged(const QString &newPath)\nCall this method to emit this signal.", false, &_init_emitter_rootPathChanged_2025, &_call_emitter_rootPathChanged_2025); methods += new qt_gsi::GenericMethod ("rowCount", "@brief Virtual method int QFileSystemModel::rowCount(const QModelIndex &parent)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_rowCount_c2395_1, &_call_cbs_rowCount_c2395_1); methods += new qt_gsi::GenericMethod ("rowCount", "@hide", true, &_init_cbs_rowCount_c2395_1, &_call_cbs_rowCount_c2395_1, &_set_callback_cbs_rowCount_c2395_1); + methods += new qt_gsi::GenericMethod ("emit_rowsAboutToBeInserted", "@brief Emitter for signal void QFileSystemModel::rowsAboutToBeInserted(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_rowsAboutToBeInserted_7372, &_call_emitter_rowsAboutToBeInserted_7372); + methods += new qt_gsi::GenericMethod ("emit_rowsAboutToBeMoved", "@brief Emitter for signal void QFileSystemModel::rowsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow)\nCall this method to emit this signal.", false, &_init_emitter_rowsAboutToBeMoved_10318, &_call_emitter_rowsAboutToBeMoved_10318); + methods += new qt_gsi::GenericMethod ("emit_rowsAboutToBeRemoved", "@brief Emitter for signal void QFileSystemModel::rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_rowsAboutToBeRemoved_7372, &_call_emitter_rowsAboutToBeRemoved_7372); + methods += new qt_gsi::GenericMethod ("emit_rowsInserted", "@brief Emitter for signal void QFileSystemModel::rowsInserted(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_rowsInserted_7372, &_call_emitter_rowsInserted_7372); + methods += new qt_gsi::GenericMethod ("emit_rowsMoved", "@brief Emitter for signal void QFileSystemModel::rowsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row)\nCall this method to emit this signal.", false, &_init_emitter_rowsMoved_10318, &_call_emitter_rowsMoved_10318); + methods += new qt_gsi::GenericMethod ("emit_rowsRemoved", "@brief Emitter for signal void QFileSystemModel::rowsRemoved(const QModelIndex &parent, int first, int last)\nCall this method to emit this signal.", false, &_init_emitter_rowsRemoved_7372, &_call_emitter_rowsRemoved_7372); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QFileSystemModel::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QFileSystemModel::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); methods += new qt_gsi::GenericMethod ("setData", "@brief Virtual method bool QFileSystemModel::setData(const QModelIndex &index, const QVariant &value, int role)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_setData_5065_1, &_call_cbs_setData_5065_1); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQFocusFrame.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQFocusFrame.cc index 63d998ca8..afac941f8 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQFocusFrame.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQFocusFrame.cc @@ -196,6 +196,7 @@ static gsi::Methods methods_QFocusFrame () { methods += new qt_gsi::GenericMethod (":widget", "@brief Method QWidget *QFocusFrame::widget()\n", true, &_init_f_widget_c0, &_call_f_widget_c0); methods += gsi::qt_signal ("customContextMenuRequested(const QPoint &)", "customContextMenuRequested", gsi::arg("pos"), "@brief Signal declaration for QFocusFrame::customContextMenuRequested(const QPoint &pos)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QFocusFrame::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QFocusFrame::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconChanged(const QIcon &)", "windowIconChanged", gsi::arg("icon"), "@brief Signal declaration for QFocusFrame::windowIconChanged(const QIcon &icon)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconTextChanged(const QString &)", "windowIconTextChanged", gsi::arg("iconText"), "@brief Signal declaration for QFocusFrame::windowIconTextChanged(const QString &iconText)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowTitleChanged(const QString &)", "windowTitleChanged", gsi::arg("title"), "@brief Signal declaration for QFocusFrame::windowTitleChanged(const QString &title)\nYou can bind a procedure to this signal."); @@ -355,6 +356,13 @@ public: } } + // [emitter impl] void QFocusFrame::objectNameChanged(const QString &objectName) + void emitter_QFocusFrame_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QFocusFrame::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QPaintEngine *QFocusFrame::paintEngine() QPaintEngine * cbs_paintEngine_c0_0() const { @@ -2011,6 +2019,24 @@ static void _set_callback_cbs_nativeEvent_4678_0 (void *cls, const gsi::Callback } +// emitter void QFocusFrame::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QFocusFrame_Adaptor *)cls)->emitter_QFocusFrame_objectNameChanged_4567 (arg1); +} + + // QPaintEngine *QFocusFrame::paintEngine() static void _init_cbs_paintEngine_c0_0 (qt_gsi::GenericMethod *decl) @@ -2458,6 +2484,7 @@ static gsi::Methods methods_QFocusFrame_Adaptor () { methods += new qt_gsi::GenericMethod ("*moveEvent", "@hide", false, &_init_cbs_moveEvent_1624_0, &_call_cbs_moveEvent_1624_0, &_set_callback_cbs_moveEvent_1624_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@brief Virtual method bool QFocusFrame::nativeEvent(const QByteArray &eventType, void *message, long int *result)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QFocusFrame::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("paintEngine", "@brief Virtual method QPaintEngine *QFocusFrame::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@hide", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0, &_set_callback_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("*paintEvent", "@brief Virtual method void QFocusFrame::paintEvent(QPaintEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_paintEvent_1725_0, &_call_cbs_paintEvent_1725_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQFontComboBox.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQFontComboBox.cc index d148d1d9d..611a014bd 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQFontComboBox.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQFontComboBox.cc @@ -302,6 +302,7 @@ static gsi::Methods methods_QFontComboBox () { methods += gsi::qt_signal ("editTextChanged(const QString &)", "editTextChanged", gsi::arg("arg1"), "@brief Signal declaration for QFontComboBox::editTextChanged(const QString &)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("highlighted(int)", "highlighted", gsi::arg("index"), "@brief Signal declaration for QFontComboBox::highlighted(int index)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("highlighted(const QString &)", "highlighted_qs", gsi::arg("arg1"), "@brief Signal declaration for QFontComboBox::highlighted(const QString &)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QFontComboBox::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconChanged(const QIcon &)", "windowIconChanged", gsi::arg("icon"), "@brief Signal declaration for QFontComboBox::windowIconChanged(const QIcon &icon)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconTextChanged(const QString &)", "windowIconTextChanged", gsi::arg("iconText"), "@brief Signal declaration for QFontComboBox::windowIconTextChanged(const QString &iconText)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowTitleChanged(const QString &)", "windowTitleChanged", gsi::arg("title"), "@brief Signal declaration for QFontComboBox::windowTitleChanged(const QString &title)\nYou can bind a procedure to this signal."); @@ -545,6 +546,13 @@ public: } } + // [emitter impl] void QFontComboBox::objectNameChanged(const QString &objectName) + void emitter_QFontComboBox_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QFontComboBox::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QPaintEngine *QFontComboBox::paintEngine() QPaintEngine * cbs_paintEngine_c0_0() const { @@ -2385,6 +2393,24 @@ static void _set_callback_cbs_nativeEvent_4678_0 (void *cls, const gsi::Callback } +// emitter void QFontComboBox::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QFontComboBox_Adaptor *)cls)->emitter_QFontComboBox_objectNameChanged_4567 (arg1); +} + + // QPaintEngine *QFontComboBox::paintEngine() static void _init_cbs_paintEngine_c0_0 (qt_gsi::GenericMethod *decl) @@ -2863,6 +2889,7 @@ static gsi::Methods methods_QFontComboBox_Adaptor () { methods += new qt_gsi::GenericMethod ("*moveEvent", "@hide", false, &_init_cbs_moveEvent_1624_0, &_call_cbs_moveEvent_1624_0, &_set_callback_cbs_moveEvent_1624_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@brief Virtual method bool QFontComboBox::nativeEvent(const QByteArray &eventType, void *message, long int *result)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QFontComboBox::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("paintEngine", "@brief Virtual method QPaintEngine *QFontComboBox::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@hide", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0, &_set_callback_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("*paintEvent", "@brief Virtual method void QFontComboBox::paintEvent(QPaintEvent *e)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_paintEvent_1725_0, &_call_cbs_paintEvent_1725_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQFontDialog.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQFontDialog.cc index d86cc0c3b..58ee06c1b 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQFontDialog.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQFontDialog.cc @@ -411,6 +411,7 @@ static gsi::Methods methods_QFontDialog () { methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QFontDialog::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("finished(int)", "finished", gsi::arg("result"), "@brief Signal declaration for QFontDialog::finished(int result)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("fontSelected(const QFont &)", "fontSelected", gsi::arg("font"), "@brief Signal declaration for QFontDialog::fontSelected(const QFont &font)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QFontDialog::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("rejected()", "rejected", "@brief Signal declaration for QFontDialog::rejected()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconChanged(const QIcon &)", "windowIconChanged", gsi::arg("icon"), "@brief Signal declaration for QFontDialog::windowIconChanged(const QIcon &icon)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconTextChanged(const QString &)", "windowIconTextChanged", gsi::arg("iconText"), "@brief Signal declaration for QFontDialog::windowIconTextChanged(const QString &iconText)\nYou can bind a procedure to this signal."); @@ -639,6 +640,13 @@ public: } } + // [emitter impl] void QFontDialog::objectNameChanged(const QString &objectName) + void emitter_QFontDialog_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QFontDialog::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] void QFontDialog::open() void cbs_open_0_0() { @@ -2503,6 +2511,24 @@ static void _set_callback_cbs_nativeEvent_4678_0 (void *cls, const gsi::Callback } +// emitter void QFontDialog::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QFontDialog_Adaptor *)cls)->emitter_QFontDialog_objectNameChanged_4567 (arg1); +} + + // void QFontDialog::open() static void _init_cbs_open_0_0 (qt_gsi::GenericMethod *decl) @@ -3015,6 +3041,7 @@ static gsi::Methods methods_QFontDialog_Adaptor () { methods += new qt_gsi::GenericMethod ("*moveEvent", "@hide", false, &_init_cbs_moveEvent_1624_0, &_call_cbs_moveEvent_1624_0, &_set_callback_cbs_moveEvent_1624_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@brief Virtual method bool QFontDialog::nativeEvent(const QByteArray &eventType, void *message, long int *result)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QFontDialog::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("open", "@brief Virtual method void QFontDialog::open()\nThis method can be reimplemented in a derived class.", false, &_init_cbs_open_0_0, &_call_cbs_open_0_0); methods += new qt_gsi::GenericMethod ("open", "@hide", false, &_init_cbs_open_0_0, &_call_cbs_open_0_0, &_set_callback_cbs_open_0_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@brief Virtual method QPaintEngine *QFontDialog::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQFormLayout.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQFormLayout.cc index bf8c95391..c742b7c04 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQFormLayout.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQFormLayout.cc @@ -1112,6 +1112,7 @@ static gsi::Methods methods_QFormLayout () { methods += new qt_gsi::GenericMethod ("takeAt", "@brief Method QLayoutItem *QFormLayout::takeAt(int index)\nThis is a reimplementation of QLayout::takeAt", false, &_init_f_takeAt_767, &_call_f_takeAt_767); methods += new qt_gsi::GenericMethod (":verticalSpacing", "@brief Method int QFormLayout::verticalSpacing()\n", true, &_init_f_verticalSpacing_c0, &_call_f_verticalSpacing_c0); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QFormLayout::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QFormLayout::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QFormLayout::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QFormLayout::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -1452,6 +1453,13 @@ public: } } + // [emitter impl] void QFormLayout::objectNameChanged(const QString &objectName) + void emitter_QFormLayout_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QFormLayout::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] void QFormLayout::setGeometry(const QRect &rect) void cbs_setGeometry_1792_0(const QRect &rect) { @@ -2174,6 +2182,24 @@ static void _set_callback_cbs_minimumSize_c0_0 (void *cls, const gsi::Callback & } +// emitter void QFormLayout::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QFormLayout_Adaptor *)cls)->emitter_QFormLayout_objectNameChanged_4567 (arg1); +} + + // exposed int QFormLayout::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -2421,6 +2447,7 @@ static gsi::Methods methods_QFormLayout_Adaptor () { methods += new qt_gsi::GenericMethod ("minimumHeightForWidth", "@hide", true, &_init_cbs_minimumHeightForWidth_c767_0, &_call_cbs_minimumHeightForWidth_c767_0, &_set_callback_cbs_minimumHeightForWidth_c767_0); methods += new qt_gsi::GenericMethod ("minimumSize", "@brief Virtual method QSize QFormLayout::minimumSize()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_minimumSize_c0_0, &_call_cbs_minimumSize_c0_0); methods += new qt_gsi::GenericMethod ("minimumSize", "@hide", true, &_init_cbs_minimumSize_c0_0, &_call_cbs_minimumSize_c0_0, &_set_callback_cbs_minimumSize_c0_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QFormLayout::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QFormLayout::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QFormLayout::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QFormLayout::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQFrame.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQFrame.cc index 52725ff03..f4b8c9c5c 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQFrame.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQFrame.cc @@ -413,6 +413,7 @@ static gsi::Methods methods_QFrame () { methods += new qt_gsi::GenericMethod (":sizeHint", "@brief Method QSize QFrame::sizeHint()\nThis is a reimplementation of QWidget::sizeHint", true, &_init_f_sizeHint_c0, &_call_f_sizeHint_c0); methods += gsi::qt_signal ("customContextMenuRequested(const QPoint &)", "customContextMenuRequested", gsi::arg("pos"), "@brief Signal declaration for QFrame::customContextMenuRequested(const QPoint &pos)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QFrame::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QFrame::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconChanged(const QIcon &)", "windowIconChanged", gsi::arg("icon"), "@brief Signal declaration for QFrame::windowIconChanged(const QIcon &icon)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconTextChanged(const QString &)", "windowIconTextChanged", gsi::arg("iconText"), "@brief Signal declaration for QFrame::windowIconTextChanged(const QString &iconText)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowTitleChanged(const QString &)", "windowTitleChanged", gsi::arg("title"), "@brief Signal declaration for QFrame::windowTitleChanged(const QString &title)\nYou can bind a procedure to this signal."); @@ -598,6 +599,13 @@ public: } } + // [emitter impl] void QFrame::objectNameChanged(const QString &objectName) + void emitter_QFrame_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QFrame::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QPaintEngine *QFrame::paintEngine() QPaintEngine * cbs_paintEngine_c0_0() const { @@ -2261,6 +2269,24 @@ static void _set_callback_cbs_nativeEvent_4678_0 (void *cls, const gsi::Callback } +// emitter void QFrame::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QFrame_Adaptor *)cls)->emitter_QFrame_objectNameChanged_4567 (arg1); +} + + // QPaintEngine *QFrame::paintEngine() static void _init_cbs_paintEngine_c0_0 (qt_gsi::GenericMethod *decl) @@ -2709,6 +2735,7 @@ static gsi::Methods methods_QFrame_Adaptor () { methods += new qt_gsi::GenericMethod ("*moveEvent", "@hide", false, &_init_cbs_moveEvent_1624_0, &_call_cbs_moveEvent_1624_0, &_set_callback_cbs_moveEvent_1624_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@brief Virtual method bool QFrame::nativeEvent(const QByteArray &eventType, void *message, long int *result)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QFrame::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("paintEngine", "@brief Virtual method QPaintEngine *QFrame::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@hide", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0, &_set_callback_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("*paintEvent", "@brief Virtual method void QFrame::paintEvent(QPaintEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_paintEvent_1725_0, &_call_cbs_paintEvent_1725_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQGesture.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQGesture.cc index 46f985320..f7df5413e 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQGesture.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQGesture.cc @@ -252,6 +252,7 @@ static gsi::Methods methods_QGesture () { methods += new qt_gsi::GenericMethod (":state", "@brief Method Qt::GestureState QGesture::state()\n", true, &_init_f_state_c0, &_call_f_state_c0); methods += new qt_gsi::GenericMethod ("unsetHotSpot", "@brief Method void QGesture::unsetHotSpot()\n", false, &_init_f_unsetHotSpot_0, &_call_f_unsetHotSpot_0); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QGesture::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QGesture::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QGesture::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QGesture::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -342,6 +343,13 @@ public: } } + // [emitter impl] void QGesture::objectNameChanged(const QString &objectName) + void emitter_QGesture_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QGesture::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] void QGesture::childEvent(QChildEvent *) void cbs_childEvent_1701_0(QChildEvent *arg1) { @@ -587,6 +595,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QGesture::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QGesture_Adaptor *)cls)->emitter_QGesture_objectNameChanged_4567 (arg1); +} + + // exposed int QGesture::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -677,6 +703,7 @@ static gsi::Methods methods_QGesture_Adaptor () { methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QGesture::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QGesture::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QGesture::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QGesture::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QGesture::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QGesture::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQGraphicsAnchor.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQGraphicsAnchor.cc index 9e76be0e5..134c649ac 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQGraphicsAnchor.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQGraphicsAnchor.cc @@ -203,6 +203,7 @@ static gsi::Methods methods_QGraphicsAnchor () { methods += new qt_gsi::GenericMethod (":spacing", "@brief Method double QGraphicsAnchor::spacing()\n", true, &_init_f_spacing_c0, &_call_f_spacing_c0); methods += new qt_gsi::GenericMethod ("unsetSpacing", "@brief Method void QGraphicsAnchor::unsetSpacing()\n", false, &_init_f_unsetSpacing_0, &_call_f_unsetSpacing_0); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QGraphicsAnchor::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QGraphicsAnchor::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QGraphicsAnchor::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QGraphicsAnchor::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -281,6 +282,13 @@ public: } } + // [emitter impl] void QGraphicsAnchor::objectNameChanged(const QString &objectName) + void emitter_QGraphicsAnchor_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QGraphicsAnchor::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] void QGraphicsAnchor::childEvent(QChildEvent *) void cbs_childEvent_1701_0(QChildEvent *arg1) { @@ -508,6 +516,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QGraphicsAnchor::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QGraphicsAnchor_Adaptor *)cls)->emitter_QGraphicsAnchor_objectNameChanged_4567 (arg1); +} + + // exposed int QGraphicsAnchor::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -597,6 +623,7 @@ static gsi::Methods methods_QGraphicsAnchor_Adaptor () { methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QGraphicsAnchor::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QGraphicsAnchor::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QGraphicsAnchor::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QGraphicsAnchor::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QGraphicsAnchor::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QGraphicsAnchor::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQGraphicsBlurEffect.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQGraphicsBlurEffect.cc index 6bdbb5431..88e0e5251 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQGraphicsBlurEffect.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQGraphicsBlurEffect.cc @@ -213,6 +213,7 @@ static gsi::Methods methods_QGraphicsBlurEffect () { methods += gsi::qt_signal ("blurRadiusChanged(double)", "blurRadiusChanged", gsi::arg("blurRadius"), "@brief Signal declaration for QGraphicsBlurEffect::blurRadiusChanged(double blurRadius)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QGraphicsBlurEffect::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("enabledChanged(bool)", "enabledChanged", gsi::arg("enabled"), "@brief Signal declaration for QGraphicsBlurEffect::enabledChanged(bool enabled)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QGraphicsBlurEffect::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QGraphicsBlurEffect::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QGraphicsBlurEffect::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -361,6 +362,13 @@ public: } } + // [emitter impl] void QGraphicsBlurEffect::objectNameChanged(const QString &objectName) + void emitter_QGraphicsBlurEffect_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QGraphicsBlurEffect::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] void QGraphicsBlurEffect::childEvent(QChildEvent *) void cbs_childEvent_1701_0(QChildEvent *arg1) { @@ -759,6 +767,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QGraphicsBlurEffect::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QGraphicsBlurEffect_Adaptor *)cls)->emitter_QGraphicsBlurEffect_objectNameChanged_4567 (arg1); +} + + // exposed int QGraphicsBlurEffect::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -952,6 +978,7 @@ static gsi::Methods methods_QGraphicsBlurEffect_Adaptor () { methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QGraphicsBlurEffect::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QGraphicsBlurEffect::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QGraphicsBlurEffect::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QGraphicsBlurEffect::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QGraphicsBlurEffect::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QGraphicsBlurEffect::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQGraphicsColorizeEffect.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQGraphicsColorizeEffect.cc index 55f102e1b..698fcf005 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQGraphicsColorizeEffect.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQGraphicsColorizeEffect.cc @@ -193,6 +193,7 @@ static gsi::Methods methods_QGraphicsColorizeEffect () { methods += gsi::qt_signal ("colorChanged(const QColor &)", "colorChanged", gsi::arg("color"), "@brief Signal declaration for QGraphicsColorizeEffect::colorChanged(const QColor &color)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QGraphicsColorizeEffect::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("enabledChanged(bool)", "enabledChanged", gsi::arg("enabled"), "@brief Signal declaration for QGraphicsColorizeEffect::enabledChanged(bool enabled)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QGraphicsColorizeEffect::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("strengthChanged(double)", "strengthChanged", gsi::arg("strength"), "@brief Signal declaration for QGraphicsColorizeEffect::strengthChanged(double strength)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QGraphicsColorizeEffect::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QGraphicsColorizeEffect::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); @@ -336,6 +337,13 @@ public: } } + // [emitter impl] void QGraphicsColorizeEffect::objectNameChanged(const QString &objectName) + void emitter_QGraphicsColorizeEffect_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QGraphicsColorizeEffect::objectNameChanged(const QString &objectName)'"); + } + // [emitter impl] void QGraphicsColorizeEffect::strengthChanged(double strength) void emitter_QGraphicsColorizeEffect_strengthChanged_1071(double strength) { @@ -722,6 +730,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QGraphicsColorizeEffect::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QGraphicsColorizeEffect_Adaptor *)cls)->emitter_QGraphicsColorizeEffect_objectNameChanged_4567 (arg1); +} + + // exposed int QGraphicsColorizeEffect::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -932,6 +958,7 @@ static gsi::Methods methods_QGraphicsColorizeEffect_Adaptor () { methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QGraphicsColorizeEffect::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QGraphicsColorizeEffect::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QGraphicsColorizeEffect::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QGraphicsColorizeEffect::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QGraphicsColorizeEffect::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QGraphicsColorizeEffect::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQGraphicsDropShadowEffect.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQGraphicsDropShadowEffect.cc index ac8c19e09..5a6f0fa53 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQGraphicsDropShadowEffect.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQGraphicsDropShadowEffect.cc @@ -371,6 +371,7 @@ static gsi::Methods methods_QGraphicsDropShadowEffect () { methods += gsi::qt_signal ("colorChanged(const QColor &)", "colorChanged", gsi::arg("color"), "@brief Signal declaration for QGraphicsDropShadowEffect::colorChanged(const QColor &color)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QGraphicsDropShadowEffect::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("enabledChanged(bool)", "enabledChanged", gsi::arg("enabled"), "@brief Signal declaration for QGraphicsDropShadowEffect::enabledChanged(bool enabled)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QGraphicsDropShadowEffect::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("offsetChanged(const QPointF &)", "offsetChanged", gsi::arg("offset"), "@brief Signal declaration for QGraphicsDropShadowEffect::offsetChanged(const QPointF &offset)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QGraphicsDropShadowEffect::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QGraphicsDropShadowEffect::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); @@ -520,6 +521,13 @@ public: } } + // [emitter impl] void QGraphicsDropShadowEffect::objectNameChanged(const QString &objectName) + void emitter_QGraphicsDropShadowEffect_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QGraphicsDropShadowEffect::objectNameChanged(const QString &objectName)'"); + } + // [emitter impl] void QGraphicsDropShadowEffect::offsetChanged(const QPointF &offset) void emitter_QGraphicsDropShadowEffect_offsetChanged_1986(const QPointF &offset) { @@ -924,6 +932,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QGraphicsDropShadowEffect::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QGraphicsDropShadowEffect_Adaptor *)cls)->emitter_QGraphicsDropShadowEffect_objectNameChanged_4567 (arg1); +} + + // emitter void QGraphicsDropShadowEffect::offsetChanged(const QPointF &offset) static void _init_emitter_offsetChanged_1986 (qt_gsi::GenericMethod *decl) @@ -1135,6 +1161,7 @@ static gsi::Methods methods_QGraphicsDropShadowEffect_Adaptor () { methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QGraphicsDropShadowEffect::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QGraphicsDropShadowEffect::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QGraphicsDropShadowEffect::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("emit_offsetChanged", "@brief Emitter for signal void QGraphicsDropShadowEffect::offsetChanged(const QPointF &offset)\nCall this method to emit this signal.", false, &_init_emitter_offsetChanged_1986, &_call_emitter_offsetChanged_1986); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QGraphicsDropShadowEffect::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QGraphicsDropShadowEffect::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQGraphicsEffect.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQGraphicsEffect.cc index fb55513ca..bc48a0d81 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQGraphicsEffect.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQGraphicsEffect.cc @@ -207,6 +207,7 @@ static gsi::Methods methods_QGraphicsEffect () { methods += new qt_gsi::GenericMethod ("update", "@brief Method void QGraphicsEffect::update()\n", false, &_init_f_update_0, &_call_f_update_0); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QGraphicsEffect::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("enabledChanged(bool)", "enabledChanged", gsi::arg("enabled"), "@brief Signal declaration for QGraphicsEffect::enabledChanged(bool enabled)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QGraphicsEffect::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QGraphicsEffect::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QGraphicsEffect::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -343,6 +344,13 @@ public: } } + // [emitter impl] void QGraphicsEffect::objectNameChanged(const QString &objectName) + void emitter_QGraphicsEffect_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QGraphicsEffect::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] void QGraphicsEffect::childEvent(QChildEvent *) void cbs_childEvent_1701_0(QChildEvent *arg1) { @@ -706,6 +714,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QGraphicsEffect::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QGraphicsEffect_Adaptor *)cls)->emitter_QGraphicsEffect_objectNameChanged_4567 (arg1); +} + + // exposed int QGraphicsEffect::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -897,6 +923,7 @@ static gsi::Methods methods_QGraphicsEffect_Adaptor () { methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QGraphicsEffect::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QGraphicsEffect::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QGraphicsEffect::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QGraphicsEffect::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QGraphicsEffect::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QGraphicsEffect::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQGraphicsItemAnimation.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQGraphicsItemAnimation.cc index 8d29a5505..b1df7e313 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQGraphicsItemAnimation.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQGraphicsItemAnimation.cc @@ -634,6 +634,7 @@ static gsi::Methods methods_QGraphicsItemAnimation () { methods += new qt_gsi::GenericMethod ("xTranslationAt", "@brief Method double QGraphicsItemAnimation::xTranslationAt(double step)\n", true, &_init_f_xTranslationAt_c1071, &_call_f_xTranslationAt_c1071); methods += new qt_gsi::GenericMethod ("yTranslationAt", "@brief Method double QGraphicsItemAnimation::yTranslationAt(double step)\n", true, &_init_f_yTranslationAt_c1071, &_call_f_yTranslationAt_c1071); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QGraphicsItemAnimation::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QGraphicsItemAnimation::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QGraphicsItemAnimation::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QGraphicsItemAnimation::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -724,6 +725,13 @@ public: } } + // [emitter impl] void QGraphicsItemAnimation::objectNameChanged(const QString &objectName) + void emitter_QGraphicsItemAnimation_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QGraphicsItemAnimation::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] void QGraphicsItemAnimation::afterAnimationStep(double step) void cbs_afterAnimationStep_1071_0(double step) { @@ -1049,6 +1057,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QGraphicsItemAnimation::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QGraphicsItemAnimation_Adaptor *)cls)->emitter_QGraphicsItemAnimation_objectNameChanged_4567 (arg1); +} + + // exposed int QGraphicsItemAnimation::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -1143,6 +1169,7 @@ static gsi::Methods methods_QGraphicsItemAnimation_Adaptor () { methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QGraphicsItemAnimation::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QGraphicsItemAnimation::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QGraphicsItemAnimation::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QGraphicsItemAnimation::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QGraphicsItemAnimation::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QGraphicsItemAnimation::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQGraphicsObject.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQGraphicsObject.cc index d29776d97..e48425024 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQGraphicsObject.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQGraphicsObject.cc @@ -246,6 +246,7 @@ static gsi::Methods methods_QGraphicsObject () { methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QGraphicsObject::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("enabledChanged()", "enabledChanged", "@brief Signal declaration for QGraphicsObject::enabledChanged()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("heightChanged()", "heightChanged", "@brief Signal declaration for QGraphicsObject::heightChanged()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QGraphicsObject::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("opacityChanged()", "opacityChanged", "@brief Signal declaration for QGraphicsObject::opacityChanged()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("parentChanged()", "parentChanged", "@brief Signal declaration for QGraphicsObject::parentChanged()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("rotationChanged()", "rotationChanged", "@brief Signal declaration for QGraphicsObject::rotationChanged()\nYou can bind a procedure to this signal."); @@ -462,6 +463,13 @@ public: } } + // [emitter impl] void QGraphicsObject::objectNameChanged(const QString &objectName) + void emitter_QGraphicsObject_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QGraphicsObject::objectNameChanged(const QString &objectName)'"); + } + // [emitter impl] void QGraphicsObject::opacityChanged() void emitter_QGraphicsObject_opacityChanged_0() { @@ -1927,6 +1935,24 @@ static void _set_callback_cbs_mouseReleaseEvent_3049_0 (void *cls, const gsi::Ca } +// emitter void QGraphicsObject::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QGraphicsObject_Adaptor *)cls)->emitter_QGraphicsObject_objectNameChanged_4567 (arg1); +} + + // emitter void QGraphicsObject::opacityChanged() static void _init_emitter_opacityChanged_0 (qt_gsi::GenericMethod *decl) @@ -2454,6 +2480,7 @@ static gsi::Methods methods_QGraphicsObject_Adaptor () { methods += new qt_gsi::GenericMethod ("*mousePressEvent", "@hide", false, &_init_cbs_mousePressEvent_3049_0, &_call_cbs_mousePressEvent_3049_0, &_set_callback_cbs_mousePressEvent_3049_0); methods += new qt_gsi::GenericMethod ("*mouseReleaseEvent", "@brief Virtual method void QGraphicsObject::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_mouseReleaseEvent_3049_0, &_call_cbs_mouseReleaseEvent_3049_0); methods += new qt_gsi::GenericMethod ("*mouseReleaseEvent", "@hide", false, &_init_cbs_mouseReleaseEvent_3049_0, &_call_cbs_mouseReleaseEvent_3049_0, &_set_callback_cbs_mouseReleaseEvent_3049_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QGraphicsObject::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("emit_opacityChanged", "@brief Emitter for signal void QGraphicsObject::opacityChanged()\nCall this method to emit this signal.", false, &_init_emitter_opacityChanged_0, &_call_emitter_opacityChanged_0); methods += new qt_gsi::GenericMethod ("opaqueArea", "@brief Virtual method QPainterPath QGraphicsObject::opaqueArea()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_opaqueArea_c0_0, &_call_cbs_opaqueArea_c0_0); methods += new qt_gsi::GenericMethod ("opaqueArea", "@hide", true, &_init_cbs_opaqueArea_c0_0, &_call_cbs_opaqueArea_c0_0, &_set_callback_cbs_opaqueArea_c0_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQGraphicsOpacityEffect.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQGraphicsOpacityEffect.cc index ebc270d01..1f607e493 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQGraphicsOpacityEffect.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQGraphicsOpacityEffect.cc @@ -192,6 +192,7 @@ static gsi::Methods methods_QGraphicsOpacityEffect () { methods += new qt_gsi::GenericMethod ("setOpacityMask|opacityMask=", "@brief Method void QGraphicsOpacityEffect::setOpacityMask(const QBrush &mask)\n", false, &_init_f_setOpacityMask_1910, &_call_f_setOpacityMask_1910); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QGraphicsOpacityEffect::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("enabledChanged(bool)", "enabledChanged", gsi::arg("enabled"), "@brief Signal declaration for QGraphicsOpacityEffect::enabledChanged(bool enabled)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QGraphicsOpacityEffect::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("opacityChanged(double)", "opacityChanged", gsi::arg("opacity"), "@brief Signal declaration for QGraphicsOpacityEffect::opacityChanged(double opacity)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("opacityMaskChanged(const QBrush &)", "opacityMaskChanged", gsi::arg("mask"), "@brief Signal declaration for QGraphicsOpacityEffect::opacityMaskChanged(const QBrush &mask)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QGraphicsOpacityEffect::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); @@ -330,6 +331,13 @@ public: } } + // [emitter impl] void QGraphicsOpacityEffect::objectNameChanged(const QString &objectName) + void emitter_QGraphicsOpacityEffect_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QGraphicsOpacityEffect::objectNameChanged(const QString &objectName)'"); + } + // [emitter impl] void QGraphicsOpacityEffect::opacityChanged(double opacity) void emitter_QGraphicsOpacityEffect_opacityChanged_1071(double opacity) { @@ -704,6 +712,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QGraphicsOpacityEffect::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QGraphicsOpacityEffect_Adaptor *)cls)->emitter_QGraphicsOpacityEffect_objectNameChanged_4567 (arg1); +} + + // emitter void QGraphicsOpacityEffect::opacityChanged(double opacity) static void _init_emitter_opacityChanged_1071 (qt_gsi::GenericMethod *decl) @@ -931,6 +957,7 @@ static gsi::Methods methods_QGraphicsOpacityEffect_Adaptor () { methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QGraphicsOpacityEffect::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QGraphicsOpacityEffect::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QGraphicsOpacityEffect::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("emit_opacityChanged", "@brief Emitter for signal void QGraphicsOpacityEffect::opacityChanged(double opacity)\nCall this method to emit this signal.", false, &_init_emitter_opacityChanged_1071, &_call_emitter_opacityChanged_1071); methods += new qt_gsi::GenericMethod ("emit_opacityMaskChanged", "@brief Emitter for signal void QGraphicsOpacityEffect::opacityMaskChanged(const QBrush &mask)\nCall this method to emit this signal.", false, &_init_emitter_opacityMaskChanged_1910, &_call_emitter_opacityMaskChanged_1910); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QGraphicsOpacityEffect::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQGraphicsProxyWidget.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQGraphicsProxyWidget.cc index 894183ebb..9f4ecd04b 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQGraphicsProxyWidget.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQGraphicsProxyWidget.cc @@ -299,6 +299,7 @@ static gsi::Methods methods_QGraphicsProxyWidget () { methods += gsi::qt_signal ("geometryChanged()", "geometryChanged", "@brief Signal declaration for QGraphicsProxyWidget::geometryChanged()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("heightChanged()", "heightChanged", "@brief Signal declaration for QGraphicsProxyWidget::heightChanged()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("layoutChanged()", "layoutChanged", "@brief Signal declaration for QGraphicsProxyWidget::layoutChanged()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QGraphicsProxyWidget::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("opacityChanged()", "opacityChanged", "@brief Signal declaration for QGraphicsProxyWidget::opacityChanged()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("parentChanged()", "parentChanged", "@brief Signal declaration for QGraphicsProxyWidget::parentChanged()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("rotationChanged()", "rotationChanged", "@brief Signal declaration for QGraphicsProxyWidget::rotationChanged()\nYou can bind a procedure to this signal."); @@ -544,6 +545,13 @@ public: emit QGraphicsProxyWidget::layoutChanged(); } + // [emitter impl] void QGraphicsProxyWidget::objectNameChanged(const QString &objectName) + void emitter_QGraphicsProxyWidget_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QGraphicsProxyWidget::objectNameChanged(const QString &objectName)'"); + } + // [emitter impl] void QGraphicsProxyWidget::opacityChanged() void emitter_QGraphicsProxyWidget_opacityChanged_0() { @@ -2615,6 +2623,24 @@ static void _call_fp_newProxyWidget_2010 (const qt_gsi::GenericMethod * /*decl*/ } +// emitter void QGraphicsProxyWidget::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QGraphicsProxyWidget_Adaptor *)cls)->emitter_QGraphicsProxyWidget_objectNameChanged_4567 (arg1); +} + + // emitter void QGraphicsProxyWidget::opacityChanged() static void _init_emitter_opacityChanged_0 (qt_gsi::GenericMethod *decl) @@ -3489,6 +3515,7 @@ static gsi::Methods methods_QGraphicsProxyWidget_Adaptor () { methods += new qt_gsi::GenericMethod ("*moveEvent", "@brief Virtual method void QGraphicsProxyWidget::moveEvent(QGraphicsSceneMoveEvent *event)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_moveEvent_2935_0, &_call_cbs_moveEvent_2935_0); methods += new qt_gsi::GenericMethod ("*moveEvent", "@hide", false, &_init_cbs_moveEvent_2935_0, &_call_cbs_moveEvent_2935_0, &_set_callback_cbs_moveEvent_2935_0); methods += new qt_gsi::GenericMethod ("*newProxyWidget", "@brief Method QGraphicsProxyWidget *QGraphicsProxyWidget::newProxyWidget(const QWidget *)\nThis method is protected and can only be called from inside a derived class.", false, &_init_fp_newProxyWidget_2010, &_call_fp_newProxyWidget_2010); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QGraphicsProxyWidget::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("emit_opacityChanged", "@brief Emitter for signal void QGraphicsProxyWidget::opacityChanged()\nCall this method to emit this signal.", false, &_init_emitter_opacityChanged_0, &_call_emitter_opacityChanged_0); methods += new qt_gsi::GenericMethod ("opaqueArea", "@brief Virtual method QPainterPath QGraphicsProxyWidget::opaqueArea()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_opaqueArea_c0_0, &_call_cbs_opaqueArea_c0_0); methods += new qt_gsi::GenericMethod ("opaqueArea", "@hide", true, &_init_cbs_opaqueArea_c0_0, &_call_cbs_opaqueArea_c0_0, &_set_callback_cbs_opaqueArea_c0_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQGraphicsRotation.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQGraphicsRotation.cc index 9546ab193..090365e74 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQGraphicsRotation.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQGraphicsRotation.cc @@ -269,6 +269,7 @@ static gsi::Methods methods_QGraphicsRotation () { methods += gsi::qt_signal ("angleChanged()", "angleChanged", "@brief Signal declaration for QGraphicsRotation::angleChanged()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("axisChanged()", "axisChanged", "@brief Signal declaration for QGraphicsRotation::axisChanged()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QGraphicsRotation::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QGraphicsRotation::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("originChanged()", "originChanged", "@brief Signal declaration for QGraphicsRotation::originChanged()\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QGraphicsRotation::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QGraphicsRotation::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); @@ -392,6 +393,13 @@ public: } } + // [emitter impl] void QGraphicsRotation::objectNameChanged(const QString &objectName) + void emitter_QGraphicsRotation_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QGraphicsRotation::objectNameChanged(const QString &objectName)'"); + } + // [emitter impl] void QGraphicsRotation::originChanged() void emitter_QGraphicsRotation_originChanged_0() { @@ -696,6 +704,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QGraphicsRotation::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QGraphicsRotation_Adaptor *)cls)->emitter_QGraphicsRotation_objectNameChanged_4567 (arg1); +} + + // emitter void QGraphicsRotation::originChanged() static void _init_emitter_originChanged_0 (qt_gsi::GenericMethod *decl) @@ -819,6 +845,7 @@ static gsi::Methods methods_QGraphicsRotation_Adaptor () { methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QGraphicsRotation::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QGraphicsRotation::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QGraphicsRotation::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("emit_originChanged", "@brief Emitter for signal void QGraphicsRotation::originChanged()\nCall this method to emit this signal.", false, &_init_emitter_originChanged_0, &_call_emitter_originChanged_0); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QGraphicsRotation::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QGraphicsRotation::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQGraphicsScale.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQGraphicsScale.cc index d2b37bac8..0a2cec0f4 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQGraphicsScale.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQGraphicsScale.cc @@ -283,6 +283,7 @@ static gsi::Methods methods_QGraphicsScale () { methods += new qt_gsi::GenericMethod (":yScale", "@brief Method double QGraphicsScale::yScale()\n", true, &_init_f_yScale_c0, &_call_f_yScale_c0); methods += new qt_gsi::GenericMethod (":zScale", "@brief Method double QGraphicsScale::zScale()\n", true, &_init_f_zScale_c0, &_call_f_zScale_c0); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QGraphicsScale::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QGraphicsScale::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("originChanged()", "originChanged", "@brief Signal declaration for QGraphicsScale::originChanged()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("scaleChanged()", "scaleChanged", "@brief Signal declaration for QGraphicsScale::scaleChanged()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("xScaleChanged()", "xScaleChanged", "@brief Signal declaration for QGraphicsScale::xScaleChanged()\nYou can bind a procedure to this signal."); @@ -398,6 +399,13 @@ public: } } + // [emitter impl] void QGraphicsScale::objectNameChanged(const QString &objectName) + void emitter_QGraphicsScale_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QGraphicsScale::objectNameChanged(const QString &objectName)'"); + } + // [emitter impl] void QGraphicsScale::originChanged() void emitter_QGraphicsScale_originChanged_0() { @@ -698,6 +706,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QGraphicsScale::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QGraphicsScale_Adaptor *)cls)->emitter_QGraphicsScale_objectNameChanged_4567 (arg1); +} + + // emitter void QGraphicsScale::originChanged() static void _init_emitter_originChanged_0 (qt_gsi::GenericMethod *decl) @@ -875,6 +901,7 @@ static gsi::Methods methods_QGraphicsScale_Adaptor () { methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QGraphicsScale::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QGraphicsScale::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QGraphicsScale::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("emit_originChanged", "@brief Emitter for signal void QGraphicsScale::originChanged()\nCall this method to emit this signal.", false, &_init_emitter_originChanged_0, &_call_emitter_originChanged_0); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QGraphicsScale::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("emit_scaleChanged", "@brief Emitter for signal void QGraphicsScale::scaleChanged()\nCall this method to emit this signal.", false, &_init_emitter_scaleChanged_0, &_call_emitter_scaleChanged_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQGraphicsScene.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQGraphicsScene.cc index bf9eb0662..a626c7e96 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQGraphicsScene.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQGraphicsScene.cc @@ -1821,6 +1821,7 @@ static gsi::Methods methods_QGraphicsScene () { methods += gsi::qt_signal & > ("changed(const QList &)", "changed", gsi::arg("region"), "@brief Signal declaration for QGraphicsScene::changed(const QList ®ion)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QGraphicsScene::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal::target_type & > ("focusItemChanged(QGraphicsItem *, QGraphicsItem *, Qt::FocusReason)", "focusItemChanged", gsi::arg("newFocus"), gsi::arg("oldFocus"), gsi::arg("reason"), "@brief Signal declaration for QGraphicsScene::focusItemChanged(QGraphicsItem *newFocus, QGraphicsItem *oldFocus, Qt::FocusReason reason)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QGraphicsScene::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("sceneRectChanged(const QRectF &)", "sceneRectChanged", gsi::arg("rect"), "@brief Signal declaration for QGraphicsScene::sceneRectChanged(const QRectF &rect)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("selectionChanged()", "selectionChanged", "@brief Signal declaration for QGraphicsScene::selectionChanged()\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QGraphicsScene::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); @@ -1939,6 +1940,13 @@ public: } } + // [emitter impl] void QGraphicsScene::objectNameChanged(const QString &objectName) + void emitter_QGraphicsScene_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QGraphicsScene::objectNameChanged(const QString &objectName)'"); + } + // [emitter impl] void QGraphicsScene::sceneRectChanged(const QRectF &rect) void emitter_QGraphicsScene_sceneRectChanged_1862(const QRectF &rect) { @@ -3063,6 +3071,24 @@ static void _set_callback_cbs_mouseReleaseEvent_3049_0 (void *cls, const gsi::Ca } +// emitter void QGraphicsScene::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QGraphicsScene_Adaptor *)cls)->emitter_QGraphicsScene_objectNameChanged_4567 (arg1); +} + + // exposed int QGraphicsScene::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -3250,6 +3276,7 @@ static gsi::Methods methods_QGraphicsScene_Adaptor () { methods += new qt_gsi::GenericMethod ("*mousePressEvent", "@hide", false, &_init_cbs_mousePressEvent_3049_0, &_call_cbs_mousePressEvent_3049_0, &_set_callback_cbs_mousePressEvent_3049_0); methods += new qt_gsi::GenericMethod ("*mouseReleaseEvent", "@brief Virtual method void QGraphicsScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_mouseReleaseEvent_3049_0, &_call_cbs_mouseReleaseEvent_3049_0); methods += new qt_gsi::GenericMethod ("*mouseReleaseEvent", "@hide", false, &_init_cbs_mouseReleaseEvent_3049_0, &_call_cbs_mouseReleaseEvent_3049_0, &_set_callback_cbs_mouseReleaseEvent_3049_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QGraphicsScene::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QGraphicsScene::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("emit_sceneRectChanged", "@brief Emitter for signal void QGraphicsScene::sceneRectChanged(const QRectF &rect)\nCall this method to emit this signal.", false, &_init_emitter_sceneRectChanged_1862, &_call_emitter_sceneRectChanged_1862); methods += new qt_gsi::GenericMethod ("emit_selectionChanged", "@brief Emitter for signal void QGraphicsScene::selectionChanged()\nCall this method to emit this signal.", false, &_init_emitter_selectionChanged_0, &_call_emitter_selectionChanged_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQGraphicsTextItem.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQGraphicsTextItem.cc index 405955a4f..345e1b721 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQGraphicsTextItem.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQGraphicsTextItem.cc @@ -665,6 +665,7 @@ static gsi::Methods methods_QGraphicsTextItem () { methods += gsi::qt_signal ("heightChanged()", "heightChanged", "@brief Signal declaration for QGraphicsTextItem::heightChanged()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("linkActivated(const QString &)", "linkActivated", gsi::arg("arg1"), "@brief Signal declaration for QGraphicsTextItem::linkActivated(const QString &)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("linkHovered(const QString &)", "linkHovered", gsi::arg("arg1"), "@brief Signal declaration for QGraphicsTextItem::linkHovered(const QString &)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QGraphicsTextItem::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("opacityChanged()", "opacityChanged", "@brief Signal declaration for QGraphicsTextItem::opacityChanged()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("parentChanged()", "parentChanged", "@brief Signal declaration for QGraphicsTextItem::parentChanged()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("rotationChanged()", "rotationChanged", "@brief Signal declaration for QGraphicsTextItem::rotationChanged()\nYou can bind a procedure to this signal."); @@ -901,6 +902,13 @@ public: emit QGraphicsTextItem::linkHovered(arg1); } + // [emitter impl] void QGraphicsTextItem::objectNameChanged(const QString &objectName) + void emitter_QGraphicsTextItem_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QGraphicsTextItem::objectNameChanged(const QString &objectName)'"); + } + // [emitter impl] void QGraphicsTextItem::opacityChanged() void emitter_QGraphicsTextItem_opacityChanged_0() { @@ -2420,6 +2428,24 @@ static void _set_callback_cbs_mouseReleaseEvent_3049_0 (void *cls, const gsi::Ca } +// emitter void QGraphicsTextItem::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QGraphicsTextItem_Adaptor *)cls)->emitter_QGraphicsTextItem_objectNameChanged_4567 (arg1); +} + + // emitter void QGraphicsTextItem::opacityChanged() static void _init_emitter_opacityChanged_0 (qt_gsi::GenericMethod *decl) @@ -2950,6 +2976,7 @@ static gsi::Methods methods_QGraphicsTextItem_Adaptor () { methods += new qt_gsi::GenericMethod ("*mousePressEvent", "@hide", false, &_init_cbs_mousePressEvent_3049_0, &_call_cbs_mousePressEvent_3049_0, &_set_callback_cbs_mousePressEvent_3049_0); methods += new qt_gsi::GenericMethod ("*mouseReleaseEvent", "@brief Virtual method void QGraphicsTextItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_mouseReleaseEvent_3049_0, &_call_cbs_mouseReleaseEvent_3049_0); methods += new qt_gsi::GenericMethod ("*mouseReleaseEvent", "@hide", false, &_init_cbs_mouseReleaseEvent_3049_0, &_call_cbs_mouseReleaseEvent_3049_0, &_set_callback_cbs_mouseReleaseEvent_3049_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QGraphicsTextItem::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("emit_opacityChanged", "@brief Emitter for signal void QGraphicsTextItem::opacityChanged()\nCall this method to emit this signal.", false, &_init_emitter_opacityChanged_0, &_call_emitter_opacityChanged_0); methods += new qt_gsi::GenericMethod ("opaqueArea", "@brief Virtual method QPainterPath QGraphicsTextItem::opaqueArea()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_opaqueArea_c0_0, &_call_cbs_opaqueArea_c0_0); methods += new qt_gsi::GenericMethod ("opaqueArea", "@hide", true, &_init_cbs_opaqueArea_c0_0, &_call_cbs_opaqueArea_c0_0, &_set_callback_cbs_opaqueArea_c0_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQGraphicsTransform.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQGraphicsTransform.cc index fb73672f6..cfea1f7ce 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQGraphicsTransform.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQGraphicsTransform.cc @@ -134,6 +134,7 @@ static gsi::Methods methods_QGraphicsTransform () { methods += new qt_gsi::GenericStaticMethod ("staticMetaObject", "@brief Obtains the static MetaObject for this class.", &_init_smo, &_call_smo); methods += new qt_gsi::GenericMethod ("applyTo", "@brief Method void QGraphicsTransform::applyTo(QMatrix4x4 *matrix)\n", true, &_init_f_applyTo_c1556, &_call_f_applyTo_c1556); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QGraphicsTransform::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QGraphicsTransform::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QGraphicsTransform::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QGraphicsTransform::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -245,6 +246,13 @@ public: } } + // [emitter impl] void QGraphicsTransform::objectNameChanged(const QString &objectName) + void emitter_QGraphicsTransform_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QGraphicsTransform::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] void QGraphicsTransform::childEvent(QChildEvent *) void cbs_childEvent_1701_0(QChildEvent *arg1) { @@ -515,6 +523,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QGraphicsTransform::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QGraphicsTransform_Adaptor *)cls)->emitter_QGraphicsTransform_objectNameChanged_4567 (arg1); +} + + // exposed int QGraphicsTransform::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -622,6 +648,7 @@ static gsi::Methods methods_QGraphicsTransform_Adaptor () { methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QGraphicsTransform::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QGraphicsTransform::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QGraphicsTransform::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QGraphicsTransform::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QGraphicsTransform::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QGraphicsTransform::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQGraphicsView.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQGraphicsView.cc index 97f17165e..9900f3570 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQGraphicsView.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQGraphicsView.cc @@ -1874,6 +1874,7 @@ static gsi::Methods methods_QGraphicsView () { methods += new qt_gsi::GenericMethod (":viewportUpdateMode", "@brief Method QGraphicsView::ViewportUpdateMode QGraphicsView::viewportUpdateMode()\n", true, &_init_f_viewportUpdateMode_c0, &_call_f_viewportUpdateMode_c0); methods += gsi::qt_signal ("customContextMenuRequested(const QPoint &)", "customContextMenuRequested", gsi::arg("pos"), "@brief Signal declaration for QGraphicsView::customContextMenuRequested(const QPoint &pos)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QGraphicsView::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QGraphicsView::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("rubberBandChanged(QRect, QPointF, QPointF)", "rubberBandChanged", gsi::arg("viewportRect"), gsi::arg("fromScenePoint"), gsi::arg("toScenePoint"), "@brief Signal declaration for QGraphicsView::rubberBandChanged(QRect viewportRect, QPointF fromScenePoint, QPointF toScenePoint)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconChanged(const QIcon &)", "windowIconChanged", gsi::arg("icon"), "@brief Signal declaration for QGraphicsView::windowIconChanged(const QIcon &icon)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconTextChanged(const QString &)", "windowIconTextChanged", gsi::arg("iconText"), "@brief Signal declaration for QGraphicsView::windowIconTextChanged(const QString &iconText)\nYou can bind a procedure to this signal."); @@ -2066,6 +2067,13 @@ public: } } + // [emitter impl] void QGraphicsView::objectNameChanged(const QString &objectName) + void emitter_QGraphicsView_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QGraphicsView::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QPaintEngine *QGraphicsView::paintEngine() QPaintEngine * cbs_paintEngine_c0_0() const { @@ -3918,6 +3926,24 @@ static void _set_callback_cbs_nativeEvent_4678_0 (void *cls, const gsi::Callback } +// emitter void QGraphicsView::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QGraphicsView_Adaptor *)cls)->emitter_QGraphicsView_objectNameChanged_4567 (arg1); +} + + // QPaintEngine *QGraphicsView::paintEngine() static void _init_cbs_paintEngine_c0_0 (qt_gsi::GenericMethod *decl) @@ -4549,6 +4575,7 @@ static gsi::Methods methods_QGraphicsView_Adaptor () { methods += new qt_gsi::GenericMethod ("*moveEvent", "@hide", false, &_init_cbs_moveEvent_1624_0, &_call_cbs_moveEvent_1624_0, &_set_callback_cbs_moveEvent_1624_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@brief Virtual method bool QGraphicsView::nativeEvent(const QByteArray &eventType, void *message, long int *result)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QGraphicsView::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("paintEngine", "@brief Virtual method QPaintEngine *QGraphicsView::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@hide", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0, &_set_callback_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("*paintEvent", "@brief Virtual method void QGraphicsView::paintEvent(QPaintEvent *event)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_paintEvent_1725_0, &_call_cbs_paintEvent_1725_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQGraphicsWidget.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQGraphicsWidget.cc index ae028fa54..8c956340c 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQGraphicsWidget.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQGraphicsWidget.cc @@ -1334,6 +1334,7 @@ static gsi::Methods methods_QGraphicsWidget () { methods += gsi::qt_signal ("geometryChanged()", "geometryChanged", "@brief Signal declaration for QGraphicsWidget::geometryChanged()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("heightChanged()", "heightChanged", "@brief Signal declaration for QGraphicsWidget::heightChanged()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("layoutChanged()", "layoutChanged", "@brief Signal declaration for QGraphicsWidget::layoutChanged()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QGraphicsWidget::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("opacityChanged()", "opacityChanged", "@brief Signal declaration for QGraphicsWidget::opacityChanged()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("parentChanged()", "parentChanged", "@brief Signal declaration for QGraphicsWidget::parentChanged()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("rotationChanged()", "rotationChanged", "@brief Signal declaration for QGraphicsWidget::rotationChanged()\nYou can bind a procedure to this signal."); @@ -1594,6 +1595,13 @@ public: emit QGraphicsWidget::layoutChanged(); } + // [emitter impl] void QGraphicsWidget::objectNameChanged(const QString &objectName) + void emitter_QGraphicsWidget_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QGraphicsWidget::objectNameChanged(const QString &objectName)'"); + } + // [emitter impl] void QGraphicsWidget::opacityChanged() void emitter_QGraphicsWidget_opacityChanged_0() { @@ -3632,6 +3640,24 @@ static void _set_callback_cbs_moveEvent_2935_0 (void *cls, const gsi::Callback & } +// emitter void QGraphicsWidget::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QGraphicsWidget_Adaptor *)cls)->emitter_QGraphicsWidget_objectNameChanged_4567 (arg1); +} + + // emitter void QGraphicsWidget::opacityChanged() static void _init_emitter_opacityChanged_0 (qt_gsi::GenericMethod *decl) @@ -4505,6 +4531,7 @@ static gsi::Methods methods_QGraphicsWidget_Adaptor () { methods += new qt_gsi::GenericMethod ("*mouseReleaseEvent", "@hide", false, &_init_cbs_mouseReleaseEvent_3049_0, &_call_cbs_mouseReleaseEvent_3049_0, &_set_callback_cbs_mouseReleaseEvent_3049_0); methods += new qt_gsi::GenericMethod ("*moveEvent", "@brief Virtual method void QGraphicsWidget::moveEvent(QGraphicsSceneMoveEvent *event)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_moveEvent_2935_0, &_call_cbs_moveEvent_2935_0); methods += new qt_gsi::GenericMethod ("*moveEvent", "@hide", false, &_init_cbs_moveEvent_2935_0, &_call_cbs_moveEvent_2935_0, &_set_callback_cbs_moveEvent_2935_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QGraphicsWidget::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("emit_opacityChanged", "@brief Emitter for signal void QGraphicsWidget::opacityChanged()\nCall this method to emit this signal.", false, &_init_emitter_opacityChanged_0, &_call_emitter_opacityChanged_0); methods += new qt_gsi::GenericMethod ("opaqueArea", "@brief Virtual method QPainterPath QGraphicsWidget::opaqueArea()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_opaqueArea_c0_0, &_call_cbs_opaqueArea_c0_0); methods += new qt_gsi::GenericMethod ("opaqueArea", "@hide", true, &_init_cbs_opaqueArea_c0_0, &_call_cbs_opaqueArea_c0_0, &_set_callback_cbs_opaqueArea_c0_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQGridLayout.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQGridLayout.cc index 9f5854e2e..a7e4bfe5f 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQGridLayout.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQGridLayout.cc @@ -983,6 +983,7 @@ static gsi::Methods methods_QGridLayout () { methods += new qt_gsi::GenericMethod ("takeAt", "@brief Method QLayoutItem *QGridLayout::takeAt(int index)\nThis is a reimplementation of QLayout::takeAt", false, &_init_f_takeAt_767, &_call_f_takeAt_767); methods += new qt_gsi::GenericMethod (":verticalSpacing", "@brief Method int QGridLayout::verticalSpacing()\n", true, &_init_f_verticalSpacing_c0, &_call_f_verticalSpacing_c0); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QGridLayout::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QGridLayout::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QGridLayout::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QGridLayout::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -1308,6 +1309,13 @@ public: } } + // [emitter impl] void QGridLayout::objectNameChanged(const QString &objectName) + void emitter_QGridLayout_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QGridLayout::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] void QGridLayout::setGeometry(const QRect &) void cbs_setGeometry_1792_0(const QRect &arg1) { @@ -2059,6 +2067,24 @@ static void _set_callback_cbs_minimumSize_c0_0 (void *cls, const gsi::Callback & } +// emitter void QGridLayout::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QGridLayout_Adaptor *)cls)->emitter_QGridLayout_objectNameChanged_4567 (arg1); +} + + // exposed int QGridLayout::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -2307,6 +2333,7 @@ static gsi::Methods methods_QGridLayout_Adaptor () { methods += new qt_gsi::GenericMethod ("minimumHeightForWidth", "@hide", true, &_init_cbs_minimumHeightForWidth_c767_0, &_call_cbs_minimumHeightForWidth_c767_0, &_set_callback_cbs_minimumHeightForWidth_c767_0); methods += new qt_gsi::GenericMethod ("minimumSize", "@brief Virtual method QSize QGridLayout::minimumSize()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_minimumSize_c0_0, &_call_cbs_minimumSize_c0_0); methods += new qt_gsi::GenericMethod ("minimumSize", "@hide", true, &_init_cbs_minimumSize_c0_0, &_call_cbs_minimumSize_c0_0, &_set_callback_cbs_minimumSize_c0_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QGridLayout::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QGridLayout::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QGridLayout::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QGridLayout::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQGroupBox.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQGroupBox.cc index 3cf37230e..f2676e27d 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQGroupBox.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQGroupBox.cc @@ -361,6 +361,7 @@ static gsi::Methods methods_QGroupBox () { methods += gsi::qt_signal ("clicked(bool)", "clicked", gsi::arg("checked"), "@brief Signal declaration for QGroupBox::clicked(bool checked)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("customContextMenuRequested(const QPoint &)", "customContextMenuRequested", gsi::arg("pos"), "@brief Signal declaration for QGroupBox::customContextMenuRequested(const QPoint &pos)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QGroupBox::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QGroupBox::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("toggled(bool)", "toggled", gsi::arg("arg1"), "@brief Signal declaration for QGroupBox::toggled(bool)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconChanged(const QIcon &)", "windowIconChanged", gsi::arg("icon"), "@brief Signal declaration for QGroupBox::windowIconChanged(const QIcon &icon)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconTextChanged(const QString &)", "windowIconTextChanged", gsi::arg("iconText"), "@brief Signal declaration for QGroupBox::windowIconTextChanged(const QString &iconText)\nYou can bind a procedure to this signal."); @@ -554,6 +555,13 @@ public: } } + // [emitter impl] void QGroupBox::objectNameChanged(const QString &objectName) + void emitter_QGroupBox_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QGroupBox::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QPaintEngine *QGroupBox::paintEngine() QPaintEngine * cbs_paintEngine_c0_0() const { @@ -2240,6 +2248,24 @@ static void _set_callback_cbs_nativeEvent_4678_0 (void *cls, const gsi::Callback } +// emitter void QGroupBox::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QGroupBox_Adaptor *)cls)->emitter_QGroupBox_objectNameChanged_4567 (arg1); +} + + // QPaintEngine *QGroupBox::paintEngine() static void _init_cbs_paintEngine_c0_0 (qt_gsi::GenericMethod *decl) @@ -2707,6 +2733,7 @@ static gsi::Methods methods_QGroupBox_Adaptor () { methods += new qt_gsi::GenericMethod ("*moveEvent", "@hide", false, &_init_cbs_moveEvent_1624_0, &_call_cbs_moveEvent_1624_0, &_set_callback_cbs_moveEvent_1624_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@brief Virtual method bool QGroupBox::nativeEvent(const QByteArray &eventType, void *message, long int *result)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QGroupBox::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("paintEngine", "@brief Virtual method QPaintEngine *QGroupBox::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@hide", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0, &_set_callback_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("*paintEvent", "@brief Virtual method void QGroupBox::paintEvent(QPaintEvent *event)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_paintEvent_1725_0, &_call_cbs_paintEvent_1725_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQHBoxLayout.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQHBoxLayout.cc index 3ef51bdab..dbd4baa95 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQHBoxLayout.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQHBoxLayout.cc @@ -119,6 +119,7 @@ static gsi::Methods methods_QHBoxLayout () { gsi::Methods methods; methods += new qt_gsi::GenericStaticMethod ("staticMetaObject", "@brief Obtains the static MetaObject for this class.", &_init_smo, &_call_smo); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QHBoxLayout::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QHBoxLayout::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QHBoxLayout::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QHBoxLayout::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -459,6 +460,13 @@ public: } } + // [emitter impl] void QHBoxLayout::objectNameChanged(const QString &objectName) + void emitter_QHBoxLayout_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QHBoxLayout::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] void QHBoxLayout::setGeometry(const QRect &) void cbs_setGeometry_1792_0(const QRect &arg1) { @@ -1195,6 +1203,24 @@ static void _set_callback_cbs_minimumSize_c0_0 (void *cls, const gsi::Callback & } +// emitter void QHBoxLayout::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QHBoxLayout_Adaptor *)cls)->emitter_QHBoxLayout_objectNameChanged_4567 (arg1); +} + + // exposed int QHBoxLayout::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -1443,6 +1469,7 @@ static gsi::Methods methods_QHBoxLayout_Adaptor () { methods += new qt_gsi::GenericMethod ("minimumHeightForWidth", "@hide", true, &_init_cbs_minimumHeightForWidth_c767_0, &_call_cbs_minimumHeightForWidth_c767_0, &_set_callback_cbs_minimumHeightForWidth_c767_0); methods += new qt_gsi::GenericMethod ("minimumSize", "@brief Virtual method QSize QHBoxLayout::minimumSize()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_minimumSize_c0_0, &_call_cbs_minimumSize_c0_0); methods += new qt_gsi::GenericMethod ("minimumSize", "@hide", true, &_init_cbs_minimumSize_c0_0, &_call_cbs_minimumSize_c0_0, &_set_callback_cbs_minimumSize_c0_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QHBoxLayout::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QHBoxLayout::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QHBoxLayout::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QHBoxLayout::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQHeaderView.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQHeaderView.cc index 0a6abdc78..fac20bef0 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQHeaderView.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQHeaderView.cc @@ -1441,6 +1441,7 @@ static gsi::Methods methods_QHeaderView () { methods += gsi::qt_signal ("entered(const QModelIndex &)", "entered", gsi::arg("index"), "@brief Signal declaration for QHeaderView::entered(const QModelIndex &index)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("geometriesChanged()", "geometriesChanged", "@brief Signal declaration for QHeaderView::geometriesChanged()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("iconSizeChanged(const QSize &)", "iconSizeChanged", gsi::arg("size"), "@brief Signal declaration for QHeaderView::iconSizeChanged(const QSize &size)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QHeaderView::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("pressed(const QModelIndex &)", "pressed", gsi::arg("index"), "@brief Signal declaration for QHeaderView::pressed(const QModelIndex &index)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("sectionClicked(int)", "sectionClicked", gsi::arg("logicalIndex"), "@brief Signal declaration for QHeaderView::sectionClicked(int logicalIndex)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("sectionCountChanged(int, int)", "sectionCountChanged", gsi::arg("oldCount"), gsi::arg("newCount"), "@brief Signal declaration for QHeaderView::sectionCountChanged(int oldCount, int newCount)\nYou can bind a procedure to this signal."); @@ -1807,6 +1808,13 @@ public: } } + // [emitter impl] void QHeaderView::objectNameChanged(const QString &objectName) + void emitter_QHeaderView_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QHeaderView::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QPaintEngine *QHeaderView::paintEngine() QPaintEngine * cbs_paintEngine_c0_0() const { @@ -4797,6 +4805,24 @@ static void _set_callback_cbs_nativeEvent_4678_0 (void *cls, const gsi::Callback } +// emitter void QHeaderView::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QHeaderView_Adaptor *)cls)->emitter_QHeaderView_objectNameChanged_4567 (arg1); +} + + // QPaintEngine *QHeaderView::paintEngine() static void _init_cbs_paintEngine_c0_0 (qt_gsi::GenericMethod *decl) @@ -6521,6 +6547,7 @@ static gsi::Methods methods_QHeaderView_Adaptor () { methods += new qt_gsi::GenericMethod ("*moveEvent", "@hide", false, &_init_cbs_moveEvent_1624_0, &_call_cbs_moveEvent_1624_0, &_set_callback_cbs_moveEvent_1624_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@brief Virtual method bool QHeaderView::nativeEvent(const QByteArray &eventType, void *message, long int *result)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QHeaderView::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("paintEngine", "@brief Virtual method QPaintEngine *QHeaderView::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@hide", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0, &_set_callback_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("*paintEvent", "@brief Virtual method void QHeaderView::paintEvent(QPaintEvent *e)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_paintEvent_1725_0, &_call_cbs_paintEvent_1725_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQInputDialog.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQInputDialog.cc index 71ad5cb9b..8e3adf0c9 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQInputDialog.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQInputDialog.cc @@ -1206,6 +1206,7 @@ static gsi::Methods methods_QInputDialog () { methods += gsi::qt_signal ("finished(int)", "finished", gsi::arg("result"), "@brief Signal declaration for QInputDialog::finished(int result)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("intValueChanged(int)", "intValueChanged", gsi::arg("value"), "@brief Signal declaration for QInputDialog::intValueChanged(int value)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("intValueSelected(int)", "intValueSelected", gsi::arg("value"), "@brief Signal declaration for QInputDialog::intValueSelected(int value)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QInputDialog::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("rejected()", "rejected", "@brief Signal declaration for QInputDialog::rejected()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("textValueChanged(const QString &)", "textValueChanged", gsi::arg("text"), "@brief Signal declaration for QInputDialog::textValueChanged(const QString &text)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("textValueSelected(const QString &)", "textValueSelected", gsi::arg("text"), "@brief Signal declaration for QInputDialog::textValueSelected(const QString &text)\nYou can bind a procedure to this signal."); @@ -1460,6 +1461,13 @@ public: } } + // [emitter impl] void QInputDialog::objectNameChanged(const QString &objectName) + void emitter_QInputDialog_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QInputDialog::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] void QInputDialog::open() void cbs_open_0_0() { @@ -3339,6 +3347,24 @@ static void _set_callback_cbs_nativeEvent_4678_0 (void *cls, const gsi::Callback } +// emitter void QInputDialog::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QInputDialog_Adaptor *)cls)->emitter_QInputDialog_objectNameChanged_4567 (arg1); +} + + // void QInputDialog::open() static void _init_cbs_open_0_0 (qt_gsi::GenericMethod *decl) @@ -3888,6 +3914,7 @@ static gsi::Methods methods_QInputDialog_Adaptor () { methods += new qt_gsi::GenericMethod ("*moveEvent", "@hide", false, &_init_cbs_moveEvent_1624_0, &_call_cbs_moveEvent_1624_0, &_set_callback_cbs_moveEvent_1624_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@brief Virtual method bool QInputDialog::nativeEvent(const QByteArray &eventType, void *message, long int *result)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QInputDialog::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("open", "@brief Virtual method void QInputDialog::open()\nThis method can be reimplemented in a derived class.", false, &_init_cbs_open_0_0, &_call_cbs_open_0_0); methods += new qt_gsi::GenericMethod ("open", "@hide", false, &_init_cbs_open_0_0, &_call_cbs_open_0_0, &_set_callback_cbs_open_0_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@brief Virtual method QPaintEngine *QInputDialog::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQItemDelegate.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQItemDelegate.cc index d1901557d..4ab906af6 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQItemDelegate.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQItemDelegate.cc @@ -356,6 +356,7 @@ static gsi::Methods methods_QItemDelegate () { methods += gsi::qt_signal::target_type & > ("closeEditor(QWidget *, QAbstractItemDelegate::EndEditHint)", "closeEditor", gsi::arg("editor"), gsi::arg("hint"), "@brief Signal declaration for QItemDelegate::closeEditor(QWidget *editor, QAbstractItemDelegate::EndEditHint hint)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("commitData(QWidget *)", "commitData", gsi::arg("editor"), "@brief Signal declaration for QItemDelegate::commitData(QWidget *editor)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QItemDelegate::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QItemDelegate::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("sizeHintChanged(const QModelIndex &)", "sizeHintChanged", gsi::arg("arg1"), "@brief Signal declaration for QItemDelegate::sizeHintChanged(const QModelIndex &)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QItemDelegate::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QItemDelegate::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); @@ -529,6 +530,13 @@ public: } } + // [emitter impl] void QItemDelegate::objectNameChanged(const QString &objectName) + void emitter_QItemDelegate_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QItemDelegate::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] void QItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) void cbs_paint_c6971_0(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const { @@ -1363,6 +1371,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QItemDelegate::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QItemDelegate_Adaptor *)cls)->emitter_QItemDelegate_objectNameChanged_4567 (arg1); +} + + // void QItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) static void _init_cbs_paint_c6971_0 (qt_gsi::GenericMethod *decl) @@ -1751,6 +1777,7 @@ static gsi::Methods methods_QItemDelegate_Adaptor () { methods += new qt_gsi::GenericMethod ("helpEvent", "@brief Virtual method bool QItemDelegate::helpEvent(QHelpEvent *event, QAbstractItemView *view, const QStyleOptionViewItem &option, const QModelIndex &index)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_helpEvent_9380_0, &_call_cbs_helpEvent_9380_0); methods += new qt_gsi::GenericMethod ("helpEvent", "@hide", false, &_init_cbs_helpEvent_9380_0, &_call_cbs_helpEvent_9380_0, &_set_callback_cbs_helpEvent_9380_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QItemDelegate::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QItemDelegate::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("paint", "@brief Virtual method void QItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paint_c6971_0, &_call_cbs_paint_c6971_0); methods += new qt_gsi::GenericMethod ("paint", "@hide", true, &_init_cbs_paint_c6971_0, &_call_cbs_paint_c6971_0, &_set_callback_cbs_paint_c6971_0); methods += new qt_gsi::GenericMethod ("paintingRoles", "@brief Virtual method QVector QItemDelegate::paintingRoles()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintingRoles_c0_0, &_call_cbs_paintingRoles_c0_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQKeySequenceEdit.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQKeySequenceEdit.cc index ffedaf89e..ccc94af34 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQKeySequenceEdit.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQKeySequenceEdit.cc @@ -214,6 +214,7 @@ static gsi::Methods methods_QKeySequenceEdit () { methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QKeySequenceEdit::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("editingFinished()", "editingFinished", "@brief Signal declaration for QKeySequenceEdit::editingFinished()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("keySequenceChanged(const QKeySequence &)", "keySequenceChanged", gsi::arg("keySequence"), "@brief Signal declaration for QKeySequenceEdit::keySequenceChanged(const QKeySequence &keySequence)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QKeySequenceEdit::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconChanged(const QIcon &)", "windowIconChanged", gsi::arg("icon"), "@brief Signal declaration for QKeySequenceEdit::windowIconChanged(const QIcon &icon)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconTextChanged(const QString &)", "windowIconTextChanged", gsi::arg("iconText"), "@brief Signal declaration for QKeySequenceEdit::windowIconTextChanged(const QString &iconText)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowTitleChanged(const QString &)", "windowTitleChanged", gsi::arg("title"), "@brief Signal declaration for QKeySequenceEdit::windowTitleChanged(const QString &title)\nYou can bind a procedure to this signal."); @@ -407,6 +408,13 @@ public: } } + // [emitter impl] void QKeySequenceEdit::objectNameChanged(const QString &objectName) + void emitter_QKeySequenceEdit_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QKeySequenceEdit::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QPaintEngine *QKeySequenceEdit::paintEngine() QPaintEngine * cbs_paintEngine_c0_0() const { @@ -2082,6 +2090,24 @@ static void _set_callback_cbs_nativeEvent_4678_0 (void *cls, const gsi::Callback } +// emitter void QKeySequenceEdit::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QKeySequenceEdit_Adaptor *)cls)->emitter_QKeySequenceEdit_objectNameChanged_4567 (arg1); +} + + // QPaintEngine *QKeySequenceEdit::paintEngine() static void _init_cbs_paintEngine_c0_0 (qt_gsi::GenericMethod *decl) @@ -2531,6 +2557,7 @@ static gsi::Methods methods_QKeySequenceEdit_Adaptor () { methods += new qt_gsi::GenericMethod ("*moveEvent", "@hide", false, &_init_cbs_moveEvent_1624_0, &_call_cbs_moveEvent_1624_0, &_set_callback_cbs_moveEvent_1624_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@brief Virtual method bool QKeySequenceEdit::nativeEvent(const QByteArray &eventType, void *message, long int *result)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QKeySequenceEdit::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("paintEngine", "@brief Virtual method QPaintEngine *QKeySequenceEdit::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@hide", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0, &_set_callback_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("*paintEvent", "@brief Virtual method void QKeySequenceEdit::paintEvent(QPaintEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_paintEvent_1725_0, &_call_cbs_paintEvent_1725_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQLCDNumber.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQLCDNumber.cc index acb0d906e..b468dacfb 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQLCDNumber.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQLCDNumber.cc @@ -526,6 +526,7 @@ static gsi::Methods methods_QLCDNumber () { methods += new qt_gsi::GenericMethod (":value", "@brief Method double QLCDNumber::value()\n", true, &_init_f_value_c0, &_call_f_value_c0); methods += gsi::qt_signal ("customContextMenuRequested(const QPoint &)", "customContextMenuRequested", gsi::arg("pos"), "@brief Signal declaration for QLCDNumber::customContextMenuRequested(const QPoint &pos)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QLCDNumber::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QLCDNumber::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("overflow()", "overflow", "@brief Signal declaration for QLCDNumber::overflow()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconChanged(const QIcon &)", "windowIconChanged", gsi::arg("icon"), "@brief Signal declaration for QLCDNumber::windowIconChanged(const QIcon &icon)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconTextChanged(const QString &)", "windowIconTextChanged", gsi::arg("iconText"), "@brief Signal declaration for QLCDNumber::windowIconTextChanged(const QString &iconText)\nYou can bind a procedure to this signal."); @@ -718,6 +719,13 @@ public: } } + // [emitter impl] void QLCDNumber::objectNameChanged(const QString &objectName) + void emitter_QLCDNumber_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QLCDNumber::objectNameChanged(const QString &objectName)'"); + } + // [emitter impl] void QLCDNumber::overflow() void emitter_QLCDNumber_overflow_0() { @@ -2405,6 +2413,24 @@ static void _set_callback_cbs_nativeEvent_4678_0 (void *cls, const gsi::Callback } +// emitter void QLCDNumber::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QLCDNumber_Adaptor *)cls)->emitter_QLCDNumber_objectNameChanged_4567 (arg1); +} + + // emitter void QLCDNumber::overflow() static void _init_emitter_overflow_0 (qt_gsi::GenericMethod *decl) @@ -2868,6 +2894,7 @@ static gsi::Methods methods_QLCDNumber_Adaptor () { methods += new qt_gsi::GenericMethod ("*moveEvent", "@hide", false, &_init_cbs_moveEvent_1624_0, &_call_cbs_moveEvent_1624_0, &_set_callback_cbs_moveEvent_1624_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@brief Virtual method bool QLCDNumber::nativeEvent(const QByteArray &eventType, void *message, long int *result)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QLCDNumber::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("emit_overflow", "@brief Emitter for signal void QLCDNumber::overflow()\nCall this method to emit this signal.", false, &_init_emitter_overflow_0, &_call_emitter_overflow_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@brief Virtual method QPaintEngine *QLCDNumber::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@hide", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0, &_set_callback_cbs_paintEngine_c0_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQLabel.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQLabel.cc index 08149b451..02268605a 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQLabel.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQLabel.cc @@ -827,6 +827,7 @@ static gsi::Methods methods_QLabel () { methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QLabel::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("linkActivated(const QString &)", "linkActivated", gsi::arg("link"), "@brief Signal declaration for QLabel::linkActivated(const QString &link)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("linkHovered(const QString &)", "linkHovered", gsi::arg("link"), "@brief Signal declaration for QLabel::linkHovered(const QString &link)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QLabel::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconChanged(const QIcon &)", "windowIconChanged", gsi::arg("icon"), "@brief Signal declaration for QLabel::windowIconChanged(const QIcon &icon)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconTextChanged(const QString &)", "windowIconTextChanged", gsi::arg("iconText"), "@brief Signal declaration for QLabel::windowIconTextChanged(const QString &iconText)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowTitleChanged(const QString &)", "windowTitleChanged", gsi::arg("title"), "@brief Signal declaration for QLabel::windowTitleChanged(const QString &title)\nYou can bind a procedure to this signal."); @@ -1042,6 +1043,13 @@ public: } } + // [emitter impl] void QLabel::objectNameChanged(const QString &objectName) + void emitter_QLabel_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QLabel::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QPaintEngine *QLabel::paintEngine() QPaintEngine * cbs_paintEngine_c0_0() const { @@ -2765,6 +2773,24 @@ static void _set_callback_cbs_nativeEvent_4678_0 (void *cls, const gsi::Callback } +// emitter void QLabel::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QLabel_Adaptor *)cls)->emitter_QLabel_objectNameChanged_4567 (arg1); +} + + // QPaintEngine *QLabel::paintEngine() static void _init_cbs_paintEngine_c0_0 (qt_gsi::GenericMethod *decl) @@ -3216,6 +3242,7 @@ static gsi::Methods methods_QLabel_Adaptor () { methods += new qt_gsi::GenericMethod ("*moveEvent", "@hide", false, &_init_cbs_moveEvent_1624_0, &_call_cbs_moveEvent_1624_0, &_set_callback_cbs_moveEvent_1624_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@brief Virtual method bool QLabel::nativeEvent(const QByteArray &eventType, void *message, long int *result)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QLabel::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("paintEngine", "@brief Virtual method QPaintEngine *QLabel::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@hide", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0, &_set_callback_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("*paintEvent", "@brief Virtual method void QLabel::paintEvent(QPaintEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_paintEvent_1725_0, &_call_cbs_paintEvent_1725_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQLayout.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQLayout.cc index b59656bdb..f66d76605 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQLayout.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQLayout.cc @@ -1004,6 +1004,7 @@ static gsi::Methods methods_QLayout () { methods += new qt_gsi::GenericMethod ("totalSizeHint", "@brief Method QSize QLayout::totalSizeHint()\n", true, &_init_f_totalSizeHint_c0, &_call_f_totalSizeHint_c0); methods += new qt_gsi::GenericMethod ("update", "@brief Method void QLayout::update()\n", false, &_init_f_update_0, &_call_f_update_0); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QLayout::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QLayout::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("closestAcceptableSize", "@brief Static method QSize QLayout::closestAcceptableSize(const QWidget *w, const QSize &s)\nThis method is static and can be called without an instance.", &_init_f_closestAcceptableSize_3707, &_call_f_closestAcceptableSize_3707); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QLayout::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QLayout::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); @@ -1351,6 +1352,13 @@ public: } } + // [emitter impl] void QLayout::objectNameChanged(const QString &objectName) + void emitter_QLayout_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QLayout::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] void QLayout::setGeometry(const QRect &) void cbs_setGeometry_1792_0(const QRect &arg1) { @@ -2088,6 +2096,24 @@ static void _set_callback_cbs_minimumSize_c0_0 (void *cls, const gsi::Callback & } +// emitter void QLayout::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QLayout_Adaptor *)cls)->emitter_QLayout_objectNameChanged_4567 (arg1); +} + + // exposed int QLayout::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -2336,6 +2362,7 @@ static gsi::Methods methods_QLayout_Adaptor () { methods += new qt_gsi::GenericMethod ("minimumHeightForWidth", "@hide", true, &_init_cbs_minimumHeightForWidth_c767_0, &_call_cbs_minimumHeightForWidth_c767_0, &_set_callback_cbs_minimumHeightForWidth_c767_0); methods += new qt_gsi::GenericMethod ("minimumSize", "@brief Virtual method QSize QLayout::minimumSize()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_minimumSize_c0_0, &_call_cbs_minimumSize_c0_0); methods += new qt_gsi::GenericMethod ("minimumSize", "@hide", true, &_init_cbs_minimumSize_c0_0, &_call_cbs_minimumSize_c0_0, &_set_callback_cbs_minimumSize_c0_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QLayout::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QLayout::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QLayout::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QLayout::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQLineEdit.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQLineEdit.cc index 5ead383e1..060b6c701 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQLineEdit.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQLineEdit.cc @@ -1451,6 +1451,7 @@ static gsi::Methods methods_QLineEdit () { methods += gsi::qt_signal ("customContextMenuRequested(const QPoint &)", "customContextMenuRequested", gsi::arg("pos"), "@brief Signal declaration for QLineEdit::customContextMenuRequested(const QPoint &pos)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QLineEdit::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("editingFinished()", "editingFinished", "@brief Signal declaration for QLineEdit::editingFinished()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QLineEdit::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("returnPressed()", "returnPressed", "@brief Signal declaration for QLineEdit::returnPressed()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("selectionChanged()", "selectionChanged", "@brief Signal declaration for QLineEdit::selectionChanged()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("textChanged(const QString &)", "textChanged", gsi::arg("arg1"), "@brief Signal declaration for QLineEdit::textChanged(const QString &)\nYou can bind a procedure to this signal."); @@ -1673,6 +1674,13 @@ public: } } + // [emitter impl] void QLineEdit::objectNameChanged(const QString &objectName) + void emitter_QLineEdit_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QLineEdit::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QPaintEngine *QLineEdit::paintEngine() QPaintEngine * cbs_paintEngine_c0_0() const { @@ -3393,6 +3401,24 @@ static void _set_callback_cbs_nativeEvent_4678_0 (void *cls, const gsi::Callback } +// emitter void QLineEdit::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QLineEdit_Adaptor *)cls)->emitter_QLineEdit_objectNameChanged_4567 (arg1); +} + + // QPaintEngine *QLineEdit::paintEngine() static void _init_cbs_paintEngine_c0_0 (qt_gsi::GenericMethod *decl) @@ -3908,6 +3934,7 @@ static gsi::Methods methods_QLineEdit_Adaptor () { methods += new qt_gsi::GenericMethod ("*moveEvent", "@hide", false, &_init_cbs_moveEvent_1624_0, &_call_cbs_moveEvent_1624_0, &_set_callback_cbs_moveEvent_1624_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@brief Virtual method bool QLineEdit::nativeEvent(const QByteArray &eventType, void *message, long int *result)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QLineEdit::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("paintEngine", "@brief Virtual method QPaintEngine *QLineEdit::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@hide", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0, &_set_callback_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("*paintEvent", "@brief Virtual method void QLineEdit::paintEvent(QPaintEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_paintEvent_1725_0, &_call_cbs_paintEvent_1725_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQListView.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQListView.cc index 605bcd48b..990a97528 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQListView.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQListView.cc @@ -833,6 +833,7 @@ static gsi::Methods methods_QListView () { methods += gsi::qt_signal ("entered(const QModelIndex &)", "entered", gsi::arg("index"), "@brief Signal declaration for QListView::entered(const QModelIndex &index)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("iconSizeChanged(const QSize &)", "iconSizeChanged", gsi::arg("size"), "@brief Signal declaration for QListView::iconSizeChanged(const QSize &size)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal & > ("indexesMoved(const QModelIndexList &)", "indexesMoved", gsi::arg("indexes"), "@brief Signal declaration for QListView::indexesMoved(const QList &indexes)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QListView::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("pressed(const QModelIndex &)", "pressed", gsi::arg("index"), "@brief Signal declaration for QListView::pressed(const QModelIndex &index)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("viewportEntered()", "viewportEntered", "@brief Signal declaration for QListView::viewportEntered()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconChanged(const QIcon &)", "windowIconChanged", gsi::arg("icon"), "@brief Signal declaration for QListView::windowIconChanged(const QIcon &icon)\nYou can bind a procedure to this signal."); @@ -1190,6 +1191,13 @@ public: } } + // [emitter impl] void QListView::objectNameChanged(const QString &objectName) + void emitter_QListView_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QListView::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QPaintEngine *QListView::paintEngine() QPaintEngine * cbs_paintEngine_c0_0() const { @@ -4042,6 +4050,24 @@ static void _set_callback_cbs_nativeEvent_4678_0 (void *cls, const gsi::Callback } +// emitter void QListView::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QListView_Adaptor *)cls)->emitter_QListView_objectNameChanged_4567 (arg1); +} + + // QPaintEngine *QListView::paintEngine() static void _init_cbs_paintEngine_c0_0 (qt_gsi::GenericMethod *decl) @@ -5509,6 +5535,7 @@ static gsi::Methods methods_QListView_Adaptor () { methods += new qt_gsi::GenericMethod ("*moveEvent", "@hide", false, &_init_cbs_moveEvent_1624_0, &_call_cbs_moveEvent_1624_0, &_set_callback_cbs_moveEvent_1624_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@brief Virtual method bool QListView::nativeEvent(const QByteArray &eventType, void *message, long int *result)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QListView::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("paintEngine", "@brief Virtual method QPaintEngine *QListView::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@hide", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0, &_set_callback_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("*paintEvent", "@brief Virtual method void QListView::paintEvent(QPaintEvent *e)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_paintEvent_1725_0, &_call_cbs_paintEvent_1725_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQListWidget.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQListWidget.cc index ed5bd1a18..6e9841603 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQListWidget.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQListWidget.cc @@ -957,6 +957,7 @@ static gsi::Methods methods_QListWidget () { methods += gsi::qt_signal ("itemEntered(QListWidgetItem *)", "itemEntered", gsi::arg("item"), "@brief Signal declaration for QListWidget::itemEntered(QListWidgetItem *item)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("itemPressed(QListWidgetItem *)", "itemPressed", gsi::arg("item"), "@brief Signal declaration for QListWidget::itemPressed(QListWidgetItem *item)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("itemSelectionChanged()", "itemSelectionChanged", "@brief Signal declaration for QListWidget::itemSelectionChanged()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QListWidget::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("pressed(const QModelIndex &)", "pressed", gsi::arg("index"), "@brief Signal declaration for QListWidget::pressed(const QModelIndex &index)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("viewportEntered()", "viewportEntered", "@brief Signal declaration for QListWidget::viewportEntered()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconChanged(const QIcon &)", "windowIconChanged", gsi::arg("icon"), "@brief Signal declaration for QListWidget::windowIconChanged(const QIcon &icon)\nYou can bind a procedure to this signal."); @@ -1404,6 +1405,13 @@ public: } } + // [emitter impl] void QListWidget::objectNameChanged(const QString &objectName) + void emitter_QListWidget_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QListWidget::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QPaintEngine *QListWidget::paintEngine() QPaintEngine * cbs_paintEngine_c0_0() const { @@ -4593,6 +4601,24 @@ static void _set_callback_cbs_nativeEvent_4678_0 (void *cls, const gsi::Callback } +// emitter void QListWidget::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QListWidget_Adaptor *)cls)->emitter_QListWidget_objectNameChanged_4567 (arg1); +} + + // QPaintEngine *QListWidget::paintEngine() static void _init_cbs_paintEngine_c0_0 (qt_gsi::GenericMethod *decl) @@ -6074,6 +6100,7 @@ static gsi::Methods methods_QListWidget_Adaptor () { methods += new qt_gsi::GenericMethod ("*moveEvent", "@hide", false, &_init_cbs_moveEvent_1624_0, &_call_cbs_moveEvent_1624_0, &_set_callback_cbs_moveEvent_1624_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@brief Virtual method bool QListWidget::nativeEvent(const QByteArray &eventType, void *message, long int *result)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QListWidget::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("paintEngine", "@brief Virtual method QPaintEngine *QListWidget::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@hide", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0, &_set_callback_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("*paintEvent", "@brief Virtual method void QListWidget::paintEvent(QPaintEvent *e)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_paintEvent_1725_0, &_call_cbs_paintEvent_1725_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQMainWindow.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQMainWindow.cc index d7b85e183..0c2e09248 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQMainWindow.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQMainWindow.cc @@ -1187,6 +1187,7 @@ static gsi::Methods methods_QMainWindow () { methods += gsi::qt_signal ("customContextMenuRequested(const QPoint &)", "customContextMenuRequested", gsi::arg("pos"), "@brief Signal declaration for QMainWindow::customContextMenuRequested(const QPoint &pos)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QMainWindow::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("iconSizeChanged(const QSize &)", "iconSizeChanged", gsi::arg("iconSize"), "@brief Signal declaration for QMainWindow::iconSizeChanged(const QSize &iconSize)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QMainWindow::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal::target_type & > ("toolButtonStyleChanged(Qt::ToolButtonStyle)", "toolButtonStyleChanged", gsi::arg("toolButtonStyle"), "@brief Signal declaration for QMainWindow::toolButtonStyleChanged(Qt::ToolButtonStyle toolButtonStyle)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconChanged(const QIcon &)", "windowIconChanged", gsi::arg("icon"), "@brief Signal declaration for QMainWindow::windowIconChanged(const QIcon &icon)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconTextChanged(const QString &)", "windowIconTextChanged", gsi::arg("iconText"), "@brief Signal declaration for QMainWindow::windowIconTextChanged(const QString &iconText)\nYou can bind a procedure to this signal."); @@ -1384,6 +1385,13 @@ public: } } + // [emitter impl] void QMainWindow::objectNameChanged(const QString &objectName) + void emitter_QMainWindow_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QMainWindow::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QPaintEngine *QMainWindow::paintEngine() QPaintEngine * cbs_paintEngine_c0_0() const { @@ -3053,6 +3061,24 @@ static void _set_callback_cbs_nativeEvent_4678_0 (void *cls, const gsi::Callback } +// emitter void QMainWindow::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QMainWindow_Adaptor *)cls)->emitter_QMainWindow_objectNameChanged_4567 (arg1); +} + + // QPaintEngine *QMainWindow::paintEngine() static void _init_cbs_paintEngine_c0_0 (qt_gsi::GenericMethod *decl) @@ -3520,6 +3546,7 @@ static gsi::Methods methods_QMainWindow_Adaptor () { methods += new qt_gsi::GenericMethod ("*moveEvent", "@hide", false, &_init_cbs_moveEvent_1624_0, &_call_cbs_moveEvent_1624_0, &_set_callback_cbs_moveEvent_1624_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@brief Virtual method bool QMainWindow::nativeEvent(const QByteArray &eventType, void *message, long int *result)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QMainWindow::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("paintEngine", "@brief Virtual method QPaintEngine *QMainWindow::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@hide", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0, &_set_callback_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("*paintEvent", "@brief Virtual method void QMainWindow::paintEvent(QPaintEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_paintEvent_1725_0, &_call_cbs_paintEvent_1725_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQMdiArea.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQMdiArea.cc index fc8be1f28..5cd3bad6c 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQMdiArea.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQMdiArea.cc @@ -753,6 +753,7 @@ static gsi::Methods methods_QMdiArea () { methods += new qt_gsi::GenericMethod (":viewMode", "@brief Method QMdiArea::ViewMode QMdiArea::viewMode()\n", true, &_init_f_viewMode_c0, &_call_f_viewMode_c0); methods += gsi::qt_signal ("customContextMenuRequested(const QPoint &)", "customContextMenuRequested", gsi::arg("pos"), "@brief Signal declaration for QMdiArea::customContextMenuRequested(const QPoint &pos)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QMdiArea::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QMdiArea::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("subWindowActivated(QMdiSubWindow *)", "subWindowActivated", gsi::arg("arg1"), "@brief Signal declaration for QMdiArea::subWindowActivated(QMdiSubWindow *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconChanged(const QIcon &)", "windowIconChanged", gsi::arg("icon"), "@brief Signal declaration for QMdiArea::windowIconChanged(const QIcon &icon)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconTextChanged(const QString &)", "windowIconTextChanged", gsi::arg("iconText"), "@brief Signal declaration for QMdiArea::windowIconTextChanged(const QString &iconText)\nYou can bind a procedure to this signal."); @@ -933,6 +934,13 @@ public: } } + // [emitter impl] void QMdiArea::objectNameChanged(const QString &objectName) + void emitter_QMdiArea_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QMdiArea::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QPaintEngine *QMdiArea::paintEngine() QPaintEngine * cbs_paintEngine_c0_0() const { @@ -2678,6 +2686,24 @@ static void _set_callback_cbs_nativeEvent_4678_0 (void *cls, const gsi::Callback } +// emitter void QMdiArea::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QMdiArea_Adaptor *)cls)->emitter_QMdiArea_objectNameChanged_4567 (arg1); +} + + // QPaintEngine *QMdiArea::paintEngine() static void _init_cbs_paintEngine_c0_0 (qt_gsi::GenericMethod *decl) @@ -3298,6 +3324,7 @@ static gsi::Methods methods_QMdiArea_Adaptor () { methods += new qt_gsi::GenericMethod ("*moveEvent", "@hide", false, &_init_cbs_moveEvent_1624_0, &_call_cbs_moveEvent_1624_0, &_set_callback_cbs_moveEvent_1624_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@brief Virtual method bool QMdiArea::nativeEvent(const QByteArray &eventType, void *message, long int *result)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QMdiArea::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("paintEngine", "@brief Virtual method QPaintEngine *QMdiArea::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@hide", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0, &_set_callback_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("*paintEvent", "@brief Virtual method void QMdiArea::paintEvent(QPaintEvent *paintEvent)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_paintEvent_1725_0, &_call_cbs_paintEvent_1725_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQMdiSubWindow.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQMdiSubWindow.cc index 940498d14..0a7ea8160 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQMdiSubWindow.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQMdiSubWindow.cc @@ -483,6 +483,7 @@ static gsi::Methods methods_QMdiSubWindow () { methods += gsi::qt_signal ("aboutToActivate()", "aboutToActivate", "@brief Signal declaration for QMdiSubWindow::aboutToActivate()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("customContextMenuRequested(const QPoint &)", "customContextMenuRequested", gsi::arg("pos"), "@brief Signal declaration for QMdiSubWindow::customContextMenuRequested(const QPoint &pos)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QMdiSubWindow::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QMdiSubWindow::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconChanged(const QIcon &)", "windowIconChanged", gsi::arg("icon"), "@brief Signal declaration for QMdiSubWindow::windowIconChanged(const QIcon &icon)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconTextChanged(const QString &)", "windowIconTextChanged", gsi::arg("iconText"), "@brief Signal declaration for QMdiSubWindow::windowIconTextChanged(const QString &iconText)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal, QFlags > ("windowStateChanged(QFlags, QFlags)", "windowStateChanged", gsi::arg("oldState"), gsi::arg("newState"), "@brief Signal declaration for QMdiSubWindow::windowStateChanged(QFlags oldState, QFlags newState)\nYou can bind a procedure to this signal."); @@ -650,6 +651,13 @@ public: } } + // [emitter impl] void QMdiSubWindow::objectNameChanged(const QString &objectName) + void emitter_QMdiSubWindow_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QMdiSubWindow::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QPaintEngine *QMdiSubWindow::paintEngine() QPaintEngine * cbs_paintEngine_c0_0() const { @@ -2310,6 +2318,24 @@ static void _set_callback_cbs_nativeEvent_4678_0 (void *cls, const gsi::Callback } +// emitter void QMdiSubWindow::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QMdiSubWindow_Adaptor *)cls)->emitter_QMdiSubWindow_objectNameChanged_4567 (arg1); +} + + // QPaintEngine *QMdiSubWindow::paintEngine() static void _init_cbs_paintEngine_c0_0 (qt_gsi::GenericMethod *decl) @@ -2778,6 +2804,7 @@ static gsi::Methods methods_QMdiSubWindow_Adaptor () { methods += new qt_gsi::GenericMethod ("*moveEvent", "@hide", false, &_init_cbs_moveEvent_1624_0, &_call_cbs_moveEvent_1624_0, &_set_callback_cbs_moveEvent_1624_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@brief Virtual method bool QMdiSubWindow::nativeEvent(const QByteArray &eventType, void *message, long int *result)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QMdiSubWindow::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("paintEngine", "@brief Virtual method QPaintEngine *QMdiSubWindow::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@hide", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0, &_set_callback_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("*paintEvent", "@brief Virtual method void QMdiSubWindow::paintEvent(QPaintEvent *paintEvent)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_paintEvent_1725_0, &_call_cbs_paintEvent_1725_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQMenu.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQMenu.cc index f916f4337..e556685ed 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQMenu.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQMenu.cc @@ -1010,6 +1010,7 @@ static gsi::Methods methods_QMenu () { methods += gsi::qt_signal ("customContextMenuRequested(const QPoint &)", "customContextMenuRequested", gsi::arg("pos"), "@brief Signal declaration for QMenu::customContextMenuRequested(const QPoint &pos)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QMenu::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("hovered(QAction *)", "hovered", gsi::arg("action"), "@brief Signal declaration for QMenu::hovered(QAction *action)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QMenu::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("triggered(QAction *)", "triggered", gsi::arg("action"), "@brief Signal declaration for QMenu::triggered(QAction *action)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconChanged(const QIcon &)", "windowIconChanged", gsi::arg("icon"), "@brief Signal declaration for QMenu::windowIconChanged(const QIcon &icon)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconTextChanged(const QString &)", "windowIconTextChanged", gsi::arg("iconText"), "@brief Signal declaration for QMenu::windowIconTextChanged(const QString &iconText)\nYou can bind a procedure to this signal."); @@ -1221,6 +1222,13 @@ public: } } + // [emitter impl] void QMenu::objectNameChanged(const QString &objectName) + void emitter_QMenu_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QMenu::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QPaintEngine *QMenu::paintEngine() QPaintEngine * cbs_paintEngine_c0_0() const { @@ -2952,6 +2960,24 @@ static void _set_callback_cbs_nativeEvent_4678_0 (void *cls, const gsi::Callback } +// emitter void QMenu::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QMenu_Adaptor *)cls)->emitter_QMenu_objectNameChanged_4567 (arg1); +} + + // QPaintEngine *QMenu::paintEngine() static void _init_cbs_paintEngine_c0_0 (qt_gsi::GenericMethod *decl) @@ -3422,6 +3448,7 @@ static gsi::Methods methods_QMenu_Adaptor () { methods += new qt_gsi::GenericMethod ("*moveEvent", "@hide", false, &_init_cbs_moveEvent_1624_0, &_call_cbs_moveEvent_1624_0, &_set_callback_cbs_moveEvent_1624_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@brief Virtual method bool QMenu::nativeEvent(const QByteArray &eventType, void *message, long int *result)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QMenu::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("paintEngine", "@brief Virtual method QPaintEngine *QMenu::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@hide", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0, &_set_callback_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("*paintEvent", "@brief Virtual method void QMenu::paintEvent(QPaintEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_paintEvent_1725_0, &_call_cbs_paintEvent_1725_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQMenuBar.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQMenuBar.cc index 681df69bb..d4db87c63 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQMenuBar.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQMenuBar.cc @@ -635,6 +635,7 @@ static gsi::Methods methods_QMenuBar () { methods += gsi::qt_signal ("customContextMenuRequested(const QPoint &)", "customContextMenuRequested", gsi::arg("pos"), "@brief Signal declaration for QMenuBar::customContextMenuRequested(const QPoint &pos)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QMenuBar::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("hovered(QAction *)", "hovered", gsi::arg("action"), "@brief Signal declaration for QMenuBar::hovered(QAction *action)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QMenuBar::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("triggered(QAction *)", "triggered", gsi::arg("action"), "@brief Signal declaration for QMenuBar::triggered(QAction *action)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconChanged(const QIcon &)", "windowIconChanged", gsi::arg("icon"), "@brief Signal declaration for QMenuBar::windowIconChanged(const QIcon &icon)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconTextChanged(const QString &)", "windowIconTextChanged", gsi::arg("iconText"), "@brief Signal declaration for QMenuBar::windowIconTextChanged(const QString &iconText)\nYou can bind a procedure to this signal."); @@ -801,6 +802,13 @@ public: } } + // [emitter impl] void QMenuBar::objectNameChanged(const QString &objectName) + void emitter_QMenuBar_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QMenuBar::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QPaintEngine *QMenuBar::paintEngine() QPaintEngine * cbs_paintEngine_c0_0() const { @@ -2484,6 +2492,24 @@ static void _set_callback_cbs_nativeEvent_4678_0 (void *cls, const gsi::Callback } +// emitter void QMenuBar::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QMenuBar_Adaptor *)cls)->emitter_QMenuBar_objectNameChanged_4567 (arg1); +} + + // QPaintEngine *QMenuBar::paintEngine() static void _init_cbs_paintEngine_c0_0 (qt_gsi::GenericMethod *decl) @@ -2950,6 +2976,7 @@ static gsi::Methods methods_QMenuBar_Adaptor () { methods += new qt_gsi::GenericMethod ("*moveEvent", "@hide", false, &_init_cbs_moveEvent_1624_0, &_call_cbs_moveEvent_1624_0, &_set_callback_cbs_moveEvent_1624_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@brief Virtual method bool QMenuBar::nativeEvent(const QByteArray &eventType, void *message, long int *result)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QMenuBar::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("paintEngine", "@brief Virtual method QPaintEngine *QMenuBar::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@hide", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0, &_set_callback_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("*paintEvent", "@brief Virtual method void QMenuBar::paintEvent(QPaintEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_paintEvent_1725_0, &_call_cbs_paintEvent_1725_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQMessageBox.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQMessageBox.cc index 35b40f910..2788e4beb 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQMessageBox.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQMessageBox.cc @@ -1093,6 +1093,7 @@ static gsi::Methods methods_QMessageBox () { methods += gsi::qt_signal ("customContextMenuRequested(const QPoint &)", "customContextMenuRequested", gsi::arg("pos"), "@brief Signal declaration for QMessageBox::customContextMenuRequested(const QPoint &pos)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QMessageBox::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("finished(int)", "finished", gsi::arg("result"), "@brief Signal declaration for QMessageBox::finished(int result)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QMessageBox::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("rejected()", "rejected", "@brief Signal declaration for QMessageBox::rejected()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconChanged(const QIcon &)", "windowIconChanged", gsi::arg("icon"), "@brief Signal declaration for QMessageBox::windowIconChanged(const QIcon &icon)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconTextChanged(const QString &)", "windowIconTextChanged", gsi::arg("iconText"), "@brief Signal declaration for QMessageBox::windowIconTextChanged(const QString &iconText)\nYou can bind a procedure to this signal."); @@ -1364,6 +1365,13 @@ public: } } + // [emitter impl] void QMessageBox::objectNameChanged(const QString &objectName) + void emitter_QMessageBox_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QMessageBox::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] void QMessageBox::open() void cbs_open_0_0() { @@ -3246,6 +3254,24 @@ static void _set_callback_cbs_nativeEvent_4678_0 (void *cls, const gsi::Callback } +// emitter void QMessageBox::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QMessageBox_Adaptor *)cls)->emitter_QMessageBox_objectNameChanged_4567 (arg1); +} + + // void QMessageBox::open() static void _init_cbs_open_0_0 (qt_gsi::GenericMethod *decl) @@ -3758,6 +3784,7 @@ static gsi::Methods methods_QMessageBox_Adaptor () { methods += new qt_gsi::GenericMethod ("*moveEvent", "@hide", false, &_init_cbs_moveEvent_1624_0, &_call_cbs_moveEvent_1624_0, &_set_callback_cbs_moveEvent_1624_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@brief Virtual method bool QMessageBox::nativeEvent(const QByteArray &eventType, void *message, long int *result)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QMessageBox::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("open", "@brief Virtual method void QMessageBox::open()\nThis method can be reimplemented in a derived class.", false, &_init_cbs_open_0_0, &_call_cbs_open_0_0); methods += new qt_gsi::GenericMethod ("open", "@hide", false, &_init_cbs_open_0_0, &_call_cbs_open_0_0, &_set_callback_cbs_open_0_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@brief Virtual method QPaintEngine *QMessageBox::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQPanGesture.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQPanGesture.cc index 235ef7599..8e7a39fe3 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQPanGesture.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQPanGesture.cc @@ -240,6 +240,7 @@ static gsi::Methods methods_QPanGesture () { methods += new qt_gsi::GenericMethod ("setLastOffset|lastOffset=", "@brief Method void QPanGesture::setLastOffset(const QPointF &value)\n", false, &_init_f_setLastOffset_1986, &_call_f_setLastOffset_1986); methods += new qt_gsi::GenericMethod ("setOffset|offset=", "@brief Method void QPanGesture::setOffset(const QPointF &value)\n", false, &_init_f_setOffset_1986, &_call_f_setOffset_1986); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QPanGesture::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QPanGesture::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QPanGesture::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QPanGesture::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -330,6 +331,13 @@ public: } } + // [emitter impl] void QPanGesture::objectNameChanged(const QString &objectName) + void emitter_QPanGesture_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QPanGesture::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] void QPanGesture::childEvent(QChildEvent *) void cbs_childEvent_1701_0(QChildEvent *arg1) { @@ -575,6 +583,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QPanGesture::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QPanGesture_Adaptor *)cls)->emitter_QPanGesture_objectNameChanged_4567 (arg1); +} + + // exposed int QPanGesture::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -665,6 +691,7 @@ static gsi::Methods methods_QPanGesture_Adaptor () { methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QPanGesture::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QPanGesture::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QPanGesture::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QPanGesture::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QPanGesture::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QPanGesture::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQPinchGesture.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQPinchGesture.cc index f0f34c5ed..a22662fab 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQPinchGesture.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQPinchGesture.cc @@ -520,6 +520,7 @@ static gsi::Methods methods_QPinchGesture () { methods += new qt_gsi::GenericMethod (":totalRotationAngle", "@brief Method double QPinchGesture::totalRotationAngle()\n", true, &_init_f_totalRotationAngle_c0, &_call_f_totalRotationAngle_c0); methods += new qt_gsi::GenericMethod (":totalScaleFactor", "@brief Method double QPinchGesture::totalScaleFactor()\n", true, &_init_f_totalScaleFactor_c0, &_call_f_totalScaleFactor_c0); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QPinchGesture::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QPinchGesture::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QPinchGesture::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QPinchGesture::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -610,6 +611,13 @@ public: } } + // [emitter impl] void QPinchGesture::objectNameChanged(const QString &objectName) + void emitter_QPinchGesture_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QPinchGesture::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] void QPinchGesture::childEvent(QChildEvent *) void cbs_childEvent_1701_0(QChildEvent *arg1) { @@ -855,6 +863,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QPinchGesture::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QPinchGesture_Adaptor *)cls)->emitter_QPinchGesture_objectNameChanged_4567 (arg1); +} + + // exposed int QPinchGesture::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -945,6 +971,7 @@ static gsi::Methods methods_QPinchGesture_Adaptor () { methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QPinchGesture::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QPinchGesture::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QPinchGesture::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QPinchGesture::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QPinchGesture::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QPinchGesture::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQPlainTextDocumentLayout.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQPlainTextDocumentLayout.cc index c56f1fd61..2907d2e56 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQPlainTextDocumentLayout.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQPlainTextDocumentLayout.cc @@ -319,6 +319,7 @@ static gsi::Methods methods_QPlainTextDocumentLayout () { methods += new qt_gsi::GenericMethod ("setCursorWidth|cursorWidth=", "@brief Method void QPlainTextDocumentLayout::setCursorWidth(int width)\n", false, &_init_f_setCursorWidth_767, &_call_f_setCursorWidth_767); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QPlainTextDocumentLayout::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("documentSizeChanged(const QSizeF &)", "documentSizeChanged", gsi::arg("newSize"), "@brief Signal declaration for QPlainTextDocumentLayout::documentSizeChanged(const QSizeF &newSize)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QPlainTextDocumentLayout::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("pageCountChanged(int)", "pageCountChanged", gsi::arg("newPages"), "@brief Signal declaration for QPlainTextDocumentLayout::pageCountChanged(int newPages)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("update(const QRectF &)", "update", gsi::arg("arg1"), "@brief Signal declaration for QPlainTextDocumentLayout::update(const QRectF &)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("updateBlock(const QTextBlock &)", "updateBlock", gsi::arg("block"), "@brief Signal declaration for QPlainTextDocumentLayout::updateBlock(const QTextBlock &block)\nYou can bind a procedure to this signal."); @@ -497,6 +498,13 @@ public: } } + // [emitter impl] void QPlainTextDocumentLayout::objectNameChanged(const QString &objectName) + void emitter_QPlainTextDocumentLayout_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QPlainTextDocumentLayout::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] int QPlainTextDocumentLayout::pageCount() int cbs_pageCount_c0_0() const { @@ -1083,6 +1091,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QPlainTextDocumentLayout::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QPlainTextDocumentLayout_Adaptor *)cls)->emitter_QPlainTextDocumentLayout_objectNameChanged_4567 (arg1); +} + + // int QPlainTextDocumentLayout::pageCount() static void _init_cbs_pageCount_c0_0 (qt_gsi::GenericMethod *decl) @@ -1323,6 +1349,7 @@ static gsi::Methods methods_QPlainTextDocumentLayout_Adaptor () { methods += new qt_gsi::GenericMethod ("hitTest", "@brief Virtual method int QPlainTextDocumentLayout::hitTest(const QPointF &, Qt::HitTestAccuracy)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_hitTest_c4147_0, &_call_cbs_hitTest_c4147_0); methods += new qt_gsi::GenericMethod ("hitTest", "@hide", true, &_init_cbs_hitTest_c4147_0, &_call_cbs_hitTest_c4147_0, &_set_callback_cbs_hitTest_c4147_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QPlainTextDocumentLayout::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QPlainTextDocumentLayout::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("pageCount", "@brief Virtual method int QPlainTextDocumentLayout::pageCount()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_pageCount_c0_0, &_call_cbs_pageCount_c0_0); methods += new qt_gsi::GenericMethod ("pageCount", "@hide", true, &_init_cbs_pageCount_c0_0, &_call_cbs_pageCount_c0_0, &_set_callback_cbs_pageCount_c0_0); methods += new qt_gsi::GenericMethod ("emit_pageCountChanged", "@brief Emitter for signal void QPlainTextDocumentLayout::pageCountChanged(int newPages)\nCall this method to emit this signal.", false, &_init_emitter_pageCountChanged_767, &_call_emitter_pageCountChanged_767); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQPlainTextEdit.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQPlainTextEdit.cc index 47ff66657..9b1a2ad54 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQPlainTextEdit.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQPlainTextEdit.cc @@ -1458,6 +1458,7 @@ static gsi::Methods methods_QPlainTextEdit () { methods += gsi::qt_signal ("customContextMenuRequested(const QPoint &)", "customContextMenuRequested", gsi::arg("pos"), "@brief Signal declaration for QPlainTextEdit::customContextMenuRequested(const QPoint &pos)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QPlainTextEdit::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("modificationChanged(bool)", "modificationChanged", gsi::arg("arg1"), "@brief Signal declaration for QPlainTextEdit::modificationChanged(bool)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QPlainTextEdit::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("redoAvailable(bool)", "redoAvailable", gsi::arg("b"), "@brief Signal declaration for QPlainTextEdit::redoAvailable(bool b)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("selectionChanged()", "selectionChanged", "@brief Signal declaration for QPlainTextEdit::selectionChanged()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("textChanged()", "textChanged", "@brief Signal declaration for QPlainTextEdit::textChanged()\nYou can bind a procedure to this signal."); @@ -1723,6 +1724,13 @@ public: emit QPlainTextEdit::modificationChanged(arg1); } + // [emitter impl] void QPlainTextEdit::objectNameChanged(const QString &objectName) + void emitter_QPlainTextEdit_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QPlainTextEdit::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QPaintEngine *QPlainTextEdit::paintEngine() QPaintEngine * cbs_paintEngine_c0_0() const { @@ -3840,6 +3848,24 @@ static void _set_callback_cbs_nativeEvent_4678_0 (void *cls, const gsi::Callback } +// emitter void QPlainTextEdit::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QPlainTextEdit_Adaptor *)cls)->emitter_QPlainTextEdit_objectNameChanged_4567 (arg1); +} + + // QPaintEngine *QPlainTextEdit::paintEngine() static void _init_cbs_paintEngine_c0_0 (qt_gsi::GenericMethod *decl) @@ -4566,6 +4592,7 @@ static gsi::Methods methods_QPlainTextEdit_Adaptor () { methods += new qt_gsi::GenericMethod ("*moveEvent", "@hide", false, &_init_cbs_moveEvent_1624_0, &_call_cbs_moveEvent_1624_0, &_set_callback_cbs_moveEvent_1624_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@brief Virtual method bool QPlainTextEdit::nativeEvent(const QByteArray &eventType, void *message, long int *result)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QPlainTextEdit::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("paintEngine", "@brief Virtual method QPaintEngine *QPlainTextEdit::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@hide", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0, &_set_callback_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("*paintEvent", "@brief Virtual method void QPlainTextEdit::paintEvent(QPaintEvent *e)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_paintEvent_1725_0, &_call_cbs_paintEvent_1725_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQProgressBar.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQProgressBar.cc index 7c732da64..e4410928d 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQProgressBar.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQProgressBar.cc @@ -598,6 +598,7 @@ static gsi::Methods methods_QProgressBar () { methods += new qt_gsi::GenericMethod (":value", "@brief Method int QProgressBar::value()\n", true, &_init_f_value_c0, &_call_f_value_c0); methods += gsi::qt_signal ("customContextMenuRequested(const QPoint &)", "customContextMenuRequested", gsi::arg("pos"), "@brief Signal declaration for QProgressBar::customContextMenuRequested(const QPoint &pos)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QProgressBar::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QProgressBar::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("valueChanged(int)", "valueChanged", gsi::arg("value"), "@brief Signal declaration for QProgressBar::valueChanged(int value)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconChanged(const QIcon &)", "windowIconChanged", gsi::arg("icon"), "@brief Signal declaration for QProgressBar::windowIconChanged(const QIcon &icon)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconTextChanged(const QString &)", "windowIconTextChanged", gsi::arg("iconText"), "@brief Signal declaration for QProgressBar::windowIconTextChanged(const QString &iconText)\nYou can bind a procedure to this signal."); @@ -773,6 +774,13 @@ public: } } + // [emitter impl] void QProgressBar::objectNameChanged(const QString &objectName) + void emitter_QProgressBar_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QProgressBar::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QPaintEngine *QProgressBar::paintEngine() QPaintEngine * cbs_paintEngine_c0_0() const { @@ -2436,6 +2444,24 @@ static void _set_callback_cbs_nativeEvent_4678_0 (void *cls, const gsi::Callback } +// emitter void QProgressBar::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QProgressBar_Adaptor *)cls)->emitter_QProgressBar_objectNameChanged_4567 (arg1); +} + + // QPaintEngine *QProgressBar::paintEngine() static void _init_cbs_paintEngine_c0_0 (qt_gsi::GenericMethod *decl) @@ -2920,6 +2946,7 @@ static gsi::Methods methods_QProgressBar_Adaptor () { methods += new qt_gsi::GenericMethod ("*moveEvent", "@hide", false, &_init_cbs_moveEvent_1624_0, &_call_cbs_moveEvent_1624_0, &_set_callback_cbs_moveEvent_1624_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@brief Virtual method bool QProgressBar::nativeEvent(const QByteArray &eventType, void *message, long int *result)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QProgressBar::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("paintEngine", "@brief Virtual method QPaintEngine *QProgressBar::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@hide", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0, &_set_callback_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("*paintEvent", "@brief Virtual method void QProgressBar::paintEvent(QPaintEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_paintEvent_1725_0, &_call_cbs_paintEvent_1725_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQProgressDialog.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQProgressDialog.cc index 959cbc316..80176c1c4 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQProgressDialog.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQProgressDialog.cc @@ -638,6 +638,7 @@ static gsi::Methods methods_QProgressDialog () { methods += gsi::qt_signal ("customContextMenuRequested(const QPoint &)", "customContextMenuRequested", gsi::arg("pos"), "@brief Signal declaration for QProgressDialog::customContextMenuRequested(const QPoint &pos)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QProgressDialog::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("finished(int)", "finished", gsi::arg("result"), "@brief Signal declaration for QProgressDialog::finished(int result)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QProgressDialog::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("rejected()", "rejected", "@brief Signal declaration for QProgressDialog::rejected()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconChanged(const QIcon &)", "windowIconChanged", gsi::arg("icon"), "@brief Signal declaration for QProgressDialog::windowIconChanged(const QIcon &icon)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconTextChanged(const QString &)", "windowIconTextChanged", gsi::arg("iconText"), "@brief Signal declaration for QProgressDialog::windowIconTextChanged(const QString &iconText)\nYou can bind a procedure to this signal."); @@ -890,6 +891,13 @@ public: } } + // [emitter impl] void QProgressDialog::objectNameChanged(const QString &objectName) + void emitter_QProgressDialog_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QProgressDialog::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] void QProgressDialog::open() void cbs_open_0_0() { @@ -2747,6 +2755,24 @@ static void _set_callback_cbs_nativeEvent_4678_0 (void *cls, const gsi::Callback } +// emitter void QProgressDialog::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QProgressDialog_Adaptor *)cls)->emitter_QProgressDialog_objectNameChanged_4567 (arg1); +} + + // void QProgressDialog::open() static void _init_cbs_open_0_0 (qt_gsi::GenericMethod *decl) @@ -3259,6 +3285,7 @@ static gsi::Methods methods_QProgressDialog_Adaptor () { methods += new qt_gsi::GenericMethod ("*moveEvent", "@hide", false, &_init_cbs_moveEvent_1624_0, &_call_cbs_moveEvent_1624_0, &_set_callback_cbs_moveEvent_1624_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@brief Virtual method bool QProgressDialog::nativeEvent(const QByteArray &eventType, void *message, long int *result)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QProgressDialog::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("open", "@brief Virtual method void QProgressDialog::open()\nThis method can be reimplemented in a derived class.", false, &_init_cbs_open_0_0, &_call_cbs_open_0_0); methods += new qt_gsi::GenericMethod ("open", "@hide", false, &_init_cbs_open_0_0, &_call_cbs_open_0_0, &_set_callback_cbs_open_0_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@brief Virtual method QPaintEngine *QProgressDialog::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQPushButton.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQPushButton.cc index 3960d23d3..1842c367b 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQPushButton.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQPushButton.cc @@ -359,6 +359,7 @@ static gsi::Methods methods_QPushButton () { methods += gsi::qt_signal ("clicked(bool)", "clicked", gsi::arg("checked"), "@brief Signal declaration for QPushButton::clicked(bool checked)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("customContextMenuRequested(const QPoint &)", "customContextMenuRequested", gsi::arg("pos"), "@brief Signal declaration for QPushButton::customContextMenuRequested(const QPoint &pos)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QPushButton::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QPushButton::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("pressed()", "pressed", "@brief Signal declaration for QPushButton::pressed()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("released()", "released", "@brief Signal declaration for QPushButton::released()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("toggled(bool)", "toggled", gsi::arg("checked"), "@brief Signal declaration for QPushButton::toggled(bool checked)\nYou can bind a procedure to this signal."); @@ -566,6 +567,13 @@ public: } } + // [emitter impl] void QPushButton::objectNameChanged(const QString &objectName) + void emitter_QPushButton_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QPushButton::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QPaintEngine *QPushButton::paintEngine() QPaintEngine * cbs_paintEngine_c0_0() const { @@ -2399,6 +2407,24 @@ static void _set_callback_cbs_nextCheckState_0_0 (void *cls, const gsi::Callback } +// emitter void QPushButton::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QPushButton_Adaptor *)cls)->emitter_QPushButton_objectNameChanged_4567 (arg1); +} + + // QPaintEngine *QPushButton::paintEngine() static void _init_cbs_paintEngine_c0_0 (qt_gsi::GenericMethod *decl) @@ -2901,6 +2927,7 @@ static gsi::Methods methods_QPushButton_Adaptor () { methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nextCheckState", "@brief Virtual method void QPushButton::nextCheckState()\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nextCheckState_0_0, &_call_cbs_nextCheckState_0_0); methods += new qt_gsi::GenericMethod ("*nextCheckState", "@hide", false, &_init_cbs_nextCheckState_0_0, &_call_cbs_nextCheckState_0_0, &_set_callback_cbs_nextCheckState_0_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QPushButton::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("paintEngine", "@brief Virtual method QPaintEngine *QPushButton::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@hide", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0, &_set_callback_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("*paintEvent", "@brief Virtual method void QPushButton::paintEvent(QPaintEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_paintEvent_1725_0, &_call_cbs_paintEvent_1725_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQRadioButton.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQRadioButton.cc index a3986a5d8..6ed116821 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQRadioButton.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQRadioButton.cc @@ -193,6 +193,7 @@ static gsi::Methods methods_QRadioButton () { methods += gsi::qt_signal ("clicked(bool)", "clicked", gsi::arg("checked"), "@brief Signal declaration for QRadioButton::clicked(bool checked)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("customContextMenuRequested(const QPoint &)", "customContextMenuRequested", gsi::arg("pos"), "@brief Signal declaration for QRadioButton::customContextMenuRequested(const QPoint &pos)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QRadioButton::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QRadioButton::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("pressed()", "pressed", "@brief Signal declaration for QRadioButton::pressed()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("released()", "released", "@brief Signal declaration for QRadioButton::released()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("toggled(bool)", "toggled", gsi::arg("checked"), "@brief Signal declaration for QRadioButton::toggled(bool checked)\nYou can bind a procedure to this signal."); @@ -388,6 +389,13 @@ public: } } + // [emitter impl] void QRadioButton::objectNameChanged(const QString &objectName) + void emitter_QRadioButton_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QRadioButton::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QPaintEngine *QRadioButton::paintEngine() QPaintEngine * cbs_paintEngine_c0_0() const { @@ -2197,6 +2205,24 @@ static void _set_callback_cbs_nextCheckState_0_0 (void *cls, const gsi::Callback } +// emitter void QRadioButton::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QRadioButton_Adaptor *)cls)->emitter_QRadioButton_objectNameChanged_4567 (arg1); +} + + // QPaintEngine *QRadioButton::paintEngine() static void _init_cbs_paintEngine_c0_0 (qt_gsi::GenericMethod *decl) @@ -2698,6 +2724,7 @@ static gsi::Methods methods_QRadioButton_Adaptor () { methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nextCheckState", "@brief Virtual method void QRadioButton::nextCheckState()\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nextCheckState_0_0, &_call_cbs_nextCheckState_0_0); methods += new qt_gsi::GenericMethod ("*nextCheckState", "@hide", false, &_init_cbs_nextCheckState_0_0, &_call_cbs_nextCheckState_0_0, &_set_callback_cbs_nextCheckState_0_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QRadioButton::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("paintEngine", "@brief Virtual method QPaintEngine *QRadioButton::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@hide", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0, &_set_callback_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("*paintEvent", "@brief Virtual method void QRadioButton::paintEvent(QPaintEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_paintEvent_1725_0, &_call_cbs_paintEvent_1725_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQRubberBand.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQRubberBand.cc index de8945770..b970a2083 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQRubberBand.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQRubberBand.cc @@ -316,6 +316,7 @@ static gsi::Methods methods_QRubberBand () { methods += new qt_gsi::GenericMethod ("shape", "@brief Method QRubberBand::Shape QRubberBand::shape()\n", true, &_init_f_shape_c0, &_call_f_shape_c0); methods += gsi::qt_signal ("customContextMenuRequested(const QPoint &)", "customContextMenuRequested", gsi::arg("pos"), "@brief Signal declaration for QRubberBand::customContextMenuRequested(const QPoint &pos)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QRubberBand::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QRubberBand::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconChanged(const QIcon &)", "windowIconChanged", gsi::arg("icon"), "@brief Signal declaration for QRubberBand::windowIconChanged(const QIcon &icon)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconTextChanged(const QString &)", "windowIconTextChanged", gsi::arg("iconText"), "@brief Signal declaration for QRubberBand::windowIconTextChanged(const QString &iconText)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowTitleChanged(const QString &)", "windowTitleChanged", gsi::arg("title"), "@brief Signal declaration for QRubberBand::windowTitleChanged(const QString &title)\nYou can bind a procedure to this signal."); @@ -490,6 +491,13 @@ public: } } + // [emitter impl] void QRubberBand::objectNameChanged(const QString &objectName) + void emitter_QRubberBand_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QRubberBand::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QPaintEngine *QRubberBand::paintEngine() QPaintEngine * cbs_paintEngine_c0_0() const { @@ -2134,6 +2142,24 @@ static void _set_callback_cbs_nativeEvent_4678_0 (void *cls, const gsi::Callback } +// emitter void QRubberBand::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QRubberBand_Adaptor *)cls)->emitter_QRubberBand_objectNameChanged_4567 (arg1); +} + + // QPaintEngine *QRubberBand::paintEngine() static void _init_cbs_paintEngine_c0_0 (qt_gsi::GenericMethod *decl) @@ -2581,6 +2607,7 @@ static gsi::Methods methods_QRubberBand_Adaptor () { methods += new qt_gsi::GenericMethod ("*moveEvent", "@hide", false, &_init_cbs_moveEvent_1624_0, &_call_cbs_moveEvent_1624_0, &_set_callback_cbs_moveEvent_1624_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@brief Virtual method bool QRubberBand::nativeEvent(const QByteArray &eventType, void *message, long int *result)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QRubberBand::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("paintEngine", "@brief Virtual method QPaintEngine *QRubberBand::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@hide", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0, &_set_callback_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("*paintEvent", "@brief Virtual method void QRubberBand::paintEvent(QPaintEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_paintEvent_1725_0, &_call_cbs_paintEvent_1725_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQScrollArea.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQScrollArea.cc index 9a0718245..8416fc1f0 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQScrollArea.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQScrollArea.cc @@ -380,6 +380,7 @@ static gsi::Methods methods_QScrollArea () { methods += new qt_gsi::GenericMethod (":widgetResizable", "@brief Method bool QScrollArea::widgetResizable()\n", true, &_init_f_widgetResizable_c0, &_call_f_widgetResizable_c0); methods += gsi::qt_signal ("customContextMenuRequested(const QPoint &)", "customContextMenuRequested", gsi::arg("pos"), "@brief Signal declaration for QScrollArea::customContextMenuRequested(const QPoint &pos)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QScrollArea::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QScrollArea::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconChanged(const QIcon &)", "windowIconChanged", gsi::arg("icon"), "@brief Signal declaration for QScrollArea::windowIconChanged(const QIcon &icon)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconTextChanged(const QString &)", "windowIconTextChanged", gsi::arg("iconText"), "@brief Signal declaration for QScrollArea::windowIconTextChanged(const QString &iconText)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowTitleChanged(const QString &)", "windowTitleChanged", gsi::arg("title"), "@brief Signal declaration for QScrollArea::windowTitleChanged(const QString &title)\nYou can bind a procedure to this signal."); @@ -574,6 +575,13 @@ public: } } + // [emitter impl] void QScrollArea::objectNameChanged(const QString &objectName) + void emitter_QScrollArea_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QScrollArea::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QPaintEngine *QScrollArea::paintEngine() QPaintEngine * cbs_paintEngine_c0_0() const { @@ -2298,6 +2306,24 @@ static void _set_callback_cbs_nativeEvent_4678_0 (void *cls, const gsi::Callback } +// emitter void QScrollArea::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QScrollArea_Adaptor *)cls)->emitter_QScrollArea_objectNameChanged_4567 (arg1); +} + + // QPaintEngine *QScrollArea::paintEngine() static void _init_cbs_paintEngine_c0_0 (qt_gsi::GenericMethod *decl) @@ -2900,6 +2926,7 @@ static gsi::Methods methods_QScrollArea_Adaptor () { methods += new qt_gsi::GenericMethod ("*moveEvent", "@hide", false, &_init_cbs_moveEvent_1624_0, &_call_cbs_moveEvent_1624_0, &_set_callback_cbs_moveEvent_1624_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@brief Virtual method bool QScrollArea::nativeEvent(const QByteArray &eventType, void *message, long int *result)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QScrollArea::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("paintEngine", "@brief Virtual method QPaintEngine *QScrollArea::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@hide", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0, &_set_callback_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("*paintEvent", "@brief Virtual method void QScrollArea::paintEvent(QPaintEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_paintEvent_1725_0, &_call_cbs_paintEvent_1725_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQScrollBar.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQScrollBar.cc index 4d89041a2..7734dd1dd 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQScrollBar.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQScrollBar.cc @@ -196,6 +196,7 @@ static gsi::Methods methods_QScrollBar () { methods += gsi::qt_signal ("actionTriggered(int)", "actionTriggered", gsi::arg("action"), "@brief Signal declaration for QScrollBar::actionTriggered(int action)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("customContextMenuRequested(const QPoint &)", "customContextMenuRequested", gsi::arg("pos"), "@brief Signal declaration for QScrollBar::customContextMenuRequested(const QPoint &pos)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QScrollBar::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QScrollBar::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("rangeChanged(int, int)", "rangeChanged", gsi::arg("min"), gsi::arg("max"), "@brief Signal declaration for QScrollBar::rangeChanged(int min, int max)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("sliderMoved(int)", "sliderMoved", gsi::arg("position"), "@brief Signal declaration for QScrollBar::sliderMoved(int position)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("sliderPressed()", "sliderPressed", "@brief Signal declaration for QScrollBar::sliderPressed()\nYou can bind a procedure to this signal."); @@ -418,6 +419,13 @@ public: } } + // [emitter impl] void QScrollBar::objectNameChanged(const QString &objectName) + void emitter_QScrollBar_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QScrollBar::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QPaintEngine *QScrollBar::paintEngine() QPaintEngine * cbs_paintEngine_c0_0() const { @@ -2129,6 +2137,24 @@ static void _set_callback_cbs_nativeEvent_4678_0 (void *cls, const gsi::Callback } +// emitter void QScrollBar::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QScrollBar_Adaptor *)cls)->emitter_QScrollBar_objectNameChanged_4567 (arg1); +} + + // QPaintEngine *QScrollBar::paintEngine() static void _init_cbs_paintEngine_c0_0 (qt_gsi::GenericMethod *decl) @@ -2726,6 +2752,7 @@ static gsi::Methods methods_QScrollBar_Adaptor () { methods += new qt_gsi::GenericMethod ("*moveEvent", "@hide", false, &_init_cbs_moveEvent_1624_0, &_call_cbs_moveEvent_1624_0, &_set_callback_cbs_moveEvent_1624_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@brief Virtual method bool QScrollBar::nativeEvent(const QByteArray &eventType, void *message, long int *result)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QScrollBar::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("paintEngine", "@brief Virtual method QPaintEngine *QScrollBar::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@hide", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0, &_set_callback_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("*paintEvent", "@brief Virtual method void QScrollBar::paintEvent(QPaintEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_paintEvent_1725_0, &_call_cbs_paintEvent_1725_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQScroller.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQScroller.cc index e9030bc1f..c590e9c4f 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQScroller.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQScroller.cc @@ -616,6 +616,7 @@ static gsi::Methods methods_QScroller () { methods += new qt_gsi::GenericMethod ("target", "@brief Method QObject *QScroller::target()\n", true, &_init_f_target_c0, &_call_f_target_c0); methods += new qt_gsi::GenericMethod ("velocity", "@brief Method QPointF QScroller::velocity()\n", true, &_init_f_velocity_c0, &_call_f_velocity_c0); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QScroller::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QScroller::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("scrollerPropertiesChanged(const QScrollerProperties &)", "scrollerPropertiesChanged", gsi::arg("arg1"), "@brief Signal declaration for QScroller::scrollerPropertiesChanged(const QScrollerProperties &)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal::target_type & > ("stateChanged(QScroller::State)", "stateChanged", gsi::arg("newstate"), "@brief Signal declaration for QScroller::stateChanged(QScroller::State newstate)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("activeScrollers", "@brief Static method QList QScroller::activeScrollers()\nThis method is static and can be called without an instance.", &_init_f_activeScrollers_0, &_call_f_activeScrollers_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQShortcut.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQShortcut.cc index 05d1fbbd7..af2b94b09 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQShortcut.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQShortcut.cc @@ -333,6 +333,7 @@ static gsi::Methods methods_QShortcut () { methods += gsi::qt_signal ("activated()", "activated", "@brief Signal declaration for QShortcut::activated()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("activatedAmbiguously()", "activatedAmbiguously", "@brief Signal declaration for QShortcut::activatedAmbiguously()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QShortcut::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QShortcut::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QShortcut::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QShortcut::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -438,6 +439,13 @@ public: } } + // [emitter impl] void QShortcut::objectNameChanged(const QString &objectName) + void emitter_QShortcut_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QShortcut::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] void QShortcut::childEvent(QChildEvent *) void cbs_childEvent_1701_0(QChildEvent *arg1) { @@ -756,6 +764,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QShortcut::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QShortcut_Adaptor *)cls)->emitter_QShortcut_objectNameChanged_4567 (arg1); +} + + // exposed int QShortcut::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -849,6 +875,7 @@ static gsi::Methods methods_QShortcut_Adaptor () { methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QShortcut::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QShortcut::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QShortcut::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QShortcut::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QShortcut::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QShortcut::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQSizeGrip.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQSizeGrip.cc index a97a19920..3d58adda9 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQSizeGrip.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQSizeGrip.cc @@ -195,6 +195,7 @@ static gsi::Methods methods_QSizeGrip () { methods += new qt_gsi::GenericMethod (":sizeHint", "@brief Method QSize QSizeGrip::sizeHint()\nThis is a reimplementation of QWidget::sizeHint", true, &_init_f_sizeHint_c0, &_call_f_sizeHint_c0); methods += gsi::qt_signal ("customContextMenuRequested(const QPoint &)", "customContextMenuRequested", gsi::arg("pos"), "@brief Signal declaration for QSizeGrip::customContextMenuRequested(const QPoint &pos)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QSizeGrip::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QSizeGrip::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconChanged(const QIcon &)", "windowIconChanged", gsi::arg("icon"), "@brief Signal declaration for QSizeGrip::windowIconChanged(const QIcon &icon)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconTextChanged(const QString &)", "windowIconTextChanged", gsi::arg("iconText"), "@brief Signal declaration for QSizeGrip::windowIconTextChanged(const QString &iconText)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowTitleChanged(const QString &)", "windowTitleChanged", gsi::arg("title"), "@brief Signal declaration for QSizeGrip::windowTitleChanged(const QString &title)\nYou can bind a procedure to this signal."); @@ -343,6 +344,13 @@ public: } } + // [emitter impl] void QSizeGrip::objectNameChanged(const QString &objectName) + void emitter_QSizeGrip_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QSizeGrip::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QPaintEngine *QSizeGrip::paintEngine() QPaintEngine * cbs_paintEngine_c0_0() const { @@ -1980,6 +1988,24 @@ static void _set_callback_cbs_nativeEvent_4678_0 (void *cls, const gsi::Callback } +// emitter void QSizeGrip::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QSizeGrip_Adaptor *)cls)->emitter_QSizeGrip_objectNameChanged_4567 (arg1); +} + + // QPaintEngine *QSizeGrip::paintEngine() static void _init_cbs_paintEngine_c0_0 (qt_gsi::GenericMethod *decl) @@ -2426,6 +2452,7 @@ static gsi::Methods methods_QSizeGrip_Adaptor () { methods += new qt_gsi::GenericMethod ("*moveEvent", "@hide", false, &_init_cbs_moveEvent_1624_0, &_call_cbs_moveEvent_1624_0, &_set_callback_cbs_moveEvent_1624_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@brief Virtual method bool QSizeGrip::nativeEvent(const QByteArray &eventType, void *message, long int *result)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QSizeGrip::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("paintEngine", "@brief Virtual method QPaintEngine *QSizeGrip::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@hide", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0, &_set_callback_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("*paintEvent", "@brief Virtual method void QSizeGrip::paintEvent(QPaintEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_paintEvent_1725_0, &_call_cbs_paintEvent_1725_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQSlider.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQSlider.cc index 25a855237..be49af5f8 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQSlider.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQSlider.cc @@ -286,6 +286,7 @@ static gsi::Methods methods_QSlider () { methods += gsi::qt_signal ("actionTriggered(int)", "actionTriggered", gsi::arg("action"), "@brief Signal declaration for QSlider::actionTriggered(int action)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("customContextMenuRequested(const QPoint &)", "customContextMenuRequested", gsi::arg("pos"), "@brief Signal declaration for QSlider::customContextMenuRequested(const QPoint &pos)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QSlider::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QSlider::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("rangeChanged(int, int)", "rangeChanged", gsi::arg("min"), gsi::arg("max"), "@brief Signal declaration for QSlider::rangeChanged(int min, int max)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("sliderMoved(int)", "sliderMoved", gsi::arg("position"), "@brief Signal declaration for QSlider::sliderMoved(int position)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("sliderPressed()", "sliderPressed", "@brief Signal declaration for QSlider::sliderPressed()\nYou can bind a procedure to this signal."); @@ -508,6 +509,13 @@ public: } } + // [emitter impl] void QSlider::objectNameChanged(const QString &objectName) + void emitter_QSlider_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QSlider::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QPaintEngine *QSlider::paintEngine() QPaintEngine * cbs_paintEngine_c0_0() const { @@ -2219,6 +2227,24 @@ static void _set_callback_cbs_nativeEvent_4678_0 (void *cls, const gsi::Callback } +// emitter void QSlider::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QSlider_Adaptor *)cls)->emitter_QSlider_objectNameChanged_4567 (arg1); +} + + // QPaintEngine *QSlider::paintEngine() static void _init_cbs_paintEngine_c0_0 (qt_gsi::GenericMethod *decl) @@ -2816,6 +2842,7 @@ static gsi::Methods methods_QSlider_Adaptor () { methods += new qt_gsi::GenericMethod ("*moveEvent", "@hide", false, &_init_cbs_moveEvent_1624_0, &_call_cbs_moveEvent_1624_0, &_set_callback_cbs_moveEvent_1624_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@brief Virtual method bool QSlider::nativeEvent(const QByteArray &eventType, void *message, long int *result)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QSlider::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("paintEngine", "@brief Virtual method QPaintEngine *QSlider::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@hide", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0, &_set_callback_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("*paintEvent", "@brief Virtual method void QSlider::paintEvent(QPaintEvent *ev)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_paintEvent_1725_0, &_call_cbs_paintEvent_1725_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQSpinBox.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQSpinBox.cc index cac259979..fefb37257 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQSpinBox.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQSpinBox.cc @@ -460,6 +460,7 @@ static gsi::Methods methods_QSpinBox () { methods += gsi::qt_signal ("customContextMenuRequested(const QPoint &)", "customContextMenuRequested", gsi::arg("pos"), "@brief Signal declaration for QSpinBox::customContextMenuRequested(const QPoint &pos)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QSpinBox::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("editingFinished()", "editingFinished", "@brief Signal declaration for QSpinBox::editingFinished()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QSpinBox::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("valueChanged(int)", "valueChanged", gsi::arg("arg1"), "@brief Signal declaration for QSpinBox::valueChanged(int)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("valueChanged(const QString &)", "valueChanged_qs", gsi::arg("arg1"), "@brief Signal declaration for QSpinBox::valueChanged(const QString &)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconChanged(const QIcon &)", "windowIconChanged", gsi::arg("icon"), "@brief Signal declaration for QSpinBox::windowIconChanged(const QIcon &icon)\nYou can bind a procedure to this signal."); @@ -667,6 +668,13 @@ public: } } + // [emitter impl] void QSpinBox::objectNameChanged(const QString &objectName) + void emitter_QSpinBox_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QSpinBox::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QPaintEngine *QSpinBox::paintEngine() QPaintEngine * cbs_paintEngine_c0_0() const { @@ -2489,6 +2497,24 @@ static void _set_callback_cbs_nativeEvent_4678_0 (void *cls, const gsi::Callback } +// emitter void QSpinBox::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QSpinBox_Adaptor *)cls)->emitter_QSpinBox_objectNameChanged_4567 (arg1); +} + + // QPaintEngine *QSpinBox::paintEngine() static void _init_cbs_paintEngine_c0_0 (qt_gsi::GenericMethod *decl) @@ -3112,6 +3138,7 @@ static gsi::Methods methods_QSpinBox_Adaptor () { methods += new qt_gsi::GenericMethod ("*moveEvent", "@hide", false, &_init_cbs_moveEvent_1624_0, &_call_cbs_moveEvent_1624_0, &_set_callback_cbs_moveEvent_1624_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@brief Virtual method bool QSpinBox::nativeEvent(const QByteArray &eventType, void *message, long int *result)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QSpinBox::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("paintEngine", "@brief Virtual method QPaintEngine *QSpinBox::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@hide", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0, &_set_callback_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("*paintEvent", "@brief Virtual method void QSpinBox::paintEvent(QPaintEvent *event)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_paintEvent_1725_0, &_call_cbs_paintEvent_1725_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQSplashScreen.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQSplashScreen.cc index 5f2d458b5..96a250e70 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQSplashScreen.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQSplashScreen.cc @@ -295,6 +295,7 @@ static gsi::Methods methods_QSplashScreen () { methods += gsi::qt_signal ("customContextMenuRequested(const QPoint &)", "customContextMenuRequested", gsi::arg("pos"), "@brief Signal declaration for QSplashScreen::customContextMenuRequested(const QPoint &pos)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QSplashScreen::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("messageChanged(const QString &)", "messageChanged", gsi::arg("message"), "@brief Signal declaration for QSplashScreen::messageChanged(const QString &message)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QSplashScreen::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconChanged(const QIcon &)", "windowIconChanged", gsi::arg("icon"), "@brief Signal declaration for QSplashScreen::windowIconChanged(const QIcon &icon)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconTextChanged(const QString &)", "windowIconTextChanged", gsi::arg("iconText"), "@brief Signal declaration for QSplashScreen::windowIconTextChanged(const QString &iconText)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowTitleChanged(const QString &)", "windowTitleChanged", gsi::arg("title"), "@brief Signal declaration for QSplashScreen::windowTitleChanged(const QString &title)\nYou can bind a procedure to this signal."); @@ -494,6 +495,13 @@ public: } } + // [emitter impl] void QSplashScreen::objectNameChanged(const QString &objectName) + void emitter_QSplashScreen_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QSplashScreen::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QPaintEngine *QSplashScreen::paintEngine() QPaintEngine * cbs_paintEngine_c0_0() const { @@ -2201,6 +2209,24 @@ static void _set_callback_cbs_nativeEvent_4678_0 (void *cls, const gsi::Callback } +// emitter void QSplashScreen::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QSplashScreen_Adaptor *)cls)->emitter_QSplashScreen_objectNameChanged_4567 (arg1); +} + + // QPaintEngine *QSplashScreen::paintEngine() static void _init_cbs_paintEngine_c0_0 (qt_gsi::GenericMethod *decl) @@ -2651,6 +2677,7 @@ static gsi::Methods methods_QSplashScreen_Adaptor () { methods += new qt_gsi::GenericMethod ("*moveEvent", "@hide", false, &_init_cbs_moveEvent_1624_0, &_call_cbs_moveEvent_1624_0, &_set_callback_cbs_moveEvent_1624_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@brief Virtual method bool QSplashScreen::nativeEvent(const QByteArray &eventType, void *message, long int *result)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QSplashScreen::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("paintEngine", "@brief Virtual method QPaintEngine *QSplashScreen::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@hide", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0, &_set_callback_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("*paintEvent", "@brief Virtual method void QSplashScreen::paintEvent(QPaintEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_paintEvent_1725_0, &_call_cbs_paintEvent_1725_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQSplitter.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQSplitter.cc index e163d3977..de47273d8 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQSplitter.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQSplitter.cc @@ -646,6 +646,7 @@ static gsi::Methods methods_QSplitter () { methods += new qt_gsi::GenericMethod ("widget", "@brief Method QWidget *QSplitter::widget(int index)\n", true, &_init_f_widget_c767, &_call_f_widget_c767); methods += gsi::qt_signal ("customContextMenuRequested(const QPoint &)", "customContextMenuRequested", gsi::arg("pos"), "@brief Signal declaration for QSplitter::customContextMenuRequested(const QPoint &pos)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QSplitter::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QSplitter::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("splitterMoved(int, int)", "splitterMoved", gsi::arg("pos"), gsi::arg("index"), "@brief Signal declaration for QSplitter::splitterMoved(int pos, int index)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconChanged(const QIcon &)", "windowIconChanged", gsi::arg("icon"), "@brief Signal declaration for QSplitter::windowIconChanged(const QIcon &icon)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconTextChanged(const QString &)", "windowIconTextChanged", gsi::arg("iconText"), "@brief Signal declaration for QSplitter::windowIconTextChanged(const QString &iconText)\nYou can bind a procedure to this signal."); @@ -853,6 +854,13 @@ public: } } + // [emitter impl] void QSplitter::objectNameChanged(const QString &objectName) + void emitter_QSplitter_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QSplitter::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QPaintEngine *QSplitter::paintEngine() QPaintEngine * cbs_paintEngine_c0_0() const { @@ -2618,6 +2626,24 @@ static void _set_callback_cbs_nativeEvent_4678_0 (void *cls, const gsi::Callback } +// emitter void QSplitter::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QSplitter_Adaptor *)cls)->emitter_QSplitter_objectNameChanged_4567 (arg1); +} + + // QPaintEngine *QSplitter::paintEngine() static void _init_cbs_paintEngine_c0_0 (qt_gsi::GenericMethod *decl) @@ -3111,6 +3137,7 @@ static gsi::Methods methods_QSplitter_Adaptor () { methods += new qt_gsi::GenericMethod ("*moveSplitter", "@brief Method void QSplitter::moveSplitter(int pos, int index)\nThis method is protected and can only be called from inside a derived class.", false, &_init_fp_moveSplitter_1426, &_call_fp_moveSplitter_1426); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@brief Virtual method bool QSplitter::nativeEvent(const QByteArray &eventType, void *message, long int *result)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QSplitter::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("paintEngine", "@brief Virtual method QPaintEngine *QSplitter::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@hide", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0, &_set_callback_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("*paintEvent", "@brief Virtual method void QSplitter::paintEvent(QPaintEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_paintEvent_1725_0, &_call_cbs_paintEvent_1725_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQSplitterHandle.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQSplitterHandle.cc index 2c3ea872e..7431dbc9a 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQSplitterHandle.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQSplitterHandle.cc @@ -244,6 +244,7 @@ static gsi::Methods methods_QSplitterHandle () { methods += new qt_gsi::GenericMethod ("splitter", "@brief Method QSplitter *QSplitterHandle::splitter()\n", true, &_init_f_splitter_c0, &_call_f_splitter_c0); methods += gsi::qt_signal ("customContextMenuRequested(const QPoint &)", "customContextMenuRequested", gsi::arg("pos"), "@brief Signal declaration for QSplitterHandle::customContextMenuRequested(const QPoint &pos)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QSplitterHandle::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QSplitterHandle::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconChanged(const QIcon &)", "windowIconChanged", gsi::arg("icon"), "@brief Signal declaration for QSplitterHandle::windowIconChanged(const QIcon &icon)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconTextChanged(const QString &)", "windowIconTextChanged", gsi::arg("iconText"), "@brief Signal declaration for QSplitterHandle::windowIconTextChanged(const QString &iconText)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowTitleChanged(const QString &)", "windowTitleChanged", gsi::arg("title"), "@brief Signal declaration for QSplitterHandle::windowTitleChanged(const QString &title)\nYou can bind a procedure to this signal."); @@ -417,6 +418,13 @@ public: } } + // [emitter impl] void QSplitterHandle::objectNameChanged(const QString &objectName) + void emitter_QSplitterHandle_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QSplitterHandle::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QPaintEngine *QSplitterHandle::paintEngine() QPaintEngine * cbs_paintEngine_c0_0() const { @@ -2079,6 +2087,24 @@ static void _set_callback_cbs_nativeEvent_4678_0 (void *cls, const gsi::Callback } +// emitter void QSplitterHandle::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QSplitterHandle_Adaptor *)cls)->emitter_QSplitterHandle_objectNameChanged_4567 (arg1); +} + + // QPaintEngine *QSplitterHandle::paintEngine() static void _init_cbs_paintEngine_c0_0 (qt_gsi::GenericMethod *decl) @@ -2527,6 +2553,7 @@ static gsi::Methods methods_QSplitterHandle_Adaptor () { methods += new qt_gsi::GenericMethod ("*moveSplitter", "@brief Method void QSplitterHandle::moveSplitter(int p)\nThis method is protected and can only be called from inside a derived class.", false, &_init_fp_moveSplitter_767, &_call_fp_moveSplitter_767); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@brief Virtual method bool QSplitterHandle::nativeEvent(const QByteArray &eventType, void *message, long int *result)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QSplitterHandle::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("paintEngine", "@brief Virtual method QPaintEngine *QSplitterHandle::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@hide", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0, &_set_callback_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("*paintEvent", "@brief Virtual method void QSplitterHandle::paintEvent(QPaintEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_paintEvent_1725_0, &_call_cbs_paintEvent_1725_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQStackedLayout.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQStackedLayout.cc index 857ee206b..474b875e9 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQStackedLayout.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQStackedLayout.cc @@ -476,6 +476,7 @@ static gsi::Methods methods_QStackedLayout () { methods += new qt_gsi::GenericMethod ("widget", "@brief Method QWidget *QStackedLayout::widget(int)\n", true, &_init_f_widget_c767, &_call_f_widget_c767); methods += gsi::qt_signal ("currentChanged(int)", "currentChanged", gsi::arg("index"), "@brief Signal declaration for QStackedLayout::currentChanged(int index)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QStackedLayout::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QStackedLayout::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("widgetRemoved(int)", "widgetRemoved", gsi::arg("index"), "@brief Signal declaration for QStackedLayout::widgetRemoved(int index)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QStackedLayout::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QStackedLayout::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); @@ -829,6 +830,13 @@ public: } } + // [emitter impl] void QStackedLayout::objectNameChanged(const QString &objectName) + void emitter_QStackedLayout_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QStackedLayout::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] void QStackedLayout::setGeometry(const QRect &rect) void cbs_setGeometry_1792_0(const QRect &rect) { @@ -1607,6 +1615,24 @@ static void _set_callback_cbs_minimumSize_c0_0 (void *cls, const gsi::Callback & } +// emitter void QStackedLayout::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QStackedLayout_Adaptor *)cls)->emitter_QStackedLayout_objectNameChanged_4567 (arg1); +} + + // exposed int QStackedLayout::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -1875,6 +1901,7 @@ static gsi::Methods methods_QStackedLayout_Adaptor () { methods += new qt_gsi::GenericMethod ("minimumHeightForWidth", "@hide", true, &_init_cbs_minimumHeightForWidth_c767_0, &_call_cbs_minimumHeightForWidth_c767_0, &_set_callback_cbs_minimumHeightForWidth_c767_0); methods += new qt_gsi::GenericMethod ("minimumSize", "@brief Virtual method QSize QStackedLayout::minimumSize()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_minimumSize_c0_0, &_call_cbs_minimumSize_c0_0); methods += new qt_gsi::GenericMethod ("minimumSize", "@hide", true, &_init_cbs_minimumSize_c0_0, &_call_cbs_minimumSize_c0_0, &_set_callback_cbs_minimumSize_c0_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QStackedLayout::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QStackedLayout::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QStackedLayout::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QStackedLayout::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQStackedWidget.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQStackedWidget.cc index 8228ef099..ad90d9453 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQStackedWidget.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQStackedWidget.cc @@ -354,6 +354,7 @@ static gsi::Methods methods_QStackedWidget () { methods += gsi::qt_signal ("currentChanged(int)", "currentChanged", gsi::arg("arg1"), "@brief Signal declaration for QStackedWidget::currentChanged(int)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("customContextMenuRequested(const QPoint &)", "customContextMenuRequested", gsi::arg("pos"), "@brief Signal declaration for QStackedWidget::customContextMenuRequested(const QPoint &pos)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QStackedWidget::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QStackedWidget::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("widgetRemoved(int)", "widgetRemoved", gsi::arg("index"), "@brief Signal declaration for QStackedWidget::widgetRemoved(int index)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconChanged(const QIcon &)", "windowIconChanged", gsi::arg("icon"), "@brief Signal declaration for QStackedWidget::windowIconChanged(const QIcon &icon)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconTextChanged(const QString &)", "windowIconTextChanged", gsi::arg("iconText"), "@brief Signal declaration for QStackedWidget::windowIconTextChanged(const QString &iconText)\nYou can bind a procedure to this signal."); @@ -540,6 +541,13 @@ public: } } + // [emitter impl] void QStackedWidget::objectNameChanged(const QString &objectName) + void emitter_QStackedWidget_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QStackedWidget::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QPaintEngine *QStackedWidget::paintEngine() QPaintEngine * cbs_paintEngine_c0_0() const { @@ -2224,6 +2232,24 @@ static void _set_callback_cbs_nativeEvent_4678_0 (void *cls, const gsi::Callback } +// emitter void QStackedWidget::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QStackedWidget_Adaptor *)cls)->emitter_QStackedWidget_objectNameChanged_4567 (arg1); +} + + // QPaintEngine *QStackedWidget::paintEngine() static void _init_cbs_paintEngine_c0_0 (qt_gsi::GenericMethod *decl) @@ -2691,6 +2717,7 @@ static gsi::Methods methods_QStackedWidget_Adaptor () { methods += new qt_gsi::GenericMethod ("*moveEvent", "@hide", false, &_init_cbs_moveEvent_1624_0, &_call_cbs_moveEvent_1624_0, &_set_callback_cbs_moveEvent_1624_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@brief Virtual method bool QStackedWidget::nativeEvent(const QByteArray &eventType, void *message, long int *result)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QStackedWidget::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("paintEngine", "@brief Virtual method QPaintEngine *QStackedWidget::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@hide", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0, &_set_callback_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("*paintEvent", "@brief Virtual method void QStackedWidget::paintEvent(QPaintEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_paintEvent_1725_0, &_call_cbs_paintEvent_1725_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQStatusBar.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQStatusBar.cc index 4df90edf3..b31ac3b8a 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQStatusBar.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQStatusBar.cc @@ -374,6 +374,7 @@ static gsi::Methods methods_QStatusBar () { methods += gsi::qt_signal ("customContextMenuRequested(const QPoint &)", "customContextMenuRequested", gsi::arg("pos"), "@brief Signal declaration for QStatusBar::customContextMenuRequested(const QPoint &pos)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QStatusBar::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("messageChanged(const QString &)", "messageChanged", gsi::arg("text"), "@brief Signal declaration for QStatusBar::messageChanged(const QString &text)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QStatusBar::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconChanged(const QIcon &)", "windowIconChanged", gsi::arg("icon"), "@brief Signal declaration for QStatusBar::windowIconChanged(const QIcon &icon)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconTextChanged(const QString &)", "windowIconTextChanged", gsi::arg("iconText"), "@brief Signal declaration for QStatusBar::windowIconTextChanged(const QString &iconText)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowTitleChanged(const QString &)", "windowTitleChanged", gsi::arg("title"), "@brief Signal declaration for QStatusBar::windowTitleChanged(const QString &title)\nYou can bind a procedure to this signal."); @@ -559,6 +560,13 @@ public: } } + // [emitter impl] void QStatusBar::objectNameChanged(const QString &objectName) + void emitter_QStatusBar_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QStatusBar::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QPaintEngine *QStatusBar::paintEngine() QPaintEngine * cbs_paintEngine_c0_0() const { @@ -2214,6 +2222,24 @@ static void _set_callback_cbs_nativeEvent_4678_0 (void *cls, const gsi::Callback } +// emitter void QStatusBar::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QStatusBar_Adaptor *)cls)->emitter_QStatusBar_objectNameChanged_4567 (arg1); +} + + // QPaintEngine *QStatusBar::paintEngine() static void _init_cbs_paintEngine_c0_0 (qt_gsi::GenericMethod *decl) @@ -2677,6 +2703,7 @@ static gsi::Methods methods_QStatusBar_Adaptor () { methods += new qt_gsi::GenericMethod ("*moveEvent", "@hide", false, &_init_cbs_moveEvent_1624_0, &_call_cbs_moveEvent_1624_0, &_set_callback_cbs_moveEvent_1624_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@brief Virtual method bool QStatusBar::nativeEvent(const QByteArray &eventType, void *message, long int *result)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QStatusBar::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("paintEngine", "@brief Virtual method QPaintEngine *QStatusBar::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@hide", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0, &_set_callback_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("*paintEvent", "@brief Virtual method void QStatusBar::paintEvent(QPaintEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_paintEvent_1725_0, &_call_cbs_paintEvent_1725_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQStyle.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQStyle.cc index 94c18a8a0..0935216ec 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQStyle.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQStyle.cc @@ -951,6 +951,7 @@ static gsi::Methods methods_QStyle () { methods += new qt_gsi::GenericMethod ("unpolish", "@brief Method void QStyle::unpolish(QWidget *)\n", false, &_init_f_unpolish_1315, &_call_f_unpolish_1315); methods += new qt_gsi::GenericMethod ("unpolish", "@brief Method void QStyle::unpolish(QApplication *)\n", false, &_init_f_unpolish_1843, &_call_f_unpolish_1843); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QStyle::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QStyle::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("alignedRect", "@brief Static method QRect QStyle::alignedRect(Qt::LayoutDirection direction, QFlags alignment, const QSize &size, const QRect &rectangle)\nThis method is static and can be called without an instance.", &_init_f_alignedRect_8339, &_call_f_alignedRect_8339); methods += new qt_gsi::GenericStaticMethod ("sliderPositionFromValue", "@brief Static method int QStyle::sliderPositionFromValue(int min, int max, int val, int space, bool upsideDown)\nThis method is static and can be called without an instance.", &_init_f_sliderPositionFromValue_3500, &_call_f_sliderPositionFromValue_3500); methods += new qt_gsi::GenericStaticMethod ("sliderValueFromPosition", "@brief Static method int QStyle::sliderValueFromPosition(int min, int max, int pos, int space, bool upsideDown)\nThis method is static and can be called without an instance.", &_init_f_sliderValueFromPosition_3500, &_call_f_sliderValueFromPosition_3500); @@ -1215,6 +1216,13 @@ public: } } + // [emitter impl] void QStyle::objectNameChanged(const QString &objectName) + void emitter_QStyle_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QStyle::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] int QStyle::pixelMetric(QStyle::PixelMetric metric, const QStyleOption *option, const QWidget *widget) int cbs_pixelMetric_c6642_2(const qt_gsi::Converter::target_type & metric, const QStyleOption *option, const QWidget *widget) const { @@ -2032,6 +2040,24 @@ static void _set_callback_cbs_layoutSpacing_c11697_2 (void *cls, const gsi::Call } +// emitter void QStyle::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QStyle_Adaptor *)cls)->emitter_QStyle_objectNameChanged_4567 (arg1); +} + + // int QStyle::pixelMetric(QStyle::PixelMetric metric, const QStyleOption *option, const QWidget *widget) static void _init_cbs_pixelMetric_c6642_2 (qt_gsi::GenericMethod *decl) @@ -2493,6 +2519,7 @@ static gsi::Methods methods_QStyle_Adaptor () { methods += new qt_gsi::GenericMethod ("itemTextRect", "@hide", true, &_init_cbs_itemTextRect_c7544_0, &_call_cbs_itemTextRect_c7544_0, &_set_callback_cbs_itemTextRect_c7544_0); methods += new qt_gsi::GenericMethod ("layoutSpacing", "@brief Virtual method int QStyle::layoutSpacing(QSizePolicy::ControlType control1, QSizePolicy::ControlType control2, Qt::Orientation orientation, const QStyleOption *option, const QWidget *widget)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_layoutSpacing_c11697_2, &_call_cbs_layoutSpacing_c11697_2); methods += new qt_gsi::GenericMethod ("layoutSpacing", "@hide", true, &_init_cbs_layoutSpacing_c11697_2, &_call_cbs_layoutSpacing_c11697_2, &_set_callback_cbs_layoutSpacing_c11697_2); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QStyle::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("pixelMetric", "@brief Virtual method int QStyle::pixelMetric(QStyle::PixelMetric metric, const QStyleOption *option, const QWidget *widget)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_pixelMetric_c6642_2, &_call_cbs_pixelMetric_c6642_2); methods += new qt_gsi::GenericMethod ("pixelMetric", "@hide", true, &_init_cbs_pixelMetric_c6642_2, &_call_cbs_pixelMetric_c6642_2, &_set_callback_cbs_pixelMetric_c6642_2); methods += new qt_gsi::GenericMethod ("polish", "@brief Virtual method void QStyle::polish(QWidget *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_polish_1315_0, &_call_cbs_polish_1315_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQStylePlugin.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQStylePlugin.cc index d9ba20330..d67991e17 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQStylePlugin.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQStylePlugin.cc @@ -133,6 +133,7 @@ static gsi::Methods methods_QStylePlugin () { methods += new qt_gsi::GenericStaticMethod ("staticMetaObject", "@brief Obtains the static MetaObject for this class.", &_init_smo, &_call_smo); methods += new qt_gsi::GenericMethod ("qt_create", "@brief Method QStyle *QStylePlugin::create(const QString &key)\n", false, &_init_f_create_2025, &_call_f_create_2025); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QStylePlugin::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QStylePlugin::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QStylePlugin::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QStylePlugin::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -239,6 +240,13 @@ public: } } + // [emitter impl] void QStylePlugin::objectNameChanged(const QString &objectName) + void emitter_QStylePlugin_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QStylePlugin::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] void QStylePlugin::childEvent(QChildEvent *) void cbs_childEvent_1701_0(QChildEvent *arg1) { @@ -508,6 +516,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QStylePlugin::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QStylePlugin_Adaptor *)cls)->emitter_QStylePlugin_objectNameChanged_4567 (arg1); +} + + // exposed int QStylePlugin::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -600,6 +626,7 @@ static gsi::Methods methods_QStylePlugin_Adaptor () { methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QStylePlugin::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QStylePlugin::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QStylePlugin::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QStylePlugin::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QStylePlugin::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QStylePlugin::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQStyledItemDelegate.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQStyledItemDelegate.cc index 4c4c6717e..898482370 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQStyledItemDelegate.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQStyledItemDelegate.cc @@ -339,6 +339,7 @@ static gsi::Methods methods_QStyledItemDelegate () { methods += gsi::qt_signal::target_type & > ("closeEditor(QWidget *, QAbstractItemDelegate::EndEditHint)", "closeEditor", gsi::arg("editor"), gsi::arg("hint"), "@brief Signal declaration for QStyledItemDelegate::closeEditor(QWidget *editor, QAbstractItemDelegate::EndEditHint hint)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("commitData(QWidget *)", "commitData", gsi::arg("editor"), "@brief Signal declaration for QStyledItemDelegate::commitData(QWidget *editor)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QStyledItemDelegate::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QStyledItemDelegate::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("sizeHintChanged(const QModelIndex &)", "sizeHintChanged", gsi::arg("arg1"), "@brief Signal declaration for QStyledItemDelegate::sizeHintChanged(const QModelIndex &)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QStyledItemDelegate::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QStyledItemDelegate::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); @@ -487,6 +488,13 @@ public: } } + // [emitter impl] void QStyledItemDelegate::objectNameChanged(const QString &objectName) + void emitter_QStyledItemDelegate_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QStyledItemDelegate::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] void QStyledItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) void cbs_paint_c6971_0(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const { @@ -1097,6 +1105,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QStyledItemDelegate::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QStyledItemDelegate_Adaptor *)cls)->emitter_QStyledItemDelegate_objectNameChanged_4567 (arg1); +} + + // void QStyledItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) static void _init_cbs_paint_c6971_0 (qt_gsi::GenericMethod *decl) @@ -1381,6 +1407,7 @@ static gsi::Methods methods_QStyledItemDelegate_Adaptor () { methods += new qt_gsi::GenericMethod ("*initStyleOption", "@brief Virtual method void QStyledItemDelegate::initStyleOption(QStyleOptionViewItem *option, const QModelIndex &index)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_initStyleOption_c4962_0, &_call_cbs_initStyleOption_c4962_0); methods += new qt_gsi::GenericMethod ("*initStyleOption", "@hide", true, &_init_cbs_initStyleOption_c4962_0, &_call_cbs_initStyleOption_c4962_0, &_set_callback_cbs_initStyleOption_c4962_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QStyledItemDelegate::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QStyledItemDelegate::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("paint", "@brief Virtual method void QStyledItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paint_c6971_0, &_call_cbs_paint_c6971_0); methods += new qt_gsi::GenericMethod ("paint", "@hide", true, &_init_cbs_paint_c6971_0, &_call_cbs_paint_c6971_0, &_set_callback_cbs_paint_c6971_0); methods += new qt_gsi::GenericMethod ("paintingRoles", "@brief Virtual method QVector QStyledItemDelegate::paintingRoles()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintingRoles_c0_0, &_call_cbs_paintingRoles_c0_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQSwipeGesture.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQSwipeGesture.cc index ac05e068b..35f0878db 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQSwipeGesture.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQSwipeGesture.cc @@ -182,6 +182,7 @@ static gsi::Methods methods_QSwipeGesture () { methods += new qt_gsi::GenericMethod (":swipeAngle", "@brief Method double QSwipeGesture::swipeAngle()\n", true, &_init_f_swipeAngle_c0, &_call_f_swipeAngle_c0); methods += new qt_gsi::GenericMethod (":verticalDirection", "@brief Method QSwipeGesture::SwipeDirection QSwipeGesture::verticalDirection()\n", true, &_init_f_verticalDirection_c0, &_call_f_verticalDirection_c0); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QSwipeGesture::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QSwipeGesture::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QSwipeGesture::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QSwipeGesture::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -272,6 +273,13 @@ public: } } + // [emitter impl] void QSwipeGesture::objectNameChanged(const QString &objectName) + void emitter_QSwipeGesture_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QSwipeGesture::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] void QSwipeGesture::childEvent(QChildEvent *) void cbs_childEvent_1701_0(QChildEvent *arg1) { @@ -517,6 +525,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QSwipeGesture::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QSwipeGesture_Adaptor *)cls)->emitter_QSwipeGesture_objectNameChanged_4567 (arg1); +} + + // exposed int QSwipeGesture::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -607,6 +633,7 @@ static gsi::Methods methods_QSwipeGesture_Adaptor () { methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QSwipeGesture::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QSwipeGesture::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QSwipeGesture::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QSwipeGesture::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QSwipeGesture::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QSwipeGesture::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQSystemTrayIcon.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQSystemTrayIcon.cc index 5e5273d57..0ae979631 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQSystemTrayIcon.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQSystemTrayIcon.cc @@ -375,6 +375,7 @@ static gsi::Methods methods_QSystemTrayIcon () { methods += gsi::qt_signal::target_type & > ("activated(QSystemTrayIcon::ActivationReason)", "activated", gsi::arg("reason"), "@brief Signal declaration for QSystemTrayIcon::activated(QSystemTrayIcon::ActivationReason reason)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QSystemTrayIcon::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("messageClicked()", "messageClicked", "@brief Signal declaration for QSystemTrayIcon::messageClicked()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QSystemTrayIcon::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("isSystemTrayAvailable?", "@brief Static method bool QSystemTrayIcon::isSystemTrayAvailable()\nThis method is static and can be called without an instance.", &_init_f_isSystemTrayAvailable_0, &_call_f_isSystemTrayAvailable_0); methods += new qt_gsi::GenericStaticMethod ("supportsMessages", "@brief Static method bool QSystemTrayIcon::supportsMessages()\nThis method is static and can be called without an instance.", &_init_f_supportsMessages_0, &_call_f_supportsMessages_0); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QSystemTrayIcon::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); @@ -476,6 +477,13 @@ public: emit QSystemTrayIcon::messageClicked(); } + // [emitter impl] void QSystemTrayIcon::objectNameChanged(const QString &objectName) + void emitter_QSystemTrayIcon_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QSystemTrayIcon::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] void QSystemTrayIcon::childEvent(QChildEvent *) void cbs_childEvent_1701_0(QChildEvent *arg1) { @@ -789,6 +797,24 @@ static void _call_emitter_messageClicked_0 (const qt_gsi::GenericMethod * /*decl } +// emitter void QSystemTrayIcon::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QSystemTrayIcon_Adaptor *)cls)->emitter_QSystemTrayIcon_objectNameChanged_4567 (arg1); +} + + // exposed int QSystemTrayIcon::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -882,6 +908,7 @@ static gsi::Methods methods_QSystemTrayIcon_Adaptor () { methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QSystemTrayIcon::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); methods += new qt_gsi::GenericMethod ("emit_messageClicked", "@brief Emitter for signal void QSystemTrayIcon::messageClicked()\nCall this method to emit this signal.", false, &_init_emitter_messageClicked_0, &_call_emitter_messageClicked_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QSystemTrayIcon::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QSystemTrayIcon::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QSystemTrayIcon::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QSystemTrayIcon::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQTabBar.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQTabBar.cc index 9ecf78114..461d7a08d 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQTabBar.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQTabBar.cc @@ -1225,6 +1225,7 @@ static gsi::Methods methods_QTabBar () { methods += gsi::qt_signal ("currentChanged(int)", "currentChanged", gsi::arg("index"), "@brief Signal declaration for QTabBar::currentChanged(int index)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("customContextMenuRequested(const QPoint &)", "customContextMenuRequested", gsi::arg("pos"), "@brief Signal declaration for QTabBar::customContextMenuRequested(const QPoint &pos)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QTabBar::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QTabBar::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("tabBarClicked(int)", "tabBarClicked", gsi::arg("index"), "@brief Signal declaration for QTabBar::tabBarClicked(int index)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("tabBarDoubleClicked(int)", "tabBarDoubleClicked", gsi::arg("index"), "@brief Signal declaration for QTabBar::tabBarDoubleClicked(int index)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("tabCloseRequested(int)", "tabCloseRequested", gsi::arg("index"), "@brief Signal declaration for QTabBar::tabCloseRequested(int index)\nYou can bind a procedure to this signal."); @@ -1409,6 +1410,13 @@ public: } } + // [emitter impl] void QTabBar::objectNameChanged(const QString &objectName) + void emitter_QTabBar_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QTabBar::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QPaintEngine *QTabBar::paintEngine() QPaintEngine * cbs_paintEngine_c0_0() const { @@ -3198,6 +3206,24 @@ static void _set_callback_cbs_nativeEvent_4678_0 (void *cls, const gsi::Callback } +// emitter void QTabBar::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QTabBar_Adaptor *)cls)->emitter_QTabBar_objectNameChanged_4567 (arg1); +} + + // QPaintEngine *QTabBar::paintEngine() static void _init_cbs_paintEngine_c0_0 (qt_gsi::GenericMethod *decl) @@ -3814,6 +3840,7 @@ static gsi::Methods methods_QTabBar_Adaptor () { methods += new qt_gsi::GenericMethod ("*moveEvent", "@hide", false, &_init_cbs_moveEvent_1624_0, &_call_cbs_moveEvent_1624_0, &_set_callback_cbs_moveEvent_1624_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@brief Virtual method bool QTabBar::nativeEvent(const QByteArray &eventType, void *message, long int *result)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QTabBar::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("paintEngine", "@brief Virtual method QPaintEngine *QTabBar::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@hide", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0, &_set_callback_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("*paintEvent", "@brief Virtual method void QTabBar::paintEvent(QPaintEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_paintEvent_1725_0, &_call_cbs_paintEvent_1725_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQTabWidget.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQTabWidget.cc index cda1a5b04..5d5b5c1d6 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQTabWidget.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQTabWidget.cc @@ -1114,6 +1114,7 @@ static gsi::Methods methods_QTabWidget () { methods += gsi::qt_signal ("currentChanged(int)", "currentChanged", gsi::arg("index"), "@brief Signal declaration for QTabWidget::currentChanged(int index)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("customContextMenuRequested(const QPoint &)", "customContextMenuRequested", gsi::arg("pos"), "@brief Signal declaration for QTabWidget::customContextMenuRequested(const QPoint &pos)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QTabWidget::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QTabWidget::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("tabBarClicked(int)", "tabBarClicked", gsi::arg("index"), "@brief Signal declaration for QTabWidget::tabBarClicked(int index)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("tabBarDoubleClicked(int)", "tabBarDoubleClicked", gsi::arg("index"), "@brief Signal declaration for QTabWidget::tabBarDoubleClicked(int index)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("tabCloseRequested(int)", "tabCloseRequested", gsi::arg("index"), "@brief Signal declaration for QTabWidget::tabCloseRequested(int index)\nYou can bind a procedure to this signal."); @@ -1302,6 +1303,13 @@ public: } } + // [emitter impl] void QTabWidget::objectNameChanged(const QString &objectName) + void emitter_QTabWidget_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QTabWidget::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QPaintEngine *QTabWidget::paintEngine() QPaintEngine * cbs_paintEngine_c0_0() const { @@ -3011,6 +3019,24 @@ static void _set_callback_cbs_nativeEvent_4678_0 (void *cls, const gsi::Callback } +// emitter void QTabWidget::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QTabWidget_Adaptor *)cls)->emitter_QTabWidget_objectNameChanged_4567 (arg1); +} + + // QPaintEngine *QTabWidget::paintEngine() static void _init_cbs_paintEngine_c0_0 (qt_gsi::GenericMethod *decl) @@ -3580,6 +3606,7 @@ static gsi::Methods methods_QTabWidget_Adaptor () { methods += new qt_gsi::GenericMethod ("*moveEvent", "@hide", false, &_init_cbs_moveEvent_1624_0, &_call_cbs_moveEvent_1624_0, &_set_callback_cbs_moveEvent_1624_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@brief Virtual method bool QTabWidget::nativeEvent(const QByteArray &eventType, void *message, long int *result)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QTabWidget::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("paintEngine", "@brief Virtual method QPaintEngine *QTabWidget::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@hide", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0, &_set_callback_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("*paintEvent", "@brief Virtual method void QTabWidget::paintEvent(QPaintEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_paintEvent_1725_0, &_call_cbs_paintEvent_1725_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQTableView.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQTableView.cc index 07255c106..74cc47bb7 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQTableView.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQTableView.cc @@ -1171,6 +1171,7 @@ static gsi::Methods methods_QTableView () { methods += gsi::qt_signal ("doubleClicked(const QModelIndex &)", "doubleClicked", gsi::arg("index"), "@brief Signal declaration for QTableView::doubleClicked(const QModelIndex &index)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("entered(const QModelIndex &)", "entered", gsi::arg("index"), "@brief Signal declaration for QTableView::entered(const QModelIndex &index)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("iconSizeChanged(const QSize &)", "iconSizeChanged", gsi::arg("size"), "@brief Signal declaration for QTableView::iconSizeChanged(const QSize &size)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QTableView::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("pressed(const QModelIndex &)", "pressed", gsi::arg("index"), "@brief Signal declaration for QTableView::pressed(const QModelIndex &index)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("viewportEntered()", "viewportEntered", "@brief Signal declaration for QTableView::viewportEntered()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconChanged(const QIcon &)", "windowIconChanged", gsi::arg("icon"), "@brief Signal declaration for QTableView::windowIconChanged(const QIcon &icon)\nYou can bind a procedure to this signal."); @@ -1532,6 +1533,13 @@ public: } } + // [emitter impl] void QTableView::objectNameChanged(const QString &objectName) + void emitter_QTableView_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QTableView::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QPaintEngine *QTableView::paintEngine() QPaintEngine * cbs_paintEngine_c0_0() const { @@ -4424,6 +4432,24 @@ static void _set_callback_cbs_nativeEvent_4678_0 (void *cls, const gsi::Callback } +// emitter void QTableView::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QTableView_Adaptor *)cls)->emitter_QTableView_objectNameChanged_4567 (arg1); +} + + // QPaintEngine *QTableView::paintEngine() static void _init_cbs_paintEngine_c0_0 (qt_gsi::GenericMethod *decl) @@ -5902,6 +5928,7 @@ static gsi::Methods methods_QTableView_Adaptor () { methods += new qt_gsi::GenericMethod ("*moveEvent", "@hide", false, &_init_cbs_moveEvent_1624_0, &_call_cbs_moveEvent_1624_0, &_set_callback_cbs_moveEvent_1624_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@brief Virtual method bool QTableView::nativeEvent(const QByteArray &eventType, void *message, long int *result)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QTableView::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("paintEngine", "@brief Virtual method QPaintEngine *QTableView::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@hide", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0, &_set_callback_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("*paintEvent", "@brief Virtual method void QTableView::paintEvent(QPaintEvent *e)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_paintEvent_1725_0, &_call_cbs_paintEvent_1725_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQTableWidget.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQTableWidget.cc index c4a46ff6e..61b1ff0f3 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQTableWidget.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQTableWidget.cc @@ -1295,6 +1295,7 @@ static gsi::Methods methods_QTableWidget () { methods += gsi::qt_signal ("itemEntered(QTableWidgetItem *)", "itemEntered", gsi::arg("item"), "@brief Signal declaration for QTableWidget::itemEntered(QTableWidgetItem *item)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("itemPressed(QTableWidgetItem *)", "itemPressed", gsi::arg("item"), "@brief Signal declaration for QTableWidget::itemPressed(QTableWidgetItem *item)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("itemSelectionChanged()", "itemSelectionChanged", "@brief Signal declaration for QTableWidget::itemSelectionChanged()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QTableWidget::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("pressed(const QModelIndex &)", "pressed", gsi::arg("index"), "@brief Signal declaration for QTableWidget::pressed(const QModelIndex &index)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("viewportEntered()", "viewportEntered", "@brief Signal declaration for QTableWidget::viewportEntered()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconChanged(const QIcon &)", "windowIconChanged", gsi::arg("icon"), "@brief Signal declaration for QTableWidget::windowIconChanged(const QIcon &icon)\nYou can bind a procedure to this signal."); @@ -1773,6 +1774,13 @@ public: } } + // [emitter impl] void QTableWidget::objectNameChanged(const QString &objectName) + void emitter_QTableWidget_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QTableWidget::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QPaintEngine *QTableWidget::paintEngine() QPaintEngine * cbs_paintEngine_c0_0() const { @@ -5161,6 +5169,24 @@ static void _set_callback_cbs_nativeEvent_4678_0 (void *cls, const gsi::Callback } +// emitter void QTableWidget::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QTableWidget_Adaptor *)cls)->emitter_QTableWidget_objectNameChanged_4567 (arg1); +} + + // QPaintEngine *QTableWidget::paintEngine() static void _init_cbs_paintEngine_c0_0 (qt_gsi::GenericMethod *decl) @@ -6659,6 +6685,7 @@ static gsi::Methods methods_QTableWidget_Adaptor () { methods += new qt_gsi::GenericMethod ("*moveEvent", "@hide", false, &_init_cbs_moveEvent_1624_0, &_call_cbs_moveEvent_1624_0, &_set_callback_cbs_moveEvent_1624_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@brief Virtual method bool QTableWidget::nativeEvent(const QByteArray &eventType, void *message, long int *result)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QTableWidget::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("paintEngine", "@brief Virtual method QPaintEngine *QTableWidget::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@hide", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0, &_set_callback_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("*paintEvent", "@brief Virtual method void QTableWidget::paintEvent(QPaintEvent *e)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_paintEvent_1725_0, &_call_cbs_paintEvent_1725_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQTapAndHoldGesture.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQTapAndHoldGesture.cc index 9f76d95f9..e1908f688 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQTapAndHoldGesture.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQTapAndHoldGesture.cc @@ -185,6 +185,7 @@ static gsi::Methods methods_QTapAndHoldGesture () { methods += new qt_gsi::GenericMethod (":position", "@brief Method QPointF QTapAndHoldGesture::position()\n", true, &_init_f_position_c0, &_call_f_position_c0); methods += new qt_gsi::GenericMethod ("setPosition|position=", "@brief Method void QTapAndHoldGesture::setPosition(const QPointF &pos)\n", false, &_init_f_setPosition_1986, &_call_f_setPosition_1986); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QTapAndHoldGesture::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QTapAndHoldGesture::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("setTimeout|timeout=", "@brief Static method void QTapAndHoldGesture::setTimeout(int msecs)\nThis method is static and can be called without an instance.", &_init_f_setTimeout_767, &_call_f_setTimeout_767); methods += new qt_gsi::GenericStaticMethod (":timeout", "@brief Static method int QTapAndHoldGesture::timeout()\nThis method is static and can be called without an instance.", &_init_f_timeout_0, &_call_f_timeout_0); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QTapAndHoldGesture::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); @@ -277,6 +278,13 @@ public: } } + // [emitter impl] void QTapAndHoldGesture::objectNameChanged(const QString &objectName) + void emitter_QTapAndHoldGesture_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QTapAndHoldGesture::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] void QTapAndHoldGesture::childEvent(QChildEvent *) void cbs_childEvent_1701_0(QChildEvent *arg1) { @@ -522,6 +530,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QTapAndHoldGesture::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QTapAndHoldGesture_Adaptor *)cls)->emitter_QTapAndHoldGesture_objectNameChanged_4567 (arg1); +} + + // exposed int QTapAndHoldGesture::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -612,6 +638,7 @@ static gsi::Methods methods_QTapAndHoldGesture_Adaptor () { methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QTapAndHoldGesture::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QTapAndHoldGesture::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QTapAndHoldGesture::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QTapAndHoldGesture::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QTapAndHoldGesture::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QTapAndHoldGesture::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQTapGesture.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQTapGesture.cc index b2cc456f9..fab9d8a12 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQTapGesture.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQTapGesture.cc @@ -150,6 +150,7 @@ static gsi::Methods methods_QTapGesture () { methods += new qt_gsi::GenericMethod (":position", "@brief Method QPointF QTapGesture::position()\n", true, &_init_f_position_c0, &_call_f_position_c0); methods += new qt_gsi::GenericMethod ("setPosition|position=", "@brief Method void QTapGesture::setPosition(const QPointF &pos)\n", false, &_init_f_setPosition_1986, &_call_f_setPosition_1986); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QTapGesture::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QTapGesture::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QTapGesture::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QTapGesture::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -240,6 +241,13 @@ public: } } + // [emitter impl] void QTapGesture::objectNameChanged(const QString &objectName) + void emitter_QTapGesture_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QTapGesture::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] void QTapGesture::childEvent(QChildEvent *) void cbs_childEvent_1701_0(QChildEvent *arg1) { @@ -485,6 +493,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QTapGesture::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QTapGesture_Adaptor *)cls)->emitter_QTapGesture_objectNameChanged_4567 (arg1); +} + + // exposed int QTapGesture::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -575,6 +601,7 @@ static gsi::Methods methods_QTapGesture_Adaptor () { methods += new qt_gsi::GenericMethod ("eventFilter", "@brief Virtual method bool QTapGesture::eventFilter(QObject *, QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QTapGesture::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QTapGesture::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QTapGesture::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QTapGesture::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QTapGesture::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQTextBrowser.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQTextBrowser.cc index 4fa2f8576..6b6e15940 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQTextBrowser.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQTextBrowser.cc @@ -538,6 +538,7 @@ static gsi::Methods methods_QTextBrowser () { methods += gsi::qt_signal ("highlighted(const QUrl &)", "highlighted", gsi::arg("arg1"), "@brief Signal declaration for QTextBrowser::highlighted(const QUrl &)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("highlighted(const QString &)", "highlighted_qs", gsi::arg("arg1"), "@brief Signal declaration for QTextBrowser::highlighted(const QString &)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("historyChanged()", "historyChanged", "@brief Signal declaration for QTextBrowser::historyChanged()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QTextBrowser::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("redoAvailable(bool)", "redoAvailable", gsi::arg("b"), "@brief Signal declaration for QTextBrowser::redoAvailable(bool b)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("selectionChanged()", "selectionChanged", "@brief Signal declaration for QTextBrowser::selectionChanged()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("sourceChanged(const QUrl &)", "sourceChanged", gsi::arg("arg1"), "@brief Signal declaration for QTextBrowser::sourceChanged(const QUrl &)\nYou can bind a procedure to this signal."); @@ -841,6 +842,13 @@ public: } } + // [emitter impl] void QTextBrowser::objectNameChanged(const QString &objectName) + void emitter_QTextBrowser_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QTextBrowser::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QPaintEngine *QTextBrowser::paintEngine() QPaintEngine * cbs_paintEngine_c0_0() const { @@ -3040,6 +3048,24 @@ static void _set_callback_cbs_nativeEvent_4678_0 (void *cls, const gsi::Callback } +// emitter void QTextBrowser::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QTextBrowser_Adaptor *)cls)->emitter_QTextBrowser_objectNameChanged_4567 (arg1); +} + + // QPaintEngine *QTextBrowser::paintEngine() static void _init_cbs_paintEngine_c0_0 (qt_gsi::GenericMethod *decl) @@ -3812,6 +3838,7 @@ static gsi::Methods methods_QTextBrowser_Adaptor () { methods += new qt_gsi::GenericMethod ("*moveEvent", "@hide", false, &_init_cbs_moveEvent_1624_0, &_call_cbs_moveEvent_1624_0, &_set_callback_cbs_moveEvent_1624_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@brief Virtual method bool QTextBrowser::nativeEvent(const QByteArray &eventType, void *message, long int *result)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QTextBrowser::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("paintEngine", "@brief Virtual method QPaintEngine *QTextBrowser::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@hide", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0, &_set_callback_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("*paintEvent", "@brief Virtual method void QTextBrowser::paintEvent(QPaintEvent *e)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_paintEvent_1725_0, &_call_cbs_paintEvent_1725_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQTextEdit.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQTextEdit.cc index 4223d341b..636c54f64 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQTextEdit.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQTextEdit.cc @@ -1834,6 +1834,7 @@ static gsi::Methods methods_QTextEdit () { methods += gsi::qt_signal ("cursorPositionChanged()", "cursorPositionChanged", "@brief Signal declaration for QTextEdit::cursorPositionChanged()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("customContextMenuRequested(const QPoint &)", "customContextMenuRequested", gsi::arg("pos"), "@brief Signal declaration for QTextEdit::customContextMenuRequested(const QPoint &pos)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QTextEdit::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QTextEdit::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("redoAvailable(bool)", "redoAvailable", gsi::arg("b"), "@brief Signal declaration for QTextEdit::redoAvailable(bool b)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("selectionChanged()", "selectionChanged", "@brief Signal declaration for QTextEdit::selectionChanged()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("textChanged()", "textChanged", "@brief Signal declaration for QTextEdit::textChanged()\nYou can bind a procedure to this signal."); @@ -2067,6 +2068,13 @@ public: } } + // [emitter impl] void QTextEdit::objectNameChanged(const QString &objectName) + void emitter_QTextEdit_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QTextEdit::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QPaintEngine *QTextEdit::paintEngine() QPaintEngine * cbs_paintEngine_c0_0() const { @@ -4082,6 +4090,24 @@ static void _set_callback_cbs_nativeEvent_4678_0 (void *cls, const gsi::Callback } +// emitter void QTextEdit::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QTextEdit_Adaptor *)cls)->emitter_QTextEdit_objectNameChanged_4567 (arg1); +} + + // QPaintEngine *QTextEdit::paintEngine() static void _init_cbs_paintEngine_c0_0 (qt_gsi::GenericMethod *decl) @@ -4781,6 +4807,7 @@ static gsi::Methods methods_QTextEdit_Adaptor () { methods += new qt_gsi::GenericMethod ("*moveEvent", "@hide", false, &_init_cbs_moveEvent_1624_0, &_call_cbs_moveEvent_1624_0, &_set_callback_cbs_moveEvent_1624_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@brief Virtual method bool QTextEdit::nativeEvent(const QByteArray &eventType, void *message, long int *result)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QTextEdit::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("paintEngine", "@brief Virtual method QPaintEngine *QTextEdit::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@hide", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0, &_set_callback_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("*paintEvent", "@brief Virtual method void QTextEdit::paintEvent(QPaintEvent *e)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_paintEvent_1725_0, &_call_cbs_paintEvent_1725_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQTimeEdit.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQTimeEdit.cc index 56ec7109d..80789dcd7 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQTimeEdit.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQTimeEdit.cc @@ -167,6 +167,7 @@ static gsi::Methods methods_QTimeEdit () { methods += gsi::qt_signal ("dateTimeChanged(const QDateTime &)", "dateTimeChanged", gsi::arg("dateTime"), "@brief Signal declaration for QTimeEdit::dateTimeChanged(const QDateTime &dateTime)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QTimeEdit::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("editingFinished()", "editingFinished", "@brief Signal declaration for QTimeEdit::editingFinished()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QTimeEdit::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("timeChanged(const QTime &)", "timeChanged", gsi::arg("time"), "@brief Signal declaration for QTimeEdit::timeChanged(const QTime &time)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("userTimeChanged(const QTime &)", "userTimeChanged", gsi::arg("time"), "@brief Signal declaration for QTimeEdit::userTimeChanged(const QTime &time)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconChanged(const QIcon &)", "windowIconChanged", gsi::arg("icon"), "@brief Signal declaration for QTimeEdit::windowIconChanged(const QIcon &icon)\nYou can bind a procedure to this signal."); @@ -413,6 +414,13 @@ public: } } + // [emitter impl] void QTimeEdit::objectNameChanged(const QString &objectName) + void emitter_QTimeEdit_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QTimeEdit::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QPaintEngine *QTimeEdit::paintEngine() QPaintEngine * cbs_paintEngine_c0_0() const { @@ -2300,6 +2308,24 @@ static void _set_callback_cbs_nativeEvent_4678_0 (void *cls, const gsi::Callback } +// emitter void QTimeEdit::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QTimeEdit_Adaptor *)cls)->emitter_QTimeEdit_objectNameChanged_4567 (arg1); +} + + // QPaintEngine *QTimeEdit::paintEngine() static void _init_cbs_paintEngine_c0_0 (qt_gsi::GenericMethod *decl) @@ -2905,6 +2931,7 @@ static gsi::Methods methods_QTimeEdit_Adaptor () { methods += new qt_gsi::GenericMethod ("*moveEvent", "@hide", false, &_init_cbs_moveEvent_1624_0, &_call_cbs_moveEvent_1624_0, &_set_callback_cbs_moveEvent_1624_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@brief Virtual method bool QTimeEdit::nativeEvent(const QByteArray &eventType, void *message, long int *result)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QTimeEdit::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("paintEngine", "@brief Virtual method QPaintEngine *QTimeEdit::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@hide", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0, &_set_callback_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("*paintEvent", "@brief Virtual method void QTimeEdit::paintEvent(QPaintEvent *event)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_paintEvent_1725_0, &_call_cbs_paintEvent_1725_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQToolBar.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQToolBar.cc index 1a0f9b258..84c633cfd 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQToolBar.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQToolBar.cc @@ -735,6 +735,7 @@ static gsi::Methods methods_QToolBar () { methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QToolBar::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("iconSizeChanged(const QSize &)", "iconSizeChanged", gsi::arg("iconSize"), "@brief Signal declaration for QToolBar::iconSizeChanged(const QSize &iconSize)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("movableChanged(bool)", "movableChanged", gsi::arg("movable"), "@brief Signal declaration for QToolBar::movableChanged(bool movable)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QToolBar::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal::target_type & > ("orientationChanged(Qt::Orientation)", "orientationChanged", gsi::arg("orientation"), "@brief Signal declaration for QToolBar::orientationChanged(Qt::Orientation orientation)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal::target_type & > ("toolButtonStyleChanged(Qt::ToolButtonStyle)", "toolButtonStyleChanged", gsi::arg("toolButtonStyle"), "@brief Signal declaration for QToolBar::toolButtonStyleChanged(Qt::ToolButtonStyle toolButtonStyle)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("topLevelChanged(bool)", "topLevelChanged", gsi::arg("topLevel"), "@brief Signal declaration for QToolBar::topLevelChanged(bool topLevel)\nYou can bind a procedure to this signal."); @@ -949,6 +950,13 @@ public: emit QToolBar::movableChanged(movable); } + // [emitter impl] void QToolBar::objectNameChanged(const QString &objectName) + void emitter_QToolBar_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QToolBar::objectNameChanged(const QString &objectName)'"); + } + // [emitter impl] void QToolBar::orientationChanged(Qt::Orientation orientation) void emitter_QToolBar_orientationChanged_1913(Qt::Orientation orientation) { @@ -2707,6 +2715,24 @@ static void _set_callback_cbs_nativeEvent_4678_0 (void *cls, const gsi::Callback } +// emitter void QToolBar::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QToolBar_Adaptor *)cls)->emitter_QToolBar_objectNameChanged_4567 (arg1); +} + + // emitter void QToolBar::orientationChanged(Qt::Orientation orientation) static void _init_emitter_orientationChanged_1913 (qt_gsi::GenericMethod *decl) @@ -3231,6 +3257,7 @@ static gsi::Methods methods_QToolBar_Adaptor () { methods += new qt_gsi::GenericMethod ("*moveEvent", "@hide", false, &_init_cbs_moveEvent_1624_0, &_call_cbs_moveEvent_1624_0, &_set_callback_cbs_moveEvent_1624_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@brief Virtual method bool QToolBar::nativeEvent(const QByteArray &eventType, void *message, long int *result)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QToolBar::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("emit_orientationChanged", "@brief Emitter for signal void QToolBar::orientationChanged(Qt::Orientation orientation)\nCall this method to emit this signal.", false, &_init_emitter_orientationChanged_1913, &_call_emitter_orientationChanged_1913); methods += new qt_gsi::GenericMethod ("paintEngine", "@brief Virtual method QPaintEngine *QToolBar::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@hide", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0, &_set_callback_cbs_paintEngine_c0_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQToolBox.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQToolBox.cc index 7b3d4ae73..bee1d1123 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQToolBox.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQToolBox.cc @@ -591,6 +591,7 @@ static gsi::Methods methods_QToolBox () { methods += gsi::qt_signal ("currentChanged(int)", "currentChanged", gsi::arg("index"), "@brief Signal declaration for QToolBox::currentChanged(int index)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("customContextMenuRequested(const QPoint &)", "customContextMenuRequested", gsi::arg("pos"), "@brief Signal declaration for QToolBox::customContextMenuRequested(const QPoint &pos)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QToolBox::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QToolBox::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconChanged(const QIcon &)", "windowIconChanged", gsi::arg("icon"), "@brief Signal declaration for QToolBox::windowIconChanged(const QIcon &icon)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconTextChanged(const QString &)", "windowIconTextChanged", gsi::arg("iconText"), "@brief Signal declaration for QToolBox::windowIconTextChanged(const QString &iconText)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowTitleChanged(const QString &)", "windowTitleChanged", gsi::arg("title"), "@brief Signal declaration for QToolBox::windowTitleChanged(const QString &title)\nYou can bind a procedure to this signal."); @@ -782,6 +783,13 @@ public: } } + // [emitter impl] void QToolBox::objectNameChanged(const QString &objectName) + void emitter_QToolBox_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QToolBox::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QPaintEngine *QToolBox::paintEngine() QPaintEngine * cbs_paintEngine_c0_0() const { @@ -2543,6 +2551,24 @@ static void _set_callback_cbs_nativeEvent_4678_0 (void *cls, const gsi::Callback } +// emitter void QToolBox::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QToolBox_Adaptor *)cls)->emitter_QToolBox_objectNameChanged_4567 (arg1); +} + + // QPaintEngine *QToolBox::paintEngine() static void _init_cbs_paintEngine_c0_0 (qt_gsi::GenericMethod *decl) @@ -2996,6 +3022,7 @@ static gsi::Methods methods_QToolBox_Adaptor () { methods += new qt_gsi::GenericMethod ("*moveEvent", "@hide", false, &_init_cbs_moveEvent_1624_0, &_call_cbs_moveEvent_1624_0, &_set_callback_cbs_moveEvent_1624_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@brief Virtual method bool QToolBox::nativeEvent(const QByteArray &eventType, void *message, long int *result)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QToolBox::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("paintEngine", "@brief Virtual method QPaintEngine *QToolBox::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@hide", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0, &_set_callback_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("*paintEvent", "@brief Virtual method void QToolBox::paintEvent(QPaintEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_paintEvent_1725_0, &_call_cbs_paintEvent_1725_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQToolButton.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQToolButton.cc index f2a54c75d..f7cbd80fa 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQToolButton.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQToolButton.cc @@ -433,6 +433,7 @@ static gsi::Methods methods_QToolButton () { methods += gsi::qt_signal ("clicked(bool)", "clicked", gsi::arg("checked"), "@brief Signal declaration for QToolButton::clicked(bool checked)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("customContextMenuRequested(const QPoint &)", "customContextMenuRequested", gsi::arg("pos"), "@brief Signal declaration for QToolButton::customContextMenuRequested(const QPoint &pos)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QToolButton::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QToolButton::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("pressed()", "pressed", "@brief Signal declaration for QToolButton::pressed()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("released()", "released", "@brief Signal declaration for QToolButton::released()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("toggled(bool)", "toggled", gsi::arg("checked"), "@brief Signal declaration for QToolButton::toggled(bool checked)\nYou can bind a procedure to this signal."); @@ -617,6 +618,13 @@ public: } } + // [emitter impl] void QToolButton::objectNameChanged(const QString &objectName) + void emitter_QToolButton_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QToolButton::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QPaintEngine *QToolButton::paintEngine() QPaintEngine * cbs_paintEngine_c0_0() const { @@ -2411,6 +2419,24 @@ static void _set_callback_cbs_nextCheckState_0_0 (void *cls, const gsi::Callback } +// emitter void QToolButton::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QToolButton_Adaptor *)cls)->emitter_QToolButton_objectNameChanged_4567 (arg1); +} + + // QPaintEngine *QToolButton::paintEngine() static void _init_cbs_paintEngine_c0_0 (qt_gsi::GenericMethod *decl) @@ -2929,6 +2955,7 @@ static gsi::Methods methods_QToolButton_Adaptor () { methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nextCheckState", "@brief Virtual method void QToolButton::nextCheckState()\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nextCheckState_0_0, &_call_cbs_nextCheckState_0_0); methods += new qt_gsi::GenericMethod ("*nextCheckState", "@hide", false, &_init_cbs_nextCheckState_0_0, &_call_cbs_nextCheckState_0_0, &_set_callback_cbs_nextCheckState_0_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QToolButton::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("paintEngine", "@brief Virtual method QPaintEngine *QToolButton::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@hide", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0, &_set_callback_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("*paintEvent", "@brief Virtual method void QToolButton::paintEvent(QPaintEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_paintEvent_1725_0, &_call_cbs_paintEvent_1725_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQTreeView.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQTreeView.cc index 132bc9f21..a56b3107d 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQTreeView.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQTreeView.cc @@ -1415,6 +1415,7 @@ static gsi::Methods methods_QTreeView () { methods += gsi::qt_signal ("entered(const QModelIndex &)", "entered", gsi::arg("index"), "@brief Signal declaration for QTreeView::entered(const QModelIndex &index)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("expanded(const QModelIndex &)", "expanded", gsi::arg("index"), "@brief Signal declaration for QTreeView::expanded(const QModelIndex &index)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("iconSizeChanged(const QSize &)", "iconSizeChanged", gsi::arg("size"), "@brief Signal declaration for QTreeView::iconSizeChanged(const QSize &size)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QTreeView::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("pressed(const QModelIndex &)", "pressed", gsi::arg("index"), "@brief Signal declaration for QTreeView::pressed(const QModelIndex &index)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("viewportEntered()", "viewportEntered", "@brief Signal declaration for QTreeView::viewportEntered()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconChanged(const QIcon &)", "windowIconChanged", gsi::arg("icon"), "@brief Signal declaration for QTreeView::windowIconChanged(const QIcon &icon)\nYou can bind a procedure to this signal."); @@ -1813,6 +1814,13 @@ public: } } + // [emitter impl] void QTreeView::objectNameChanged(const QString &objectName) + void emitter_QTreeView_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QTreeView::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QPaintEngine *QTreeView::paintEngine() QPaintEngine * cbs_paintEngine_c0_0() const { @@ -4848,6 +4856,24 @@ static void _set_callback_cbs_nativeEvent_4678_0 (void *cls, const gsi::Callback } +// emitter void QTreeView::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QTreeView_Adaptor *)cls)->emitter_QTreeView_objectNameChanged_4567 (arg1); +} + + // QPaintEngine *QTreeView::paintEngine() static void _init_cbs_paintEngine_c0_0 (qt_gsi::GenericMethod *decl) @@ -6320,6 +6346,7 @@ static gsi::Methods methods_QTreeView_Adaptor () { methods += new qt_gsi::GenericMethod ("*moveEvent", "@hide", false, &_init_cbs_moveEvent_1624_0, &_call_cbs_moveEvent_1624_0, &_set_callback_cbs_moveEvent_1624_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@brief Virtual method bool QTreeView::nativeEvent(const QByteArray &eventType, void *message, long int *result)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QTreeView::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("paintEngine", "@brief Virtual method QPaintEngine *QTreeView::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@hide", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0, &_set_callback_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("*paintEvent", "@brief Virtual method void QTreeView::paintEvent(QPaintEvent *event)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_paintEvent_1725_0, &_call_cbs_paintEvent_1725_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQTreeWidget.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQTreeWidget.cc index 673721627..a7b93d603 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQTreeWidget.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQTreeWidget.cc @@ -1203,6 +1203,7 @@ static gsi::Methods methods_QTreeWidget () { methods += gsi::qt_signal ("itemExpanded(QTreeWidgetItem *)", "itemExpanded", gsi::arg("item"), "@brief Signal declaration for QTreeWidget::itemExpanded(QTreeWidgetItem *item)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("itemPressed(QTreeWidgetItem *, int)", "itemPressed", gsi::arg("item"), gsi::arg("column"), "@brief Signal declaration for QTreeWidget::itemPressed(QTreeWidgetItem *item, int column)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("itemSelectionChanged()", "itemSelectionChanged", "@brief Signal declaration for QTreeWidget::itemSelectionChanged()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QTreeWidget::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("pressed(const QModelIndex &)", "pressed", gsi::arg("index"), "@brief Signal declaration for QTreeWidget::pressed(const QModelIndex &index)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("viewportEntered()", "viewportEntered", "@brief Signal declaration for QTreeWidget::viewportEntered()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconChanged(const QIcon &)", "windowIconChanged", gsi::arg("icon"), "@brief Signal declaration for QTreeWidget::windowIconChanged(const QIcon &icon)\nYou can bind a procedure to this signal."); @@ -1676,6 +1677,13 @@ public: } } + // [emitter impl] void QTreeWidget::objectNameChanged(const QString &objectName) + void emitter_QTreeWidget_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QTreeWidget::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QPaintEngine *QTreeWidget::paintEngine() QPaintEngine * cbs_paintEngine_c0_0() const { @@ -5087,6 +5095,24 @@ static void _set_callback_cbs_nativeEvent_4678_0 (void *cls, const gsi::Callback } +// emitter void QTreeWidget::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QTreeWidget_Adaptor *)cls)->emitter_QTreeWidget_objectNameChanged_4567 (arg1); +} + + // QPaintEngine *QTreeWidget::paintEngine() static void _init_cbs_paintEngine_c0_0 (qt_gsi::GenericMethod *decl) @@ -6573,6 +6599,7 @@ static gsi::Methods methods_QTreeWidget_Adaptor () { methods += new qt_gsi::GenericMethod ("*moveEvent", "@hide", false, &_init_cbs_moveEvent_1624_0, &_call_cbs_moveEvent_1624_0, &_set_callback_cbs_moveEvent_1624_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@brief Virtual method bool QTreeWidget::nativeEvent(const QByteArray &eventType, void *message, long int *result)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QTreeWidget::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("paintEngine", "@brief Virtual method QPaintEngine *QTreeWidget::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@hide", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0, &_set_callback_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("*paintEvent", "@brief Virtual method void QTreeWidget::paintEvent(QPaintEvent *event)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_paintEvent_1725_0, &_call_cbs_paintEvent_1725_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQUndoGroup.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQUndoGroup.cc index ea3ca32e9..04730e86c 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQUndoGroup.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQUndoGroup.cc @@ -374,6 +374,7 @@ static gsi::Methods methods_QUndoGroup () { methods += gsi::qt_signal ("cleanChanged(bool)", "cleanChanged", gsi::arg("clean"), "@brief Signal declaration for QUndoGroup::cleanChanged(bool clean)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QUndoGroup::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("indexChanged(int)", "indexChanged", gsi::arg("idx"), "@brief Signal declaration for QUndoGroup::indexChanged(int idx)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QUndoGroup::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("redoTextChanged(const QString &)", "redoTextChanged", gsi::arg("redoText"), "@brief Signal declaration for QUndoGroup::redoTextChanged(const QString &redoText)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("undoTextChanged(const QString &)", "undoTextChanged", gsi::arg("undoText"), "@brief Signal declaration for QUndoGroup::undoTextChanged(const QString &undoText)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QUndoGroup::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); @@ -496,6 +497,13 @@ public: emit QUndoGroup::indexChanged(idx); } + // [emitter impl] void QUndoGroup::objectNameChanged(const QString &objectName) + void emitter_QUndoGroup_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QUndoGroup::objectNameChanged(const QString &objectName)'"); + } + // [emitter impl] void QUndoGroup::redoTextChanged(const QString &redoText) void emitter_QUndoGroup_redoTextChanged_2025(const QString &redoText) { @@ -843,6 +851,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QUndoGroup::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QUndoGroup_Adaptor *)cls)->emitter_QUndoGroup_objectNameChanged_4567 (arg1); +} + + // exposed int QUndoGroup::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -974,6 +1000,7 @@ static gsi::Methods methods_QUndoGroup_Adaptor () { methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("emit_indexChanged", "@brief Emitter for signal void QUndoGroup::indexChanged(int idx)\nCall this method to emit this signal.", false, &_init_emitter_indexChanged_767, &_call_emitter_indexChanged_767); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QUndoGroup::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QUndoGroup::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QUndoGroup::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("emit_redoTextChanged", "@brief Emitter for signal void QUndoGroup::redoTextChanged(const QString &redoText)\nCall this method to emit this signal.", false, &_init_emitter_redoTextChanged_2025, &_call_emitter_redoTextChanged_2025); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QUndoGroup::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQUndoStack.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQUndoStack.cc index f61572117..08d5a5dae 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQUndoStack.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQUndoStack.cc @@ -554,6 +554,7 @@ static gsi::Methods methods_QUndoStack () { methods += gsi::qt_signal ("cleanChanged(bool)", "cleanChanged", gsi::arg("clean"), "@brief Signal declaration for QUndoStack::cleanChanged(bool clean)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QUndoStack::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("indexChanged(int)", "indexChanged", gsi::arg("idx"), "@brief Signal declaration for QUndoStack::indexChanged(int idx)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QUndoStack::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("redoTextChanged(const QString &)", "redoTextChanged", gsi::arg("redoText"), "@brief Signal declaration for QUndoStack::redoTextChanged(const QString &redoText)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("undoTextChanged(const QString &)", "undoTextChanged", gsi::arg("undoText"), "@brief Signal declaration for QUndoStack::undoTextChanged(const QString &undoText)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QUndoStack::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); @@ -670,6 +671,13 @@ public: emit QUndoStack::indexChanged(idx); } + // [emitter impl] void QUndoStack::objectNameChanged(const QString &objectName) + void emitter_QUndoStack_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QUndoStack::objectNameChanged(const QString &objectName)'"); + } + // [emitter impl] void QUndoStack::redoTextChanged(const QString &redoText) void emitter_QUndoStack_redoTextChanged_2025(const QString &redoText) { @@ -999,6 +1007,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QUndoStack::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QUndoStack_Adaptor *)cls)->emitter_QUndoStack_objectNameChanged_4567 (arg1); +} + + // exposed int QUndoStack::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -1129,6 +1155,7 @@ static gsi::Methods methods_QUndoStack_Adaptor () { methods += new qt_gsi::GenericMethod ("eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("emit_indexChanged", "@brief Emitter for signal void QUndoStack::indexChanged(int idx)\nCall this method to emit this signal.", false, &_init_emitter_indexChanged_767, &_call_emitter_indexChanged_767); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QUndoStack::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QUndoStack::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QUndoStack::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("emit_redoTextChanged", "@brief Emitter for signal void QUndoStack::redoTextChanged(const QString &redoText)\nCall this method to emit this signal.", false, &_init_emitter_redoTextChanged_2025, &_call_emitter_redoTextChanged_2025); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QUndoStack::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQUndoView.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQUndoView.cc index 6c55e2c38..6be58be1c 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQUndoView.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQUndoView.cc @@ -322,6 +322,7 @@ static gsi::Methods methods_QUndoView () { methods += gsi::qt_signal ("entered(const QModelIndex &)", "entered", gsi::arg("index"), "@brief Signal declaration for QUndoView::entered(const QModelIndex &index)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("iconSizeChanged(const QSize &)", "iconSizeChanged", gsi::arg("size"), "@brief Signal declaration for QUndoView::iconSizeChanged(const QSize &size)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal & > ("indexesMoved(const QModelIndexList &)", "indexesMoved", gsi::arg("indexes"), "@brief Signal declaration for QUndoView::indexesMoved(const QList &indexes)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QUndoView::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("pressed(const QModelIndex &)", "pressed", gsi::arg("index"), "@brief Signal declaration for QUndoView::pressed(const QModelIndex &index)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("viewportEntered()", "viewportEntered", "@brief Signal declaration for QUndoView::viewportEntered()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconChanged(const QIcon &)", "windowIconChanged", gsi::arg("icon"), "@brief Signal declaration for QUndoView::windowIconChanged(const QIcon &icon)\nYou can bind a procedure to this signal."); @@ -703,6 +704,13 @@ public: } } + // [emitter impl] void QUndoView::objectNameChanged(const QString &objectName) + void emitter_QUndoView_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QUndoView::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QPaintEngine *QUndoView::paintEngine() QPaintEngine * cbs_paintEngine_c0_0() const { @@ -3597,6 +3605,24 @@ static void _set_callback_cbs_nativeEvent_4678_0 (void *cls, const gsi::Callback } +// emitter void QUndoView::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QUndoView_Adaptor *)cls)->emitter_QUndoView_objectNameChanged_4567 (arg1); +} + + // QPaintEngine *QUndoView::paintEngine() static void _init_cbs_paintEngine_c0_0 (qt_gsi::GenericMethod *decl) @@ -5066,6 +5092,7 @@ static gsi::Methods methods_QUndoView_Adaptor () { methods += new qt_gsi::GenericMethod ("*moveEvent", "@hide", false, &_init_cbs_moveEvent_1624_0, &_call_cbs_moveEvent_1624_0, &_set_callback_cbs_moveEvent_1624_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@brief Virtual method bool QUndoView::nativeEvent(const QByteArray &eventType, void *message, long int *result)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QUndoView::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("paintEngine", "@brief Virtual method QPaintEngine *QUndoView::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@hide", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0, &_set_callback_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("*paintEvent", "@brief Virtual method void QUndoView::paintEvent(QPaintEvent *e)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_paintEvent_1725_0, &_call_cbs_paintEvent_1725_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQVBoxLayout.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQVBoxLayout.cc index 555bf608f..af4494103 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQVBoxLayout.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQVBoxLayout.cc @@ -119,6 +119,7 @@ static gsi::Methods methods_QVBoxLayout () { gsi::Methods methods; methods += new qt_gsi::GenericStaticMethod ("staticMetaObject", "@brief Obtains the static MetaObject for this class.", &_init_smo, &_call_smo); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QVBoxLayout::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QVBoxLayout::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QVBoxLayout::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QVBoxLayout::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -459,6 +460,13 @@ public: } } + // [emitter impl] void QVBoxLayout::objectNameChanged(const QString &objectName) + void emitter_QVBoxLayout_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QVBoxLayout::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] void QVBoxLayout::setGeometry(const QRect &) void cbs_setGeometry_1792_0(const QRect &arg1) { @@ -1195,6 +1203,24 @@ static void _set_callback_cbs_minimumSize_c0_0 (void *cls, const gsi::Callback & } +// emitter void QVBoxLayout::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QVBoxLayout_Adaptor *)cls)->emitter_QVBoxLayout_objectNameChanged_4567 (arg1); +} + + // exposed int QVBoxLayout::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -1443,6 +1469,7 @@ static gsi::Methods methods_QVBoxLayout_Adaptor () { methods += new qt_gsi::GenericMethod ("minimumHeightForWidth", "@hide", true, &_init_cbs_minimumHeightForWidth_c767_0, &_call_cbs_minimumHeightForWidth_c767_0, &_set_callback_cbs_minimumHeightForWidth_c767_0); methods += new qt_gsi::GenericMethod ("minimumSize", "@brief Virtual method QSize QVBoxLayout::minimumSize()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_minimumSize_c0_0, &_call_cbs_minimumSize_c0_0); methods += new qt_gsi::GenericMethod ("minimumSize", "@hide", true, &_init_cbs_minimumSize_c0_0, &_call_cbs_minimumSize_c0_0, &_set_callback_cbs_minimumSize_c0_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QVBoxLayout::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QVBoxLayout::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QVBoxLayout::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QVBoxLayout::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQWidget.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQWidget.cc index f4f03c8d3..85b1e5227 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQWidget.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQWidget.cc @@ -4804,6 +4804,7 @@ static gsi::Methods methods_QWidget () { methods += new qt_gsi::GenericMethod (":y", "@brief Method int QWidget::y()\n", true, &_init_f_y_c0, &_call_f_y_c0); methods += gsi::qt_signal ("customContextMenuRequested(const QPoint &)", "customContextMenuRequested", gsi::arg("pos"), "@brief Signal declaration for QWidget::customContextMenuRequested(const QPoint &pos)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QWidget::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QWidget::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconChanged(const QIcon &)", "windowIconChanged", gsi::arg("icon"), "@brief Signal declaration for QWidget::windowIconChanged(const QIcon &icon)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconTextChanged(const QString &)", "windowIconTextChanged", gsi::arg("iconText"), "@brief Signal declaration for QWidget::windowIconTextChanged(const QString &iconText)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowTitleChanged(const QString &)", "windowTitleChanged", gsi::arg("title"), "@brief Signal declaration for QWidget::windowTitleChanged(const QString &title)\nYou can bind a procedure to this signal."); @@ -4988,6 +4989,13 @@ public: } } + // [emitter impl] void QWidget::objectNameChanged(const QString &objectName) + void emitter_QWidget_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QWidget::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QPaintEngine *QWidget::paintEngine() QPaintEngine * cbs_paintEngine_c0_0() const { @@ -6613,6 +6621,24 @@ static void _set_callback_cbs_nativeEvent_4678_0 (void *cls, const gsi::Callback } +// emitter void QWidget::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QWidget_Adaptor *)cls)->emitter_QWidget_objectNameChanged_4567 (arg1); +} + + // QPaintEngine *QWidget::paintEngine() static void _init_cbs_paintEngine_c0_0 (qt_gsi::GenericMethod *decl) @@ -7059,6 +7085,7 @@ static gsi::Methods methods_QWidget_Adaptor () { methods += new qt_gsi::GenericMethod ("*moveEvent", "@hide", false, &_init_cbs_moveEvent_1624_0, &_call_cbs_moveEvent_1624_0, &_set_callback_cbs_moveEvent_1624_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@brief Virtual method bool QWidget::nativeEvent(const QByteArray &eventType, void *message, long int *result)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QWidget::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("paintEngine", "@brief Virtual method QPaintEngine *QWidget::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@hide", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0, &_set_callback_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("*paintEvent", "@brief Virtual method void QWidget::paintEvent(QPaintEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_paintEvent_1725_0, &_call_cbs_paintEvent_1725_0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQWidgetAction.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQWidgetAction.cc index d0c64bd3f..fb96c1b26 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQWidgetAction.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQWidgetAction.cc @@ -198,6 +198,7 @@ static gsi::Methods methods_QWidgetAction () { methods += gsi::qt_signal ("changed()", "changed", "@brief Signal declaration for QWidgetAction::changed()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QWidgetAction::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("hovered()", "hovered", "@brief Signal declaration for QWidgetAction::hovered()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QWidgetAction::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("toggled(bool)", "toggled", gsi::arg("arg1"), "@brief Signal declaration for QWidgetAction::toggled(bool)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("triggered(bool)", "triggered", gsi::arg("checked"), "@brief Signal declaration for QWidgetAction::triggered(bool checked)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QWidgetAction::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); @@ -271,6 +272,13 @@ public: emit QWidgetAction::hovered(); } + // [emitter impl] void QWidgetAction::objectNameChanged(const QString &objectName) + void emitter_QWidgetAction_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QWidgetAction::objectNameChanged(const QString &objectName)'"); + } + // [emitter impl] void QWidgetAction::toggled(bool) void emitter_QWidgetAction_toggled_864(bool arg1) { @@ -679,6 +687,24 @@ static void _call_fp_isSignalConnected_c2394 (const qt_gsi::GenericMethod * /*de } +// emitter void QWidgetAction::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QWidgetAction_Adaptor *)cls)->emitter_QWidgetAction_objectNameChanged_4567 (arg1); +} + + // exposed int QWidgetAction::receivers(const char *signal) static void _init_fp_receivers_c1731 (qt_gsi::GenericMethod *decl) @@ -812,6 +838,7 @@ static gsi::Methods methods_QWidgetAction_Adaptor () { methods += new qt_gsi::GenericMethod ("*eventFilter", "@hide", false, &_init_cbs_eventFilter_2411_0, &_call_cbs_eventFilter_2411_0, &_set_callback_cbs_eventFilter_2411_0); methods += new qt_gsi::GenericMethod ("emit_hovered", "@brief Emitter for signal void QWidgetAction::hovered()\nCall this method to emit this signal.", false, &_init_emitter_hovered_0, &_call_emitter_hovered_0); methods += new qt_gsi::GenericMethod ("*isSignalConnected", "@brief Method bool QWidgetAction::isSignalConnected(const QMetaMethod &signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_isSignalConnected_c2394, &_call_fp_isSignalConnected_c2394); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QWidgetAction::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("*receivers", "@brief Method int QWidgetAction::receivers(const char *signal)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_receivers_c1731, &_call_fp_receivers_c1731); methods += new qt_gsi::GenericMethod ("*sender", "@brief Method QObject *QWidgetAction::sender()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_sender_c0, &_call_fp_sender_c0); methods += new qt_gsi::GenericMethod ("*senderSignalIndex", "@brief Method int QWidgetAction::senderSignalIndex()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_senderSignalIndex_c0, &_call_fp_senderSignalIndex_c0); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQWizard.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQWizard.cc index 0a89dafde..59a06e610 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQWizard.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQWizard.cc @@ -944,6 +944,7 @@ static gsi::Methods methods_QWizard () { methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QWizard::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("finished(int)", "finished", gsi::arg("result"), "@brief Signal declaration for QWizard::finished(int result)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("helpRequested()", "helpRequested", "@brief Signal declaration for QWizard::helpRequested()\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QWizard::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("pageAdded(int)", "pageAdded", gsi::arg("id"), "@brief Signal declaration for QWizard::pageAdded(int id)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("pageRemoved(int)", "pageRemoved", gsi::arg("id"), "@brief Signal declaration for QWizard::pageRemoved(int id)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("rejected()", "rejected", "@brief Signal declaration for QWizard::rejected()\nYou can bind a procedure to this signal."); @@ -1187,6 +1188,13 @@ public: } } + // [emitter impl] void QWizard::objectNameChanged(const QString &objectName) + void emitter_QWizard_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QWizard::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] void QWizard::open() void cbs_open_0_0() { @@ -3175,6 +3183,24 @@ static void _set_callback_cbs_nextId_c0_0 (void *cls, const gsi::Callback &cb) } +// emitter void QWizard::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QWizard_Adaptor *)cls)->emitter_QWizard_objectNameChanged_4567 (arg1); +} + + // void QWizard::open() static void _init_cbs_open_0_0 (qt_gsi::GenericMethod *decl) @@ -3748,6 +3774,7 @@ static gsi::Methods methods_QWizard_Adaptor () { methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("nextId", "@brief Virtual method int QWizard::nextId()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_nextId_c0_0, &_call_cbs_nextId_c0_0); methods += new qt_gsi::GenericMethod ("nextId", "@hide", true, &_init_cbs_nextId_c0_0, &_call_cbs_nextId_c0_0, &_set_callback_cbs_nextId_c0_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QWizard::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("open", "@brief Virtual method void QWizard::open()\nThis method can be reimplemented in a derived class.", false, &_init_cbs_open_0_0, &_call_cbs_open_0_0); methods += new qt_gsi::GenericMethod ("open", "@hide", false, &_init_cbs_open_0_0, &_call_cbs_open_0_0, &_set_callback_cbs_open_0_0); methods += new qt_gsi::GenericMethod ("emit_pageAdded", "@brief Emitter for signal void QWizard::pageAdded(int id)\nCall this method to emit this signal.", false, &_init_emitter_pageAdded_767, &_call_emitter_pageAdded_767); diff --git a/src/gsiqt/qt5/QtWidgets/gsiDeclQWizardPage.cc b/src/gsiqt/qt5/QtWidgets/gsiDeclQWizardPage.cc index 8730edfe0..37aaaaf66 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiDeclQWizardPage.cc +++ b/src/gsiqt/qt5/QtWidgets/gsiDeclQWizardPage.cc @@ -478,6 +478,7 @@ static gsi::Methods methods_QWizardPage () { methods += gsi::qt_signal ("completeChanged()", "completeChanged", "@brief Signal declaration for QWizardPage::completeChanged()\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("customContextMenuRequested(const QPoint &)", "customContextMenuRequested", gsi::arg("pos"), "@brief Signal declaration for QWizardPage::customContextMenuRequested(const QPoint &pos)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QWizardPage::destroyed(QObject *)\nYou can bind a procedure to this signal."); + methods += gsi::qt_signal ("objectNameChanged(const QString &)", "objectNameChanged", gsi::arg("objectName"), "@brief Signal declaration for QWizardPage::objectNameChanged(const QString &objectName)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconChanged(const QIcon &)", "windowIconChanged", gsi::arg("icon"), "@brief Signal declaration for QWizardPage::windowIconChanged(const QIcon &icon)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowIconTextChanged(const QString &)", "windowIconTextChanged", gsi::arg("iconText"), "@brief Signal declaration for QWizardPage::windowIconTextChanged(const QString &iconText)\nYou can bind a procedure to this signal."); methods += gsi::qt_signal ("windowTitleChanged(const QString &)", "windowTitleChanged", gsi::arg("title"), "@brief Signal declaration for QWizardPage::windowTitleChanged(const QString &title)\nYou can bind a procedure to this signal."); @@ -733,6 +734,13 @@ public: } } + // [emitter impl] void QWizardPage::objectNameChanged(const QString &objectName) + void emitter_QWizardPage_objectNameChanged_4567(const QString &objectName) + { + __SUPPRESS_UNUSED_WARNING (objectName); + throw tl::Exception ("Can't emit private signal 'void QWizardPage::objectNameChanged(const QString &objectName)'"); + } + // [adaptor impl] QPaintEngine *QWizardPage::paintEngine() QPaintEngine * cbs_paintEngine_c0_0() const { @@ -2485,6 +2493,24 @@ static void _set_callback_cbs_nextId_c0_0 (void *cls, const gsi::Callback &cb) } +// emitter void QWizardPage::objectNameChanged(const QString &objectName) + +static void _init_emitter_objectNameChanged_4567 (qt_gsi::GenericMethod *decl) +{ + static gsi::ArgSpecBase argspec_0 ("objectName"); + decl->add_arg (argspec_0); + decl->set_return (); +} + +static void _call_emitter_objectNameChanged_4567 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) +{ + __SUPPRESS_UNUSED_WARNING(args); + tl::Heap heap; + const QString &arg1 = gsi::arg_reader() (args, heap); + ((QWizardPage_Adaptor *)cls)->emitter_QWizardPage_objectNameChanged_4567 (arg1); +} + + // QPaintEngine *QWizardPage::paintEngine() static void _init_cbs_paintEngine_c0_0 (qt_gsi::GenericMethod *decl) @@ -3024,6 +3050,7 @@ static gsi::Methods methods_QWizardPage_Adaptor () { methods += new qt_gsi::GenericMethod ("*nativeEvent", "@hide", false, &_init_cbs_nativeEvent_4678_0, &_call_cbs_nativeEvent_4678_0, &_set_callback_cbs_nativeEvent_4678_0); methods += new qt_gsi::GenericMethod ("nextId", "@brief Virtual method int QWizardPage::nextId()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_nextId_c0_0, &_call_cbs_nextId_c0_0); methods += new qt_gsi::GenericMethod ("nextId", "@hide", true, &_init_cbs_nextId_c0_0, &_call_cbs_nextId_c0_0, &_set_callback_cbs_nextId_c0_0); + methods += new qt_gsi::GenericMethod ("emit_objectNameChanged", "@brief Emitter for signal void QWizardPage::objectNameChanged(const QString &objectName)\nCall this method to emit this signal.", false, &_init_emitter_objectNameChanged_4567, &_call_emitter_objectNameChanged_4567); methods += new qt_gsi::GenericMethod ("paintEngine", "@brief Virtual method QPaintEngine *QWizardPage::paintEngine()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@hide", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0, &_set_callback_cbs_paintEngine_c0_0); methods += new qt_gsi::GenericMethod ("*paintEvent", "@brief Virtual method void QWizardPage::paintEvent(QPaintEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_paintEvent_1725_0, &_call_cbs_paintEvent_1725_0); diff --git a/src/gsiqt/qt5/QtXmlPatterns/gsiDeclQAbstractMessageHandler.cc b/src/gsiqt/qt5/QtXmlPatterns/gsiDeclQAbstractMessageHandler.cc index 6dab601a4..e859ae9fe 100644 --- a/src/gsiqt/qt5/QtXmlPatterns/gsiDeclQAbstractMessageHandler.cc +++ b/src/gsiqt/qt5/QtXmlPatterns/gsiDeclQAbstractMessageHandler.cc @@ -143,7 +143,6 @@ static gsi::Methods methods_QAbstractMessageHandler () { gsi::Methods methods; methods += new qt_gsi::GenericStaticMethod ("staticMetaObject", "@brief Obtains the static MetaObject for this class.", &_init_smo, &_call_smo); methods += new qt_gsi::GenericMethod ("message", "@brief Method void QAbstractMessageHandler::message(QtMsgType type, const QString &description, const QUrl &identifier, const QSourceLocation &sourceLocation)\n", false, &_init_f_message_7592, &_call_f_message_7592); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QAbstractMessageHandler::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QAbstractMessageHandler::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QAbstractMessageHandler::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -198,12 +197,6 @@ public: return QAbstractMessageHandler::senderSignalIndex(); } - // [emitter impl] void QAbstractMessageHandler::destroyed(QObject *) - void emitter_QAbstractMessageHandler_destroyed_1302(QObject *arg1) - { - emit QAbstractMessageHandler::destroyed(arg1); - } - // [adaptor impl] bool QAbstractMessageHandler::event(QEvent *) bool cbs_event_1217_0(QEvent *arg1) { @@ -390,24 +383,6 @@ static void _set_callback_cbs_customEvent_1217_0 (void *cls, const gsi::Callback } -// emitter void QAbstractMessageHandler::destroyed(QObject *) - -static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - ((QAbstractMessageHandler_Adaptor *)cls)->emitter_QAbstractMessageHandler_destroyed_1302 (arg1); -} - - // void QAbstractMessageHandler::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -614,7 +589,6 @@ static gsi::Methods methods_QAbstractMessageHandler_Adaptor () { methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QAbstractMessageHandler::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); - methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QAbstractMessageHandler::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QAbstractMessageHandler::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("event", "@brief Virtual method bool QAbstractMessageHandler::event(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0); diff --git a/src/gsiqt/qt5/QtXmlPatterns/gsiDeclQAbstractUriResolver.cc b/src/gsiqt/qt5/QtXmlPatterns/gsiDeclQAbstractUriResolver.cc index adb4b722a..78fc483cf 100644 --- a/src/gsiqt/qt5/QtXmlPatterns/gsiDeclQAbstractUriResolver.cc +++ b/src/gsiqt/qt5/QtXmlPatterns/gsiDeclQAbstractUriResolver.cc @@ -135,7 +135,6 @@ static gsi::Methods methods_QAbstractUriResolver () { gsi::Methods methods; methods += new qt_gsi::GenericStaticMethod ("staticMetaObject", "@brief Obtains the static MetaObject for this class.", &_init_smo, &_call_smo); methods += new qt_gsi::GenericMethod ("resolve", "@brief Method QUrl QAbstractUriResolver::resolve(const QUrl &relative, const QUrl &baseURI)\n", true, &_init_f_resolve_c3294, &_call_f_resolve_c3294); - methods += gsi::qt_signal ("destroyed(QObject *)", "destroyed", gsi::arg("arg1"), "@brief Signal declaration for QAbstractUriResolver::destroyed(QObject *)\nYou can bind a procedure to this signal."); methods += new qt_gsi::GenericStaticMethod ("tr", "@brief Static method QString QAbstractUriResolver::tr(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_tr_4013, &_call_f_tr_4013); methods += new qt_gsi::GenericStaticMethod ("trUtf8", "@brief Static method QString QAbstractUriResolver::trUtf8(const char *s, const char *c, int n)\nThis method is static and can be called without an instance.", &_init_f_trUtf8_4013, &_call_f_trUtf8_4013); return methods; @@ -190,12 +189,6 @@ public: return QAbstractUriResolver::senderSignalIndex(); } - // [emitter impl] void QAbstractUriResolver::destroyed(QObject *) - void emitter_QAbstractUriResolver_destroyed_1302(QObject *arg1) - { - emit QAbstractUriResolver::destroyed(arg1); - } - // [adaptor impl] bool QAbstractUriResolver::event(QEvent *) bool cbs_event_1217_0(QEvent *arg1) { @@ -380,24 +373,6 @@ static void _set_callback_cbs_customEvent_1217_0 (void *cls, const gsi::Callback } -// emitter void QAbstractUriResolver::destroyed(QObject *) - -static void _init_emitter_destroyed_1302 (qt_gsi::GenericMethod *decl) -{ - static gsi::ArgSpecBase argspec_0 ("arg1", true, "0"); - decl->add_arg (argspec_0); - decl->set_return (); -} - -static void _call_emitter_destroyed_1302 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs & /*ret*/) -{ - __SUPPRESS_UNUSED_WARNING(args); - tl::Heap heap; - QObject *arg1 = args ? gsi::arg_reader() (args, heap) : gsi::arg_maker() (0, heap); - ((QAbstractUriResolver_Adaptor *)cls)->emitter_QAbstractUriResolver_destroyed_1302 (arg1); -} - - // void QAbstractUriResolver::disconnectNotify(const QMetaMethod &signal) static void _init_cbs_disconnectNotify_2394_0 (qt_gsi::GenericMethod *decl) @@ -597,7 +572,6 @@ static gsi::Methods methods_QAbstractUriResolver_Adaptor () { methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0, &_set_callback_cbs_childEvent_1701_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@brief Virtual method void QAbstractUriResolver::customEvent(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0); methods += new qt_gsi::GenericMethod ("*customEvent", "@hide", false, &_init_cbs_customEvent_1217_0, &_call_cbs_customEvent_1217_0, &_set_callback_cbs_customEvent_1217_0); - methods += new qt_gsi::GenericMethod ("emit_destroyed", "@brief Emitter for signal void QAbstractUriResolver::destroyed(QObject *)\nCall this method to emit this signal.", false, &_init_emitter_destroyed_1302, &_call_emitter_destroyed_1302); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@brief Virtual method void QAbstractUriResolver::disconnectNotify(const QMetaMethod &signal)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("*disconnectNotify", "@hide", false, &_init_cbs_disconnectNotify_2394_0, &_call_cbs_disconnectNotify_2394_0, &_set_callback_cbs_disconnectNotify_2394_0); methods += new qt_gsi::GenericMethod ("event", "@brief Virtual method bool QAbstractUriResolver::event(QEvent *)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_event_1217_0, &_call_cbs_event_1217_0); diff --git a/testdata/ruby/qtbinding.rb b/testdata/ruby/qtbinding.rb index b526f3a53..f8b7471d4 100644 --- a/testdata/ruby/qtbinding.rb +++ b/testdata/ruby/qtbinding.rb @@ -534,7 +534,7 @@ class QtBinding_TestClass < TestBase GC.start - assert_equal(ef.log.select { |s| s !~ /RBA::QKeyEvent(_Native)?: ShortcutOverride/ }.join("\n"), "RBA::QKeyEvent: KeyPress (6)\nRBA::QKeyEvent: KeyPress (6)\nRBA::QKeyEvent: KeyPress (6)") + assert_equal(ef.log.select { |s| s !~ /RBA::QKeyEvent(_Native)?: ShortcutOverride/ && s !~ /RBA::QEvent(_Native)/ }.join("\n"), "RBA::QKeyEvent: KeyPress (6)\nRBA::QKeyEvent: KeyPress (6)\nRBA::QKeyEvent: KeyPress (6)") ef = nil ef = EventFilter::new @@ -673,6 +673,32 @@ class QtBinding_TestClass < TestBase end + def test_50 + + # QObject signals + + w = RBA::QObject::new + + on = nil + w.objectNameChanged do |name| + on = name + end + + od = false + w.destroyed do |name| + od = true + end + + w.objectName = "uvw" + + assert_equal(on, "uvw") + + w._destroy + + assert_equal(od, true) + + end + end load("test_epilogue.rb") From ff79b36740245f06e831108dac56a7c9e5df921b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20K=C3=B6fferlein?= Date: Mon, 14 Sep 2020 18:35:07 +0200 Subject: [PATCH 119/121] Fixed #637 (Points are not selected properly for mirrored subcells) (#638) --- src/edt/edt/edtPartialService.cc | 6 ++--- src/laybasic/laybasic/layFinder.cc | 36 +++++++++++++++++------------- src/laybasic/laybasic/layFinder.h | 4 +++- 3 files changed, 27 insertions(+), 19 deletions(-) diff --git a/src/edt/edt/edtPartialService.cc b/src/edt/edt/edtPartialService.cc index f66da5b94..63952ed28 100644 --- a/src/edt/edt/edtPartialService.cc +++ b/src/edt/edt/edtPartialService.cc @@ -886,7 +886,7 @@ PartialShapeFinder::visit_cell (const db::Cell &cell, const db::Box &search_box, ++ee; unsigned int nn = ee.at_end () ? 0 : n + 1; - unsigned int r = test_edge (t * *e, d, match); + unsigned int r = test_edge (t, *e, d, match); if (r) { edge_sel.clear (); if ((r & 1) == 1) { @@ -913,7 +913,7 @@ PartialShapeFinder::visit_cell (const db::Cell &cell, const db::Box &search_box, ++pt; unsigned int n = 0; for (; pt != shape->end_point (); ++pt, ++n) { - unsigned int r = test_edge (t * db::Edge (p, *pt), d, match); + unsigned int r = test_edge (t, db::Edge (p, *pt), d, match); if (r) { edge_sel.clear (); if ((r & 1) == 1) { @@ -945,7 +945,7 @@ PartialShapeFinder::visit_cell (const db::Cell &cell, const db::Box &search_box, ++ee; unsigned int nn = ee.at_end () ? 0 : n + 1; - unsigned int r = test_edge (t * *e, d, match); + unsigned int r = test_edge (t, *e, d, match); if (r) { edge_sel.clear (); if ((r & 1) == 1) { diff --git a/src/laybasic/laybasic/layFinder.cc b/src/laybasic/laybasic/layFinder.cc index 835b5c1ac..378b0a8f7 100644 --- a/src/laybasic/laybasic/layFinder.cc +++ b/src/laybasic/laybasic/layFinder.cc @@ -112,15 +112,18 @@ Finder::start (lay::LayoutView *view, const lay::CellView &cv, unsigned int cv_i } unsigned int -Finder::test_edge (const db::Edge &edg, double &distance, bool &match) +Finder::test_edge (const db::ICplxTrans &trans, const db::Edge &edg, double &distance, bool &match) { + db::Point p1 = trans * edg.p1 (); + db::Point p2 = trans * edg.p2 (); + unsigned int ret = 0; // we hit the region with the edge end points - take the closest vertex - if (m_region.contains (edg.p1 ()) || m_region.contains (edg.p2 ())) { + if (m_region.contains (p1) || m_region.contains (p2)) { - double d1 = edg.p1 ().double_distance (m_region.center ()); - double d2 = edg.p2 ().double_distance (m_region.center ()); + double d1 = p1.double_distance (m_region.center ()); + double d2 = p2.double_distance (m_region.center ()); // snap to the point - nothing can get closer distance = 0.0; @@ -136,13 +139,16 @@ Finder::test_edge (const db::Edge &edg, double &distance, bool &match) // if the edge cuts through the active region: test the // edge as a whole - if (ret == 0 && edg.clipped (m_region).first) { - double d = edg.distance_abs (m_region.center ()); - if (! match || d < distance) { - distance = d; - ret = 3; + if (ret == 0) { + db::Edge edg_trans (p1, p2); + if (edg_trans.clipped (m_region).first) { + double d = edg_trans.distance_abs (m_region.center ()); + if (! match || d < distance) { + distance = d; + ret = 3; + } + match = true; } - match = true; } return ret; @@ -488,7 +494,7 @@ ShapeFinder::visit_cell (const db::Cell &cell, const db::Box &search_box, const if (shape->is_polygon ()) { for (db::Shape::polygon_edge_iterator e = shape->begin_edge (); ! e.at_end (); ++e) { - test_edge (t * *e, d, match); + test_edge (t, *e, d, match); } // test if inside the polygon @@ -505,7 +511,7 @@ ShapeFinder::visit_cell (const db::Cell &cell, const db::Box &search_box, const db::Point p (*pt); ++pt; for (; pt != shape->end_point (); ++pt) { - test_edge (t * db::Edge (p, *pt), d, match); + test_edge (t, db::Edge (p, *pt), d, match); p = *pt; } } @@ -514,7 +520,7 @@ ShapeFinder::visit_cell (const db::Cell &cell, const db::Box &search_box, const db::Polygon poly; shape->polygon (poly); for (db::Polygon::polygon_edge_iterator e = poly.begin_edge (); ! e.at_end (); ++e) { - test_edge (t * *e, d, match); + test_edge (t, *e, d, match); } // test if inside the polygon @@ -536,7 +542,7 @@ ShapeFinder::visit_cell (const db::Cell &cell, const db::Box &search_box, const // convert to polygon and test those edges db::Polygon poly (box); for (db::Polygon::polygon_edge_iterator e = poly.begin_edge (); ! e.at_end (); ++e) { - test_edge (t * *e, d, match); + test_edge (t, *e, d, match); } if (! match && box.contains (search_box.center ())) { @@ -832,7 +838,7 @@ InstFinder::visit_cell (const db::Cell &cell, const db::Box &search_box, const d db::Polygon poly (cell_inst.complex_trans (*p) * db::Polygon (ibox)); for (db::Polygon::polygon_edge_iterator e = poly.begin_edge (); ! e.at_end (); ++e) { - test_edge (t * *e, d, match); + test_edge (t, *e, d, match); } if (! match && db::inside_poly (poly.begin_edge (), search_box.center ())) { diff --git a/src/laybasic/laybasic/layFinder.h b/src/laybasic/laybasic/layFinder.h index c183f5346..c32a78d9e 100644 --- a/src/laybasic/laybasic/layFinder.h +++ b/src/laybasic/laybasic/layFinder.h @@ -139,11 +139,13 @@ protected: * is less than the one stored in "distance" or "match" is false. If the * distance is updated, match is set to true. * + * "trans" is the transformation to be applied to the edge before the test. + * * This method returns a mask indicating which point of the edge was matching. * Bit 0 of this mask indicates the first point is matching, bit 1 indictates the * second point is matching. */ - unsigned int test_edge (const db::Edge &edge, double &distance, bool &match); + unsigned int test_edge (const db::ICplxTrans &trans, const db::Edge &edge, double &distance, bool &match); private: void do_find (const db::Cell &cell, int level, const db::ICplxTrans &t); From 161d13ad3ade0cb004ccb1ae35acf79167d18003 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Mon, 14 Sep 2020 21:27:22 +0200 Subject: [PATCH 120/121] Qt4 compatibility of one test. --- testdata/ruby/qtbinding.rb | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/testdata/ruby/qtbinding.rb b/testdata/ruby/qtbinding.rb index f8b7471d4..54b596542 100644 --- a/testdata/ruby/qtbinding.rb +++ b/testdata/ruby/qtbinding.rb @@ -679,9 +679,16 @@ class QtBinding_TestClass < TestBase w = RBA::QObject::new - on = nil - w.objectNameChanged do |name| - on = name + if w.respond_to?(:objectNameChanged) # Qt5 + + on = nil + w.objectNameChanged do |name| + on = name + end + + w.objectName = "uvw" + assert_equal(on, "uvw") + end od = false @@ -689,12 +696,7 @@ class QtBinding_TestClass < TestBase od = true end - w.objectName = "uvw" - - assert_equal(on, "uvw") - w._destroy - assert_equal(od, true) end From db2157bb942ea024f310652b97f71a7768ffa873 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Wed, 16 Sep 2020 01:25:54 +0200 Subject: [PATCH 121/121] Fixed builds without ruby/python --- src/lym/unit_tests/unit_tests.pro | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/lym/unit_tests/unit_tests.pro b/src/lym/unit_tests/unit_tests.pro index 8aec7683c..f6947c4d2 100644 --- a/src/lym/unit_tests/unit_tests.pro +++ b/src/lym/unit_tests/unit_tests.pro @@ -12,5 +12,17 @@ SOURCES = \ INCLUDEPATH += $$RBA_INC $$PYA_INC $$LYM_INC $$TL_INC $$GSI_INC DEPENDPATH += $$RBA_INC $$PYA_INC $$LYM_INC $$TL_INC $$GSI_INC -LIBS += -L$$DESTDIR_UT -lklayout_rba -lklayout_pya -lklayout_lym -lklayout_tl -lklayout_gsi +LIBS += -L$$DESTDIR_UT -lklayout_lym -lklayout_tl -lklayout_gsi + +equals(HAVE_RUBY, "1") { + LIBS += -lklayout_rba +} else { + LIBS += -lklayout_rbastub +} + +equals(HAVE_PYTHON, "1") { + LIBS += -lklayout_pya +} else { + LIBS += -lklayout_pyastub +}