Fixing the Qt binding definitions to include addItem and for better alignment of Qt API

scripts/mkqtdecl4/mkqtdecl.conf

@@ -641,18 +641,23 @@ rename "QKeySequence", /QKeySequence::QKeySequence\(QKeySequence::StandardKey/,
 # TODO: basically, the layout object only takes ownership over the objects when 
 # it has a QWidget parent itself. This is not reflected in the following simple scheme
 keep_arg "QBoxLayout", /::addLayout/, 0    # will take ownership of layout
+keep_arg "QBoxLayout", /::addItem/, 0    # will take ownership of item
 keep_arg "QBoxLayout", /::addSpacerItem/, 0    # will take ownership of item
 keep_arg "QBoxLayout", /::addWidget/, 0    # will take ownership of item
 keep_arg "QBoxLayout", /::insertItem/, 1    # will take ownership of item
 keep_arg "QBoxLayout", /::insertLayout/, 1    # will take ownership of item
 keep_arg "QBoxLayout", /::insertSpacerItem/, 1    # will take ownership of item
 keep_arg "QBoxLayout", /::insertWidget/, 1    # will take ownership of item
+keep_arg "QHBoxLayout", /::addItem/, 0    # will take ownership of item
+keep_arg "QVBoxLayout", /::addItem/, 0    # will take ownership of item
 keep_arg "QGridLayout", /::addLayout/, 0  # will take ownership of layout
 keep_arg "QGridLayout", /::addItem/, 0  # will take ownership of layout
 keep_arg "QGridLayout", /::addWidget/, 0  # will take ownership of layout
+keep_arg "QFormLayout", /::addItem/, 0  # will take ownership of layout
 keep_arg "QLayout", /::addChildLayout/, 0  # will take ownership of layout
 keep_arg "QLayout", /::addItem/, 0  # will take ownership of item
 keep_arg "QLayout", /::addWidget/, 0  # will take ownership of item
+keep_arg "QStackedLayout", /::addItem/, 0  # will take ownership of item
 keep_arg "QStackedLayout", /::addWidget/, 0  # will take ownership of item
 keep_arg "QStackedLayout", /::insertWidget/, 1  # will take ownership of item
 

scripts/mkqtdecl5/mkqtdecl.conf

@@ -840,23 +840,23 @@ rename "QKeySequence", /QKeySequence::QKeySequence\(QKeySequence::StandardKey/,
 # TODO: basically, the layout object only takes ownership over the objects when 
 # it has a QWidget parent itself. This is not reflected in the following simple scheme
 keep_arg "QBoxLayout", /::addLayout/, 0    # will take ownership of layout
+keep_arg "QBoxLayout", /::addItem/, 0    # will take ownership of item
 keep_arg "QBoxLayout", /::addSpacerItem/, 0    # will take ownership of item
 keep_arg "QBoxLayout", /::addWidget/, 0    # will take ownership of item
 keep_arg "QBoxLayout", /::insertItem/, 1    # will take ownership of item
 keep_arg "QBoxLayout", /::insertLayout/, 1    # will take ownership of item
 keep_arg "QBoxLayout", /::insertSpacerItem/, 1    # will take ownership of item
 keep_arg "QBoxLayout", /::insertWidget/, 1    # will take ownership of item
-keep_arg "QFormLayout", /::addRow/, 1    # will take ownership of item
-keep_arg "QFormLayout", /::addRow\(QWidget\s*\*/, 0    # will take ownership of item
-keep_arg "QFormLayout", /::insertRow/, 2    # will take ownership of item
-keep_arg "QFormLayout", /::insertRow\(QWidget\s*\*/, 1    # will take ownership of item
-keep_arg "QFormLayout", /::setWidget/, 2    # will take ownership of item
+keep_arg "QHBoxLayout", /::addItem/, 0    # will take ownership of item
+keep_arg "QVBoxLayout", /::addItem/, 0    # will take ownership of item
 keep_arg "QGridLayout", /::addLayout/, 0  # will take ownership of layout
 keep_arg "QGridLayout", /::addItem/, 0  # will take ownership of layout
 keep_arg "QGridLayout", /::addWidget/, 0  # will take ownership of layout
+keep_arg "QFormLayout", /::addItem/, 0  # will take ownership of layout
 keep_arg "QLayout", /::addChildLayout/, 0  # will take ownership of layout
 keep_arg "QLayout", /::addItem/, 0  # will take ownership of item
 keep_arg "QLayout", /::addWidget/, 0  # will take ownership of item
+keep_arg "QStackedLayout", /::addItem/, 0  # will take ownership of item
 keep_arg "QStackedLayout", /::addWidget/, 0  # will take ownership of item
 keep_arg "QStackedLayout", /::insertWidget/, 1  # will take ownership of item
 
@@ -886,9 +886,13 @@ owner_arg "QWidget", /::setParent\(QWidget\s+\*/, 0 # will make self owned by ar
 # over ownership of it?
 # keep_arg "QTableWidget", /::setItemPrototype\(/, 0  # will take ownership of the child
 return_new "QLayout", /::takeAt/   # returns a free object
+return_new "QLayout", /::replaceWidget/   # returns a free object
 return_new "QBoxLayout", /::takeAt/   # returns a free object
+return_new "QHBoxLayout", /::takeAt/   # returns a free object
+return_new "QVBoxLayout", /::takeAt/   # returns a free object
 # TODO: QFormLayout: takeRow -> needs QFormLayout::TakeRowResult
 return_new "QGridLayout", /::takeAt/   # returns a free object
+return_new "QFormLayout", /::takeAt/   # returns a free object
 return_new "QStackedLayout", /::takeAt/   # returns a free object
 return_new "QStandardItem", /::take/   # returns a free object
 return_new "QStandardItemModel", /::take/   # returns a free object

scripts/mkqtdecl6/mkqtdecl.conf

@@ -1162,23 +1162,23 @@ rename "QKeySequence", /QKeySequence::QKeySequence\(QKeySequence::StandardKey/,
 # TODO: basically, the layout object only takes ownership over the objects when 
 # it has a QWidget parent itself. This is not reflected in the following simple scheme
 keep_arg "QBoxLayout", /::addLayout/, 0    # will take ownership of layout
+keep_arg "QBoxLayout", /::addItem/, 0    # will take ownership of item
 keep_arg "QBoxLayout", /::addSpacerItem/, 0    # will take ownership of item
 keep_arg "QBoxLayout", /::addWidget/, 0    # will take ownership of item
 keep_arg "QBoxLayout", /::insertItem/, 1    # will take ownership of item
 keep_arg "QBoxLayout", /::insertLayout/, 1    # will take ownership of item
 keep_arg "QBoxLayout", /::insertSpacerItem/, 1    # will take ownership of item
 keep_arg "QBoxLayout", /::insertWidget/, 1    # will take ownership of item
-keep_arg "QFormLayout", /::addRow/, 1    # will take ownership of item
-keep_arg "QFormLayout", /::addRow\(QWidget\s*\*/, 0    # will take ownership of item
-keep_arg "QFormLayout", /::insertRow/, 2    # will take ownership of item
-keep_arg "QFormLayout", /::insertRow\(QWidget\s*\*/, 1    # will take ownership of item
-keep_arg "QFormLayout", /::setWidget/, 2    # will take ownership of item
+keep_arg "QHBoxLayout", /::addItem/, 0    # will take ownership of item
+keep_arg "QVBoxLayout", /::addItem/, 0    # will take ownership of item
 keep_arg "QGridLayout", /::addLayout/, 0  # will take ownership of layout
 keep_arg "QGridLayout", /::addItem/, 0  # will take ownership of layout
 keep_arg "QGridLayout", /::addWidget/, 0  # will take ownership of layout
+keep_arg "QFormLayout", /::addItem/, 0  # will take ownership of layout
 keep_arg "QLayout", /::addChildLayout/, 0  # will take ownership of layout
 keep_arg "QLayout", /::addItem/, 0  # will take ownership of item
 keep_arg "QLayout", /::addWidget/, 0  # will take ownership of item
+keep_arg "QStackedLayout", /::addItem/, 0  # will take ownership of item
 keep_arg "QStackedLayout", /::addWidget/, 0  # will take ownership of item
 keep_arg "QStackedLayout", /::insertWidget/, 1  # will take ownership of item
 
@@ -1208,11 +1208,20 @@ owner_arg "QWidget", /::setParent\(QWidget\s+\*/, 0 # will make self owned by ar
 # over ownership of it?
 # keep_arg "QTableWidget", /::setItemPrototype\(/, 0  # will take ownership of the child
 return_new "QLayout", /::takeAt/   # returns a free object
+return_new "QLayout", /::replaceWidget/   # returns a free object
 return_new "QBoxLayout", /::takeAt/   # returns a free object
+return_new "QBoxLayout", /::replaceWidget/   # returns a free object
+return_new "QHBoxLayout", /::takeAt/   # returns a free object
+return_new "QHBoxLayout", /::replaceWidget/   # returns a free object
+return_new "QVBoxLayout", /::takeAt/   # returns a free object
+return_new "QVBoxLayout", /::replaceWidget/   # returns a free object
 return_new "QFormLayout", /::takeAt/   # returns a free object
+return_new "QFormLayout", /::replaceWidget/   # returns a free object
 return_new "QGridLayout", /::takeAt/   # returns a free object
+return_new "QGridLayout", /::replaceWidget/   # returns a free object
 # TODO: QFormLayout: takeRow -> needs QFormLayout::TakeRowResult
 return_new "QStackedLayout", /::takeAt/   # returns a free object
+return_new "QStackedLayout", /::replaceWidget/   # returns a free object
 return_new "QStandardItem", /::take/   # returns a free object
 return_new "QStandardItemModel", /::take/   # returns a free object
 return_new "QTreeWidgetItem", /::take/   # returns a free object

src/gsiqt/qt4/QtCore/gsiDeclQMargins.cc

@@ -235,12 +235,12 @@ static void _call_f_top_c0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, g
 
 //  bool ::operator==(const QMargins &m1, const QMargins &m2)
 static bool op_QMargins_operator_eq__eq__4122(const QMargins *_self, const QMargins &m2) {
-  return ::operator==(*_self, m2);
+  return operator==(*_self, m2);
 }
 
 //  bool ::operator!=(const QMargins &m1, const QMargins &m2)
 static bool op_QMargins_operator_excl__eq__4122(const QMargins *_self, const QMargins &m2) {
-  return ::operator!=(*_self, m2);
+  return operator!=(*_self, m2);
 }
 
 

src/gsiqt/qt4/QtCore/gsiDeclQPoint.cc

@@ -282,37 +282,37 @@ static void _call_f_y_c0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi
 
 //  bool ::operator==(const QPoint &p1, const QPoint &p2)
 static bool op_QPoint_operator_eq__eq__3724(const QPoint *_self, const QPoint &p2) {
-  return ::operator==(*_self, p2);
+  return operator==(*_self, p2);
 }
 
 //  bool ::operator!=(const QPoint &p1, const QPoint &p2)
 static bool op_QPoint_operator_excl__eq__3724(const QPoint *_self, const QPoint &p2) {
-  return ::operator!=(*_self, p2);
+  return operator!=(*_self, p2);
 }
 
 //  const QPoint ::operator+(const QPoint &p1, const QPoint &p2)
 static const QPoint op_QPoint_operator_plus__3724(const QPoint *_self, const QPoint &p2) {
-  return ::operator+(*_self, p2);
+  return operator+(*_self, p2);
 }
 
 //  const QPoint ::operator-(const QPoint &p1, const QPoint &p2)
 static const QPoint op_QPoint_operator_minus__3724(const QPoint *_self, const QPoint &p2) {
-  return ::operator-(*_self, p2);
+  return operator-(*_self, p2);
 }
 
 //  const QPoint ::operator*(const QPoint &p, qreal c)
 static const QPoint op_QPoint_operator_star__2777(const QPoint *_self, qreal c) {
-  return ::operator*(*_self, c);
+  return operator*(*_self, c);
 }
 
 //  const QPoint ::operator-(const QPoint &p)
 static const QPoint op_QPoint_operator_minus__1916(const QPoint *_self) {
-  return ::operator-(*_self);
+  return operator-(*_self);
 }
 
 //  const QPoint ::operator/(const QPoint &p, qreal c)
 static const QPoint op_QPoint_operator_slash__2777(const QPoint *_self, qreal c) {
-  return ::operator/(*_self, c);
+  return operator/(*_self, c);
 }
 
 

src/gsiqt/qt4/QtCore/gsiDeclQPointF.cc

@@ -316,37 +316,37 @@ static void _call_f_y_c0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi
 
 //  bool ::operator==(const QPointF &p1, const QPointF &p2)
 static bool op_QPointF_operator_eq__eq__3864(const QPointF *_self, const QPointF &p2) {
-  return ::operator==(*_self, p2);
+  return operator==(*_self, p2);
 }
 
 //  bool ::operator!=(const QPointF &p1, const QPointF &p2)
 static bool op_QPointF_operator_excl__eq__3864(const QPointF *_self, const QPointF &p2) {
-  return ::operator!=(*_self, p2);
+  return operator!=(*_self, p2);
 }
 
 //  const QPointF ::operator+(const QPointF &p1, const QPointF &p2)
 static const QPointF op_QPointF_operator_plus__3864(const QPointF *_self, const QPointF &p2) {
-  return ::operator+(*_self, p2);
+  return operator+(*_self, p2);
 }
 
 //  const QPointF ::operator-(const QPointF &p1, const QPointF &p2)
 static const QPointF op_QPointF_operator_minus__3864(const QPointF *_self, const QPointF &p2) {
-  return ::operator-(*_self, p2);
+  return operator-(*_self, p2);
 }
 
 //  const QPointF ::operator*(const QPointF &p, qreal c)
 static const QPointF op_QPointF_operator_star__2847(const QPointF *_self, qreal c) {
-  return ::operator*(*_self, c);
+  return operator*(*_self, c);
 }
 
 //  const QPointF ::operator-(const QPointF &p)
 static const QPointF op_QPointF_operator_minus__1986(const QPointF *_self) {
-  return ::operator-(*_self);
+  return operator-(*_self);
 }
 
 //  const QPointF ::operator/(const QPointF &p, qreal c)
 static const QPointF op_QPointF_operator_slash__2847(const QPointF *_self, qreal c) {
-  return ::operator/(*_self, c);
+  return operator/(*_self, c);
 }
 
 

src/gsiqt/qt4/QtCore/gsiDeclQRect.cc

@@ -1398,12 +1398,12 @@ static void _call_f_y_c0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi
 
 //  bool ::operator==(const QRect &, const QRect &)
 static bool op_QRect_operator_eq__eq__3476(const QRect *_self, const QRect &arg2) {
-  return ::operator==(*_self, arg2);
+  return operator==(*_self, arg2);
 }
 
 //  bool ::operator!=(const QRect &, const QRect &)
 static bool op_QRect_operator_excl__eq__3476(const QRect *_self, const QRect &arg2) {
-  return ::operator!=(*_self, arg2);
+  return operator!=(*_self, arg2);
 }
 
 

src/gsiqt/qt4/QtCore/gsiDeclQRectF.cc

@@ -1417,12 +1417,12 @@ static void _call_f_y_c0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi
 
 //  bool ::operator==(const QRectF &, const QRectF &)
 static bool op_QRectF_operator_eq__eq__3616(const QRectF *_self, const QRectF &arg2) {
-  return ::operator==(*_self, arg2);
+  return operator==(*_self, arg2);
 }
 
 //  bool ::operator!=(const QRectF &, const QRectF &)
 static bool op_QRectF_operator_excl__eq__3616(const QRectF *_self, const QRectF &arg2) {
-  return ::operator!=(*_self, arg2);
+  return operator!=(*_self, arg2);
 }
 
 

src/gsiqt/qt4/QtCore/gsiDeclQSize.cc

@@ -398,32 +398,32 @@ static void _call_f_width_c0 (const qt_gsi::GenericMethod * /*decl*/, void *cls,
 
 //  bool ::operator==(const QSize &s1, const QSize &s2)
 static bool op_QSize_operator_eq__eq__3502(const QSize *_self, const QSize &s2) {
-  return ::operator==(*_self, s2);
+  return operator==(*_self, s2);
 }
 
 //  bool ::operator!=(const QSize &s1, const QSize &s2)
 static bool op_QSize_operator_excl__eq__3502(const QSize *_self, const QSize &s2) {
-  return ::operator!=(*_self, s2);
+  return operator!=(*_self, s2);
 }
 
 //  const QSize ::operator+(const QSize &s1, const QSize &s2)
 static const QSize op_QSize_operator_plus__3502(const QSize *_self, const QSize &s2) {
-  return ::operator+(*_self, s2);
+  return operator+(*_self, s2);
 }
 
 //  const QSize ::operator-(const QSize &s1, const QSize &s2)
 static const QSize op_QSize_operator_minus__3502(const QSize *_self, const QSize &s2) {
-  return ::operator-(*_self, s2);
+  return operator-(*_self, s2);
 }
 
 //  const QSize ::operator*(const QSize &s, qreal c)
 static const QSize op_QSize_operator_star__2666(const QSize *_self, qreal c) {
-  return ::operator*(*_self, c);
+  return operator*(*_self, c);
 }
 
 //  const QSize ::operator/(const QSize &s, qreal c)
 static const QSize op_QSize_operator_slash__2666(const QSize *_self, qreal c) {
-  return ::operator/(*_self, c);
+  return operator/(*_self, c);
 }
 
 

src/gsiqt/qt4/QtCore/gsiDeclQSizeF.cc

@@ -433,32 +433,32 @@ static void _call_f_width_c0 (const qt_gsi::GenericMethod * /*decl*/, void *cls,
 
 //  bool ::operator==(const QSizeF &s1, const QSizeF &s2)
 static bool op_QSizeF_operator_eq__eq__3642(const QSizeF *_self, const QSizeF &s2) {
-  return ::operator==(*_self, s2);
+  return operator==(*_self, s2);
 }
 
 //  bool ::operator!=(const QSizeF &s1, const QSizeF &s2)
 static bool op_QSizeF_operator_excl__eq__3642(const QSizeF *_self, const QSizeF &s2) {
-  return ::operator!=(*_self, s2);
+  return operator!=(*_self, s2);
 }
 
 //  const QSizeF ::operator+(const QSizeF &s1, const QSizeF &s2)
 static const QSizeF op_QSizeF_operator_plus__3642(const QSizeF *_self, const QSizeF &s2) {
-  return ::operator+(*_self, s2);
+  return operator+(*_self, s2);
 }
 
 //  const QSizeF ::operator-(const QSizeF &s1, const QSizeF &s2)
 static const QSizeF op_QSizeF_operator_minus__3642(const QSizeF *_self, const QSizeF &s2) {
-  return ::operator-(*_self, s2);
+  return operator-(*_self, s2);
 }
 
 //  const QSizeF ::operator*(const QSizeF &s, qreal c)
 static const QSizeF op_QSizeF_operator_star__2736(const QSizeF *_self, qreal c) {
-  return ::operator*(*_self, c);
+  return operator*(*_self, c);
 }
 
 //  const QSizeF ::operator/(const QSizeF &s, qreal c)
 static const QSizeF op_QSizeF_operator_slash__2736(const QSizeF *_self, qreal c) {
-  return ::operator/(*_self, c);
+  return operator/(*_self, c);
 }
 
 

src/gsiqt/qt4/QtGui/gsiDeclQBoxLayout.cc

@@ -75,6 +75,7 @@ static void _call_f_addItem_1740 (const qt_gsi::GenericMethod * /*decl*/, void *
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
   QLayoutItem *arg1 = gsi::arg_reader<QLayoutItem * >() (args, heap);
+  qt_gsi::qt_keep (arg1);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QBoxLayout *)cls)->addItem (arg1);
 }

src/gsiqt/qt4/QtGui/gsiDeclQFormLayout.cc

@@ -75,6 +75,7 @@ static void _call_f_addItem_1740 (const qt_gsi::GenericMethod * /*decl*/, void *
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
   QLayoutItem *arg1 = gsi::arg_reader<QLayoutItem * >() (args, heap);
+  qt_gsi::qt_keep (arg1);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFormLayout *)cls)->addItem (arg1);
 }

src/gsiqt/qt4/QtGui/gsiDeclQMatrix4x4.cc

@@ -1242,52 +1242,52 @@ static void _call_f_transposed_c0 (const qt_gsi::GenericMethod * /*decl*/, void
 
 //  QMatrix4x4 ::operator/(const QMatrix4x4 &matrix, qreal divisor)
 static QMatrix4x4 op_QMatrix4x4_operator_slash__3108(const QMatrix4x4 *_self, qreal divisor) {
-  return ::operator/(*_self, divisor);
+  return operator/(*_self, divisor);
 }
 
 //  QMatrix4x4 ::operator+(const QMatrix4x4 &m1, const QMatrix4x4 &m2)
 static QMatrix4x4 op_QMatrix4x4_operator_plus__4386(const QMatrix4x4 *_self, const QMatrix4x4 &m2) {
-  return ::operator+(*_self, m2);
+  return operator+(*_self, m2);
 }
 
 //  QMatrix4x4 ::operator-(const QMatrix4x4 &m1, const QMatrix4x4 &m2)
 static QMatrix4x4 op_QMatrix4x4_operator_minus__4386(const QMatrix4x4 *_self, const QMatrix4x4 &m2) {
-  return ::operator-(*_self, m2);
+  return operator-(*_self, m2);
 }
 
 //  QMatrix4x4 ::operator*(const QMatrix4x4 &m1, const QMatrix4x4 &m2)
 static QMatrix4x4 op_QMatrix4x4_operator_star__4386(const QMatrix4x4 *_self, const QMatrix4x4 &m2) {
-  return ::operator*(*_self, m2);
+  return operator*(*_self, m2);
 }
 
 //  QVector3D ::operator*(const QMatrix4x4 &matrix, const QVector3D &vector)
 static QVector3D op_QMatrix4x4_operator_star__4279(const QMatrix4x4 *_self, const QVector3D &vector) {
-  return ::operator*(*_self, vector);
+  return operator*(*_self, vector);
 }
 
 //  QVector4D ::operator*(const QMatrix4x4 &matrix, const QVector4D &vector)
 static QVector4D op_QMatrix4x4_operator_star__4280(const QMatrix4x4 *_self, const QVector4D &vector) {
-  return ::operator*(*_self, vector);
+  return operator*(*_self, vector);
 }
 
 //  QPoint ::operator*(const QMatrix4x4 &matrix, const QPoint &point)
 static QPoint op_QMatrix4x4_operator_star__4055(const QMatrix4x4 *_self, const QPoint &point) {
-  return ::operator*(*_self, point);
+  return operator*(*_self, point);
 }
 
 //  QPointF ::operator*(const QMatrix4x4 &matrix, const QPointF &point)
 static QPointF op_QMatrix4x4_operator_star__4125(const QMatrix4x4 *_self, const QPointF &point) {
-  return ::operator*(*_self, point);
+  return operator*(*_self, point);
 }
 
 //  QMatrix4x4 ::operator-(const QMatrix4x4 &matrix)
 static QMatrix4x4 op_QMatrix4x4_operator_minus__2247(const QMatrix4x4 *_self) {
-  return ::operator-(*_self);
+  return operator-(*_self);
 }
 
 //  QMatrix4x4 ::operator*(const QMatrix4x4 &matrix, qreal factor)
 static QMatrix4x4 op_QMatrix4x4_operator_star__3108(const QMatrix4x4 *_self, qreal factor) {
-  return ::operator*(*_self, factor);
+  return operator*(*_self, factor);
 }
 
 

src/gsiqt/qt4/QtGui/gsiDeclQPainterPath.cc

@@ -1724,12 +1724,12 @@ static void _call_f_united_c2514 (const qt_gsi::GenericMethod * /*decl*/, void *
 
 //  QPainterPath ::operator *(const QPainterPath &p, const QMatrix &m)
 static QPainterPath op_QPainterPath_operator_star__4429(const QPainterPath *_self, const QMatrix &m) {
-  return ::operator *(*_self, m);
+  return operator *(*_self, m);
 }
 
 //  QPainterPath ::operator *(const QPainterPath &p, const QTransform &m)
 static QPainterPath op_QPainterPath_operator_star__4756(const QPainterPath *_self, const QTransform &m) {
-  return ::operator *(*_self, m);
+  return operator *(*_self, m);
 }
 
 

src/gsiqt/qt4/QtGui/gsiDeclQPolygon.cc

@@ -595,12 +595,12 @@ static void _call_f_united_c2138 (const qt_gsi::GenericMethod * /*decl*/, void *
 
 //  QPolygon ::operator *(const QPolygon &a, const QMatrix &m)
 static QPolygon op_QPolygon_operator_star__4053(const QPolygon *_self, const QMatrix &m) {
-  return ::operator *(*_self, m);
+  return operator *(*_self, m);
 }
 
 //  QPolygon ::operator *(const QPolygon &a, const QTransform &m)
 static QPolygon op_QPolygon_operator_star__4380(const QPolygon *_self, const QTransform &m) {
-  return ::operator *(*_self, m);
+  return operator *(*_self, m);
 }
 
 

src/gsiqt/qt4/QtGui/gsiDeclQPolygonF.cc

@@ -463,12 +463,12 @@ static void _call_f_united_c2208 (const qt_gsi::GenericMethod * /*decl*/, void *
 
 //  QPolygonF ::operator *(const QPolygonF &a, const QMatrix &m)
 static QPolygonF op_QPolygonF_operator_star__4123(const QPolygonF *_self, const QMatrix &m) {
-  return ::operator *(*_self, m);
+  return operator *(*_self, m);
 }
 
 //  QPolygonF ::operator *(const QPolygonF &a, const QTransform &m)
 static QPolygonF op_QPolygonF_operator_star__4450(const QPolygonF *_self, const QTransform &m) {
-  return ::operator *(*_self, m);
+  return operator *(*_self, m);
 }
 
 

src/gsiqt/qt4/QtGui/gsiDeclQQuaternion.cc

@@ -659,42 +659,42 @@ static void _call_f_slerp_5767 (const qt_gsi::GenericStaticMethod * /*decl*/, gs
 
 //  const QQuaternion ::operator*(const QQuaternion &q1, const QQuaternion &q2)
 static const QQuaternion op_QQuaternion_operator_star__4804(const QQuaternion *_self, const QQuaternion &q2) {
-  return ::operator*(*_self, q2);
+  return operator*(*_self, q2);
 }
 
 //  bool ::operator==(const QQuaternion &q1, const QQuaternion &q2)
 static bool op_QQuaternion_operator_eq__eq__4804(const QQuaternion *_self, const QQuaternion &q2) {
-  return ::operator==(*_self, q2);
+  return operator==(*_self, q2);
 }
 
 //  bool ::operator!=(const QQuaternion &q1, const QQuaternion &q2)
 static bool op_QQuaternion_operator_excl__eq__4804(const QQuaternion *_self, const QQuaternion &q2) {
-  return ::operator!=(*_self, q2);
+  return operator!=(*_self, q2);
 }
 
 //  const QQuaternion ::operator+(const QQuaternion &q1, const QQuaternion &q2)
 static const QQuaternion op_QQuaternion_operator_plus__4804(const QQuaternion *_self, const QQuaternion &q2) {
-  return ::operator+(*_self, q2);
+  return operator+(*_self, q2);
 }
 
 //  const QQuaternion ::operator-(const QQuaternion &q1, const QQuaternion &q2)
 static const QQuaternion op_QQuaternion_operator_minus__4804(const QQuaternion *_self, const QQuaternion &q2) {
-  return ::operator-(*_self, q2);
+  return operator-(*_self, q2);
 }
 
 //  const QQuaternion ::operator*(const QQuaternion &quaternion, qreal factor)
 static const QQuaternion op_QQuaternion_operator_star__3317(const QQuaternion *_self, qreal factor) {
-  return ::operator*(*_self, factor);
+  return operator*(*_self, factor);
 }
 
 //  const QQuaternion ::operator-(const QQuaternion &quaternion)
 static const QQuaternion op_QQuaternion_operator_minus__2456(const QQuaternion *_self) {
-  return ::operator-(*_self);
+  return operator-(*_self);
 }
 
 //  const QQuaternion ::operator/(const QQuaternion &quaternion, qreal divisor)
 static const QQuaternion op_QQuaternion_operator_slash__3317(const QQuaternion *_self, qreal divisor) {
-  return ::operator/(*_self, divisor);
+  return operator/(*_self, divisor);
 }
 
 

src/gsiqt/qt4/QtGui/gsiDeclQRegion.cc

@@ -961,12 +961,12 @@ static void _call_f_xored_c2006 (const qt_gsi::GenericMethod * /*decl*/, void *c
 
 //  QRegion ::operator *(const QRegion &r, const QMatrix &m)
 static QRegion op_QRegion_operator_star__3921(const QRegion *_self, const QMatrix &m) {
-  return ::operator *(*_self, m);
+  return operator *(*_self, m);
 }
 
 //  QRegion ::operator *(const QRegion &r, const QTransform &m)
 static QRegion op_QRegion_operator_star__4248(const QRegion *_self, const QTransform &m) {
-  return ::operator *(*_self, m);
+  return operator *(*_self, m);
 }
 
 

src/gsiqt/qt4/QtGui/gsiDeclQStackedLayout.cc

@@ -75,6 +75,7 @@ static void _call_f_addItem_1740 (const qt_gsi::GenericMethod * /*decl*/, void *
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
   QLayoutItem *arg1 = gsi::arg_reader<QLayoutItem * >() (args, heap);
+  qt_gsi::qt_keep (arg1);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QStackedLayout *)cls)->addItem (arg1);
 }

src/gsiqt/qt4/QtGui/gsiDeclQTransform.cc

@@ -1263,22 +1263,22 @@ static void _call_f_squareToQuad_3755 (const qt_gsi::GenericStaticMethod * /*dec
 
 //  QTransform ::operator *(const QTransform &a, qreal n)
 static QTransform op_QTransform_operator_star__3211(const QTransform *_self, qreal n) {
-  return ::operator *(*_self, n);
+  return operator *(*_self, n);
 }
 
 //  QTransform ::operator /(const QTransform &a, qreal n)
 static QTransform op_QTransform_operator_slash__3211(const QTransform *_self, qreal n) {
-  return ::operator /(*_self, n);
+  return operator /(*_self, n);
 }
 
 //  QTransform ::operator +(const QTransform &a, qreal n)
 static QTransform op_QTransform_operator_plus__3211(const QTransform *_self, qreal n) {
-  return ::operator +(*_self, n);
+  return operator +(*_self, n);
 }
 
 //  QTransform ::operator -(const QTransform &a, qreal n)
 static QTransform op_QTransform_operator_minus__3211(const QTransform *_self, qreal n) {
-  return ::operator -(*_self, n);
+  return operator -(*_self, n);
 }
 
 

src/gsiqt/qt4/QtGui/gsiDeclQVector2D.cc

@@ -477,42 +477,42 @@ static void _call_f_dotProduct_4170 (const qt_gsi::GenericStaticMethod * /*decl*
 
 //  bool ::operator==(const QVector2D &v1, const QVector2D &v2)
 static bool op_QVector2D_operator_eq__eq__4170(const QVector2D *_self, const QVector2D &v2) {
-  return ::operator==(*_self, v2);
+  return operator==(*_self, v2);
 }
 
 //  bool ::operator!=(const QVector2D &v1, const QVector2D &v2)
 static bool op_QVector2D_operator_excl__eq__4170(const QVector2D *_self, const QVector2D &v2) {
-  return ::operator!=(*_self, v2);
+  return operator!=(*_self, v2);
 }
 
 //  const QVector2D ::operator+(const QVector2D &v1, const QVector2D &v2)
 static const QVector2D op_QVector2D_operator_plus__4170(const QVector2D *_self, const QVector2D &v2) {
-  return ::operator+(*_self, v2);
+  return operator+(*_self, v2);
 }
 
 //  const QVector2D ::operator-(const QVector2D &v1, const QVector2D &v2)
 static const QVector2D op_QVector2D_operator_minus__4170(const QVector2D *_self, const QVector2D &v2) {
-  return ::operator-(*_self, v2);
+  return operator-(*_self, v2);
 }
 
 //  const QVector2D ::operator*(const QVector2D &vector, qreal factor)
 static const QVector2D op_QVector2D_operator_star__3000(const QVector2D *_self, qreal factor) {
-  return ::operator*(*_self, factor);
+  return operator*(*_self, factor);
 }
 
 //  const QVector2D ::operator*(const QVector2D &v1, const QVector2D &v2)
 static const QVector2D op_QVector2D_operator_star__4170(const QVector2D *_self, const QVector2D &v2) {
-  return ::operator*(*_self, v2);
+  return operator*(*_self, v2);
 }
 
 //  const QVector2D ::operator-(const QVector2D &vector)
 static const QVector2D op_QVector2D_operator_minus__2139(const QVector2D *_self) {
-  return ::operator-(*_self);
+  return operator-(*_self);
 }
 
 //  const QVector2D ::operator/(const QVector2D &vector, qreal divisor)
 static const QVector2D op_QVector2D_operator_slash__3000(const QVector2D *_self, qreal divisor) {
-  return ::operator/(*_self, divisor);
+  return operator/(*_self, divisor);
 }
 
 

src/gsiqt/qt4/QtGui/gsiDeclQVector3D.cc

@@ -673,47 +673,47 @@ static void _call_f_normal_6204 (const qt_gsi::GenericStaticMethod * /*decl*/, g
 
 //  bool ::operator==(const QVector3D &v1, const QVector3D &v2)
 static bool op_QVector3D_operator_eq__eq__4172(const QVector3D *_self, const QVector3D &v2) {
-  return ::operator==(*_self, v2);
+  return operator==(*_self, v2);
 }
 
 //  bool ::operator!=(const QVector3D &v1, const QVector3D &v2)
 static bool op_QVector3D_operator_excl__eq__4172(const QVector3D *_self, const QVector3D &v2) {
-  return ::operator!=(*_self, v2);
+  return operator!=(*_self, v2);
 }
 
 //  const QVector3D ::operator+(const QVector3D &v1, const QVector3D &v2)
 static const QVector3D op_QVector3D_operator_plus__4172(const QVector3D *_self, const QVector3D &v2) {
-  return ::operator+(*_self, v2);
+  return operator+(*_self, v2);
 }
 
 //  const QVector3D ::operator-(const QVector3D &v1, const QVector3D &v2)
 static const QVector3D op_QVector3D_operator_minus__4172(const QVector3D *_self, const QVector3D &v2) {
-  return ::operator-(*_self, v2);
+  return operator-(*_self, v2);
 }
 
 //  const QVector3D ::operator*(const QVector3D &vector, qreal factor)
 static const QVector3D op_QVector3D_operator_star__3001(const QVector3D *_self, qreal factor) {
-  return ::operator*(*_self, factor);
+  return operator*(*_self, factor);
 }
 
 //  const QVector3D ::operator*(const QVector3D &v1, const QVector3D &v2)
 static const QVector3D op_QVector3D_operator_star__4172(const QVector3D *_self, const QVector3D &v2) {
-  return ::operator*(*_self, v2);
+  return operator*(*_self, v2);
 }
 
 //  const QVector3D ::operator-(const QVector3D &vector)
 static const QVector3D op_QVector3D_operator_minus__2140(const QVector3D *_self) {
-  return ::operator-(*_self);
+  return operator-(*_self);
 }
 
 //  const QVector3D ::operator/(const QVector3D &vector, qreal divisor)
 static const QVector3D op_QVector3D_operator_slash__3001(const QVector3D *_self, qreal divisor) {
-  return ::operator/(*_self, divisor);
+  return operator/(*_self, divisor);
 }
 
 //  QVector3D ::operator*(const QVector3D &vector, const QMatrix4x4 &matrix)
 static QVector3D op_QVector3D_operator_star__4279u1(const QVector3D *_self, const QMatrix4x4 &matrix) {
-  return ::operator*(*_self, matrix);
+  return operator*(*_self, matrix);
 }
 
 

src/gsiqt/qt4/QtGui/gsiDeclQVector4D.cc

@@ -628,47 +628,47 @@ static void _call_f_dotProduct_4174 (const qt_gsi::GenericStaticMethod * /*decl*
 
 //  bool ::operator==(const QVector4D &v1, const QVector4D &v2)
 static bool op_QVector4D_operator_eq__eq__4174(const QVector4D *_self, const QVector4D &v2) {
-  return ::operator==(*_self, v2);
+  return operator==(*_self, v2);
 }
 
 //  bool ::operator!=(const QVector4D &v1, const QVector4D &v2)
 static bool op_QVector4D_operator_excl__eq__4174(const QVector4D *_self, const QVector4D &v2) {
-  return ::operator!=(*_self, v2);
+  return operator!=(*_self, v2);
 }
 
 //  const QVector4D ::operator+(const QVector4D &v1, const QVector4D &v2)
 static const QVector4D op_QVector4D_operator_plus__4174(const QVector4D *_self, const QVector4D &v2) {
-  return ::operator+(*_self, v2);
+  return operator+(*_self, v2);
 }
 
 //  const QVector4D ::operator-(const QVector4D &v1, const QVector4D &v2)
 static const QVector4D op_QVector4D_operator_minus__4174(const QVector4D *_self, const QVector4D &v2) {
-  return ::operator-(*_self, v2);
+  return operator-(*_self, v2);
 }
 
 //  const QVector4D ::operator*(const QVector4D &vector, qreal factor)
 static const QVector4D op_QVector4D_operator_star__3002(const QVector4D *_self, qreal factor) {
-  return ::operator*(*_self, factor);
+  return operator*(*_self, factor);
 }
 
 //  const QVector4D ::operator*(const QVector4D &v1, const QVector4D &v2)
 static const QVector4D op_QVector4D_operator_star__4174(const QVector4D *_self, const QVector4D &v2) {
-  return ::operator*(*_self, v2);
+  return operator*(*_self, v2);
 }
 
 //  const QVector4D ::operator-(const QVector4D &vector)
 static const QVector4D op_QVector4D_operator_minus__2141(const QVector4D *_self) {
-  return ::operator-(*_self);
+  return operator-(*_self);
 }
 
 //  const QVector4D ::operator/(const QVector4D &vector, qreal divisor)
 static const QVector4D op_QVector4D_operator_slash__3002(const QVector4D *_self, qreal divisor) {
-  return ::operator/(*_self, divisor);
+  return operator/(*_self, divisor);
 }
 
 //  QVector4D ::operator*(const QVector4D &vector, const QMatrix4x4 &matrix)
 static QVector4D op_QVector4D_operator_star__4280u1(const QVector4D *_self, const QMatrix4x4 &matrix) {
-  return ::operator*(*_self, matrix);
+  return operator*(*_self, matrix);
 }
 
 

src/gsiqt/qt5/QtWidgets/gsiDeclQBoxLayout.cc

@@ -76,6 +76,7 @@ static void _call_f_addItem_1740 (const qt_gsi::GenericMethod * /*decl*/, void *
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
   QLayoutItem *arg1 = gsi::arg_reader<QLayoutItem * >() (args, heap);
+  qt_gsi::qt_keep (arg1);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QBoxLayout *)cls)->addItem (arg1);
 }

src/gsiqt/qt5/QtWidgets/gsiDeclQFormLayout.cc

@@ -76,6 +76,7 @@ static void _call_f_addItem_1740 (const qt_gsi::GenericMethod * /*decl*/, void *
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
   QLayoutItem *arg1 = gsi::arg_reader<QLayoutItem * >() (args, heap);
+  qt_gsi::qt_keep (arg1);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFormLayout *)cls)->addItem (arg1);
 }
@@ -98,9 +99,7 @@ static void _call_f_addRow_2522 (const qt_gsi::GenericMethod * /*decl*/, void *c
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
   QWidget *arg1 = gsi::arg_reader<QWidget * >() (args, heap);
-  qt_gsi::qt_keep (arg1);
   QWidget *arg2 = gsi::arg_reader<QWidget * >() (args, heap);
-  qt_gsi::qt_keep (arg2);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFormLayout *)cls)->addRow (arg1, arg2);
 }
@@ -123,9 +122,7 @@ static void _call_f_addRow_2548 (const qt_gsi::GenericMethod * /*decl*/, void *c
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
   QWidget *arg1 = gsi::arg_reader<QWidget * >() (args, heap);
-  qt_gsi::qt_keep (arg1);
   QLayout *arg2 = gsi::arg_reader<QLayout * >() (args, heap);
-  qt_gsi::qt_keep (arg2);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFormLayout *)cls)->addRow (arg1, arg2);
 }
@@ -149,7 +146,6 @@ static void _call_f_addRow_3232 (const qt_gsi::GenericMethod * /*decl*/, void *c
   tl::Heap heap;
   const QString &arg1 = gsi::arg_reader<const QString & >() (args, heap);
   QWidget *arg2 = gsi::arg_reader<QWidget * >() (args, heap);
-  qt_gsi::qt_keep (arg2);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFormLayout *)cls)->addRow (arg1, arg2);
 }
@@ -173,7 +169,6 @@ static void _call_f_addRow_3258 (const qt_gsi::GenericMethod * /*decl*/, void *c
   tl::Heap heap;
   const QString &arg1 = gsi::arg_reader<const QString & >() (args, heap);
   QLayout *arg2 = gsi::arg_reader<QLayout * >() (args, heap);
-  qt_gsi::qt_keep (arg2);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFormLayout *)cls)->addRow (arg1, arg2);
 }
@@ -194,7 +189,6 @@ static void _call_f_addRow_1315 (const qt_gsi::GenericMethod * /*decl*/, void *c
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
   QWidget *arg1 = gsi::arg_reader<QWidget * >() (args, heap);
-  qt_gsi::qt_keep (arg1);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFormLayout *)cls)->addRow (arg1);
 }
@@ -428,7 +422,6 @@ static void _call_f_insertRow_3181 (const qt_gsi::GenericMethod * /*decl*/, void
   int arg1 = gsi::arg_reader<int >() (args, heap);
   QWidget *arg2 = gsi::arg_reader<QWidget * >() (args, heap);
   QWidget *arg3 = gsi::arg_reader<QWidget * >() (args, heap);
-  qt_gsi::qt_keep (arg3);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFormLayout *)cls)->insertRow (arg1, arg2, arg3);
 }
@@ -455,7 +448,6 @@ static void _call_f_insertRow_3207 (const qt_gsi::GenericMethod * /*decl*/, void
   int arg1 = gsi::arg_reader<int >() (args, heap);
   QWidget *arg2 = gsi::arg_reader<QWidget * >() (args, heap);
   QLayout *arg3 = gsi::arg_reader<QLayout * >() (args, heap);
-  qt_gsi::qt_keep (arg3);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFormLayout *)cls)->insertRow (arg1, arg2, arg3);
 }
@@ -482,7 +474,6 @@ static void _call_f_insertRow_3891 (const qt_gsi::GenericMethod * /*decl*/, void
   int arg1 = gsi::arg_reader<int >() (args, heap);
   const QString &arg2 = gsi::arg_reader<const QString & >() (args, heap);
   QWidget *arg3 = gsi::arg_reader<QWidget * >() (args, heap);
-  qt_gsi::qt_keep (arg3);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFormLayout *)cls)->insertRow (arg1, arg2, arg3);
 }
@@ -509,7 +500,6 @@ static void _call_f_insertRow_3917 (const qt_gsi::GenericMethod * /*decl*/, void
   int arg1 = gsi::arg_reader<int >() (args, heap);
   const QString &arg2 = gsi::arg_reader<const QString & >() (args, heap);
   QLayout *arg3 = gsi::arg_reader<QLayout * >() (args, heap);
-  qt_gsi::qt_keep (arg3);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFormLayout *)cls)->insertRow (arg1, arg2, arg3);
 }
@@ -1009,7 +999,6 @@ static void _call_f_setWidget_4342 (const qt_gsi::GenericMethod * /*decl*/, void
   int arg1 = gsi::arg_reader<int >() (args, heap);
   const qt_gsi::Converter<QFormLayout::ItemRole>::target_type & arg2 = gsi::arg_reader<const qt_gsi::Converter<QFormLayout::ItemRole>::target_type & >() (args, heap);
   QWidget *arg3 = gsi::arg_reader<QWidget * >() (args, heap);
-  qt_gsi::qt_keep (arg3);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFormLayout *)cls)->setWidget (arg1, qt_gsi::QtToCppAdaptor<QFormLayout::ItemRole>(arg2).cref(), arg3);
 }
@@ -1052,7 +1041,7 @@ static void _init_f_takeAt_767 (qt_gsi::GenericMethod *decl)
 {
   static gsi::ArgSpecBase argspec_0 ("index");
   decl->add_arg<int > (argspec_0);
-  decl->set_return<QLayoutItem * > ();
+  decl->set_return_new<QLayoutItem * > ();
 }
 
 static void _call_f_takeAt_767 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) 

src/gsiqt/qt5/QtWidgets/gsiDeclQLayout.cc

@@ -480,7 +480,7 @@ static void _init_f_replaceWidget_5361 (qt_gsi::GenericMethod *decl)
   decl->add_arg<QWidget * > (argspec_1);
   static gsi::ArgSpecBase argspec_2 ("options", true, "Qt::FindChildrenRecursively");
   decl->add_arg<QFlags<Qt::FindChildOption> > (argspec_2);
-  decl->set_return<QLayoutItem * > ();
+  decl->set_return_new<QLayoutItem * > ();
 }
 
 static void _call_f_replaceWidget_5361 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) 

src/gsiqt/qt5/QtWidgets/gsiDeclQStackedLayout.cc

@@ -76,6 +76,7 @@ static void _call_f_addItem_1740 (const qt_gsi::GenericMethod * /*decl*/, void *
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
   QLayoutItem *arg1 = gsi::arg_reader<QLayoutItem * >() (args, heap);
+  qt_gsi::qt_keep (arg1);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QStackedLayout *)cls)->addItem (arg1);
 }

src/gsiqt/qt6/QtWidgets/gsiDeclQBoxLayout.cc

@@ -76,6 +76,7 @@ static void _call_f_addItem_1740 (const qt_gsi::GenericMethod * /*decl*/, void *
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
   QLayoutItem *arg1 = gsi::arg_reader<QLayoutItem * >() (args, heap);
+  qt_gsi::qt_keep (arg1);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QBoxLayout *)cls)->addItem (arg1);
 }

src/gsiqt/qt6/QtWidgets/gsiDeclQFormLayout.cc

@@ -76,6 +76,7 @@ static void _call_f_addItem_1740 (const qt_gsi::GenericMethod * /*decl*/, void *
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
   QLayoutItem *arg1 = gsi::arg_reader<QLayoutItem * >() (args, heap);
+  qt_gsi::qt_keep (arg1);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFormLayout *)cls)->addItem (arg1);
 }
@@ -98,9 +99,7 @@ static void _call_f_addRow_2522 (const qt_gsi::GenericMethod * /*decl*/, void *c
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
   QWidget *arg1 = gsi::arg_reader<QWidget * >() (args, heap);
-  qt_gsi::qt_keep (arg1);
   QWidget *arg2 = gsi::arg_reader<QWidget * >() (args, heap);
-  qt_gsi::qt_keep (arg2);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFormLayout *)cls)->addRow (arg1, arg2);
 }
@@ -123,9 +122,7 @@ static void _call_f_addRow_2548 (const qt_gsi::GenericMethod * /*decl*/, void *c
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
   QWidget *arg1 = gsi::arg_reader<QWidget * >() (args, heap);
-  qt_gsi::qt_keep (arg1);
   QLayout *arg2 = gsi::arg_reader<QLayout * >() (args, heap);
-  qt_gsi::qt_keep (arg2);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFormLayout *)cls)->addRow (arg1, arg2);
 }
@@ -149,7 +146,6 @@ static void _call_f_addRow_3232 (const qt_gsi::GenericMethod * /*decl*/, void *c
   tl::Heap heap;
   const QString &arg1 = gsi::arg_reader<const QString & >() (args, heap);
   QWidget *arg2 = gsi::arg_reader<QWidget * >() (args, heap);
-  qt_gsi::qt_keep (arg2);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFormLayout *)cls)->addRow (arg1, arg2);
 }
@@ -173,7 +169,6 @@ static void _call_f_addRow_3258 (const qt_gsi::GenericMethod * /*decl*/, void *c
   tl::Heap heap;
   const QString &arg1 = gsi::arg_reader<const QString & >() (args, heap);
   QLayout *arg2 = gsi::arg_reader<QLayout * >() (args, heap);
-  qt_gsi::qt_keep (arg2);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFormLayout *)cls)->addRow (arg1, arg2);
 }
@@ -194,7 +189,6 @@ static void _call_f_addRow_1315 (const qt_gsi::GenericMethod * /*decl*/, void *c
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
   QWidget *arg1 = gsi::arg_reader<QWidget * >() (args, heap);
-  qt_gsi::qt_keep (arg1);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFormLayout *)cls)->addRow (arg1);
 }
@@ -428,7 +422,6 @@ static void _call_f_insertRow_3181 (const qt_gsi::GenericMethod * /*decl*/, void
   int arg1 = gsi::arg_reader<int >() (args, heap);
   QWidget *arg2 = gsi::arg_reader<QWidget * >() (args, heap);
   QWidget *arg3 = gsi::arg_reader<QWidget * >() (args, heap);
-  qt_gsi::qt_keep (arg3);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFormLayout *)cls)->insertRow (arg1, arg2, arg3);
 }
@@ -455,7 +448,6 @@ static void _call_f_insertRow_3207 (const qt_gsi::GenericMethod * /*decl*/, void
   int arg1 = gsi::arg_reader<int >() (args, heap);
   QWidget *arg2 = gsi::arg_reader<QWidget * >() (args, heap);
   QLayout *arg3 = gsi::arg_reader<QLayout * >() (args, heap);
-  qt_gsi::qt_keep (arg3);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFormLayout *)cls)->insertRow (arg1, arg2, arg3);
 }
@@ -482,7 +474,6 @@ static void _call_f_insertRow_3891 (const qt_gsi::GenericMethod * /*decl*/, void
   int arg1 = gsi::arg_reader<int >() (args, heap);
   const QString &arg2 = gsi::arg_reader<const QString & >() (args, heap);
   QWidget *arg3 = gsi::arg_reader<QWidget * >() (args, heap);
-  qt_gsi::qt_keep (arg3);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFormLayout *)cls)->insertRow (arg1, arg2, arg3);
 }
@@ -509,7 +500,6 @@ static void _call_f_insertRow_3917 (const qt_gsi::GenericMethod * /*decl*/, void
   int arg1 = gsi::arg_reader<int >() (args, heap);
   const QString &arg2 = gsi::arg_reader<const QString & >() (args, heap);
   QLayout *arg3 = gsi::arg_reader<QLayout * >() (args, heap);
-  qt_gsi::qt_keep (arg3);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFormLayout *)cls)->insertRow (arg1, arg2, arg3);
 }
@@ -1009,7 +999,6 @@ static void _call_f_setWidget_4342 (const qt_gsi::GenericMethod * /*decl*/, void
   int arg1 = gsi::arg_reader<int >() (args, heap);
   const qt_gsi::Converter<QFormLayout::ItemRole>::target_type & arg2 = gsi::arg_reader<const qt_gsi::Converter<QFormLayout::ItemRole>::target_type & >() (args, heap);
   QWidget *arg3 = gsi::arg_reader<QWidget * >() (args, heap);
-  qt_gsi::qt_keep (arg3);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFormLayout *)cls)->setWidget (arg1, qt_gsi::QtToCppAdaptor<QFormLayout::ItemRole>(arg2).cref(), arg3);
 }

src/gsiqt/qt6/QtWidgets/gsiDeclQLayout.cc

@@ -465,7 +465,7 @@ static void _init_f_replaceWidget_5361 (qt_gsi::GenericMethod *decl)
   decl->add_arg<QWidget * > (argspec_1);
   static gsi::ArgSpecBase argspec_2 ("options", true, "Qt::FindChildrenRecursively");
   decl->add_arg<QFlags<Qt::FindChildOption> > (argspec_2);
-  decl->set_return<QLayoutItem * > ();
+  decl->set_return_new<QLayoutItem * > ();
 }
 
 static void _call_f_replaceWidget_5361 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) 

src/gsiqt/qt6/QtWidgets/gsiDeclQStackedLayout.cc

@@ -76,6 +76,7 @@ static void _call_f_addItem_1740 (const qt_gsi::GenericMethod * /*decl*/, void *
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
   QLayoutItem *arg1 = gsi::arg_reader<QLayoutItem * >() (args, heap);
+  qt_gsi::qt_keep (arg1);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QStackedLayout *)cls)->addItem (arg1);
 }