Overloaded base class methods also need to transfer ownership of arguments

scripts/mkqtdecl_common/produce.rb

@@ -2995,12 +2995,8 @@ END
             ofile.puts("static void _call_cbs_#{mn}_#{hk}_#{i_var} (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) ")
             ofile.puts("{")
             ofile.puts("  __SUPPRESS_UNUSED_WARNING(args);")
-            if !ant.empty?
-              ofile.puts("  tl::Heap heap;")
-            end
-            ant.each_with_index do |at,ia|
-              ofile.puts("  #{at.renamed_type(alist[ia]).gsi_decl_arg(decl_obj)} = args.read<#{at.gsi_decl_arg(decl_obj)} > (heap);")
-            end
+            produce_arg_read(ofile, decl_obj, func, alist, conf.kept_args(bd))
+            produce_keep_self(ofile, alist, "(#{cls} *)cls", conf.owner_args(bd))
             if !rt.is_void?
               ofile.puts("  ret.write<#{rt.gsi_decl_return(decl_obj)} > ((#{rt.gsi_decl_return(decl_obj)})((#{clsn}_Adaptor *)cls)->cbs_#{mn}_#{hk}_#{i_var} (#{alist.join(', ')}));")
             else

src/gsiqt/qt4/QtCore/gsiDeclQAbstractItemModel.cc

@@ -1964,7 +1964,7 @@ static void _call_cbs_buddy_c2395_0 (const qt_gsi::GenericMethod * /*decl*/, voi
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
   ret.write<QModelIndex > ((QModelIndex)((QAbstractItemModel_Adaptor *)cls)->cbs_buddy_c2395_0 (arg1));
 }
 
@@ -1987,7 +1987,7 @@ static void _call_cbs_canFetchMore_c2395_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
   ret.write<bool > ((bool)((QAbstractItemModel_Adaptor *)cls)->cbs_canFetchMore_c2395_0 (arg1));
 }
 
@@ -2054,7 +2054,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractItemModel_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -2078,7 +2078,7 @@ static void _call_cbs_columnCount_c2395_1 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
+  const QModelIndex &arg1 = args ? gsi::arg_reader<const QModelIndex & >() (args, heap) : gsi::arg_maker<const QModelIndex & >() (QModelIndex(), heap);
   ret.write<int > ((int)((QAbstractItemModel_Adaptor *)cls)->cbs_columnCount_c2395_1 (arg1));
 }
 
@@ -2173,7 +2173,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractItemModel_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -2199,8 +2199,8 @@ static void _call_cbs_data_c3054_1 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
-  int arg2 = args.read<int > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
+  int arg2 = args ? gsi::arg_reader<int >() (args, heap) : gsi::arg_maker<int >() (Qt::DisplayRole, heap);
   ret.write<QVariant > ((QVariant)((QAbstractItemModel_Adaptor *)cls)->cbs_data_c3054_1 (arg1, arg2));
 }
 
@@ -2289,7 +2289,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractItemModel_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -2321,11 +2321,11 @@ static void _call_cbs_dropMimeData_7425_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QMimeData *arg1 = args.read<const QMimeData * > (heap);
-  const qt_gsi::Converter<Qt::DropAction>::target_type & arg2 = args.read<const qt_gsi::Converter<Qt::DropAction>::target_type & > (heap);
-  int arg3 = args.read<int > (heap);
-  int arg4 = args.read<int > (heap);
-  const QModelIndex &arg5 = args.read<const QModelIndex & > (heap);
+  const QMimeData *arg1 = gsi::arg_reader<const QMimeData * >() (args, heap);
+  const qt_gsi::Converter<Qt::DropAction>::target_type & arg2 = gsi::arg_reader<const qt_gsi::Converter<Qt::DropAction>::target_type & >() (args, heap);
+  int arg3 = gsi::arg_reader<int >() (args, heap);
+  int arg4 = gsi::arg_reader<int >() (args, heap);
+  const QModelIndex &arg5 = gsi::arg_reader<const QModelIndex & >() (args, heap);
   ret.write<bool > ((bool)((QAbstractItemModel_Adaptor *)cls)->cbs_dropMimeData_7425_0 (arg1, arg2, arg3, arg4, arg5));
 }
 
@@ -2475,7 +2475,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QAbstractItemModel_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -2500,8 +2500,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QAbstractItemModel_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -2524,7 +2524,7 @@ static void _call_cbs_fetchMore_2395_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractItemModel_Adaptor *)cls)->cbs_fetchMore_2395_0 (arg1);
 }
@@ -2548,7 +2548,7 @@ static void _call_cbs_flags_c2395_0 (const qt_gsi::GenericMethod * /*decl*/, voi
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
   ret.write<QFlags<Qt::ItemFlag> > ((QFlags<Qt::ItemFlag>)((QAbstractItemModel_Adaptor *)cls)->cbs_flags_c2395_0 (arg1));
 }
 
@@ -2571,7 +2571,7 @@ static void _call_cbs_hasChildren_c2395_1 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
+  const QModelIndex &arg1 = args ? gsi::arg_reader<const QModelIndex & >() (args, heap) : gsi::arg_maker<const QModelIndex & >() (QModelIndex(), heap);
   ret.write<bool > ((bool)((QAbstractItemModel_Adaptor *)cls)->cbs_hasChildren_c2395_1 (arg1));
 }
 
@@ -2598,9 +2598,9 @@ static void _call_cbs_headerData_c3231_1 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
-  const qt_gsi::Converter<Qt::Orientation>::target_type & arg2 = args.read<const qt_gsi::Converter<Qt::Orientation>::target_type & > (heap);
-  int arg3 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
+  const qt_gsi::Converter<Qt::Orientation>::target_type & arg2 = gsi::arg_reader<const qt_gsi::Converter<Qt::Orientation>::target_type & >() (args, heap);
+  int arg3 = args ? gsi::arg_reader<int >() (args, heap) : gsi::arg_maker<int >() (Qt::DisplayRole, heap);
   ret.write<QVariant > ((QVariant)((QAbstractItemModel_Adaptor *)cls)->cbs_headerData_c3231_1 (arg1, arg2, arg3));
 }
 
@@ -2651,9 +2651,9 @@ static void _call_cbs_index_c3713_1 (const qt_gsi::GenericMethod * /*decl*/, voi
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
-  int arg2 = args.read<int > (heap);
-  const QModelIndex &arg3 = args.read<const QModelIndex & > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
+  int arg2 = gsi::arg_reader<int >() (args, heap);
+  const QModelIndex &arg3 = args ? gsi::arg_reader<const QModelIndex & >() (args, heap) : gsi::arg_maker<const QModelIndex & >() (QModelIndex(), heap);
   ret.write<QModelIndex > ((QModelIndex)((QAbstractItemModel_Adaptor *)cls)->cbs_index_c3713_1 (arg1, arg2, arg3));
 }
 
@@ -2680,9 +2680,9 @@ static void _call_cbs_insertColumns_3713_1 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
-  int arg2 = args.read<int > (heap);
-  const QModelIndex &arg3 = args.read<const QModelIndex & > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
+  int arg2 = gsi::arg_reader<int >() (args, heap);
+  const QModelIndex &arg3 = args ? gsi::arg_reader<const QModelIndex & >() (args, heap) : gsi::arg_maker<const QModelIndex & >() (QModelIndex(), heap);
   ret.write<bool > ((bool)((QAbstractItemModel_Adaptor *)cls)->cbs_insertColumns_3713_1 (arg1, arg2, arg3));
 }
 
@@ -2709,9 +2709,9 @@ static void _call_cbs_insertRows_3713_1 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
-  int arg2 = args.read<int > (heap);
-  const QModelIndex &arg3 = args.read<const QModelIndex & > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
+  int arg2 = gsi::arg_reader<int >() (args, heap);
+  const QModelIndex &arg3 = args ? gsi::arg_reader<const QModelIndex & >() (args, heap) : gsi::arg_maker<const QModelIndex & >() (QModelIndex(), heap);
   ret.write<bool > ((bool)((QAbstractItemModel_Adaptor *)cls)->cbs_insertRows_3713_1 (arg1, arg2, arg3));
 }
 
@@ -2734,7 +2734,7 @@ static void _call_cbs_itemData_c2395_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
   ret.write<QMap<int, QVariant> > ((QMap<int, QVariant>)((QAbstractItemModel_Adaptor *)cls)->cbs_itemData_c2395_0 (arg1));
 }
 
@@ -2793,11 +2793,11 @@ static void _call_cbs_match_c7932_2 (const qt_gsi::GenericMethod * /*decl*/, voi
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
-  int arg2 = args.read<int > (heap);
-  const QVariant &arg3 = args.read<const QVariant & > (heap);
-  int arg4 = args.read<int > (heap);
-  QFlags<Qt::MatchFlag> arg5 = args.read<QFlags<Qt::MatchFlag> > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
+  int arg2 = gsi::arg_reader<int >() (args, heap);
+  const QVariant &arg3 = gsi::arg_reader<const QVariant & >() (args, heap);
+  int arg4 = args ? gsi::arg_reader<int >() (args, heap) : gsi::arg_maker<int >() (1, heap);
+  QFlags<Qt::MatchFlag> arg5 = args ? gsi::arg_reader<QFlags<Qt::MatchFlag> >() (args, heap) : gsi::arg_maker<QFlags<Qt::MatchFlag> >() (Qt::MatchFlags(Qt::MatchStartsWith|Qt::MatchWrap), heap);
   ret.write<QList<QModelIndex> > ((QList<QModelIndex>)((QAbstractItemModel_Adaptor *)cls)->cbs_match_c7932_2 (arg1, arg2, arg3, arg4, arg5));
 }
 
@@ -2820,7 +2820,7 @@ static void _call_cbs_mimeData_c3010_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QList<QModelIndex> &arg1 = args.read<const QList<QModelIndex> & > (heap);
+  const QList<QModelIndex> &arg1 = gsi::arg_reader<const QList<QModelIndex> & >() (args, heap);
   ret.write<QMimeData * > ((QMimeData *)((QAbstractItemModel_Adaptor *)cls)->cbs_mimeData_c3010_0 (arg1));
 }
 
@@ -2862,7 +2862,7 @@ static void _call_cbs_parent_c2395_0 (const qt_gsi::GenericMethod * /*decl*/, vo
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
   ret.write<QModelIndex > ((QModelIndex)((QAbstractItemModel_Adaptor *)cls)->cbs_parent_c2395_0 (arg1));
 }
 
@@ -2921,9 +2921,9 @@ static void _call_cbs_removeColumns_3713_1 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
-  int arg2 = args.read<int > (heap);
-  const QModelIndex &arg3 = args.read<const QModelIndex & > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
+  int arg2 = gsi::arg_reader<int >() (args, heap);
+  const QModelIndex &arg3 = args ? gsi::arg_reader<const QModelIndex & >() (args, heap) : gsi::arg_maker<const QModelIndex & >() (QModelIndex(), heap);
   ret.write<bool > ((bool)((QAbstractItemModel_Adaptor *)cls)->cbs_removeColumns_3713_1 (arg1, arg2, arg3));
 }
 
@@ -2950,9 +2950,9 @@ static void _call_cbs_removeRows_3713_1 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
-  int arg2 = args.read<int > (heap);
-  const QModelIndex &arg3 = args.read<const QModelIndex & > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
+  int arg2 = gsi::arg_reader<int >() (args, heap);
+  const QModelIndex &arg3 = args ? gsi::arg_reader<const QModelIndex & >() (args, heap) : gsi::arg_maker<const QModelIndex & >() (QModelIndex(), heap);
   ret.write<bool > ((bool)((QAbstractItemModel_Adaptor *)cls)->cbs_removeRows_3713_1 (arg1, arg2, arg3));
 }
 
@@ -3010,7 +3010,7 @@ static void _call_cbs_rowCount_c2395_1 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
+  const QModelIndex &arg1 = args ? gsi::arg_reader<const QModelIndex & >() (args, heap) : gsi::arg_maker<const QModelIndex & >() (QModelIndex(), heap);
   ret.write<int > ((int)((QAbstractItemModel_Adaptor *)cls)->cbs_rowCount_c2395_1 (arg1));
 }
 
@@ -3051,9 +3051,9 @@ static void _call_cbs_setData_5065_1 (const qt_gsi::GenericMethod * /*decl*/, vo
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
-  const QVariant &arg2 = args.read<const QVariant & > (heap);
-  int arg3 = args.read<int > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
+  const QVariant &arg2 = gsi::arg_reader<const QVariant & >() (args, heap);
+  int arg3 = args ? gsi::arg_reader<int >() (args, heap) : gsi::arg_maker<int >() (Qt::EditRole, heap);
   ret.write<bool > ((bool)((QAbstractItemModel_Adaptor *)cls)->cbs_setData_5065_1 (arg1, arg2, arg3));
 }
 
@@ -3082,10 +3082,10 @@ static void _call_cbs_setHeaderData_5242_1 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
-  const qt_gsi::Converter<Qt::Orientation>::target_type & arg2 = args.read<const qt_gsi::Converter<Qt::Orientation>::target_type & > (heap);
-  const QVariant &arg3 = args.read<const QVariant & > (heap);
-  int arg4 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
+  const qt_gsi::Converter<Qt::Orientation>::target_type & arg2 = gsi::arg_reader<const qt_gsi::Converter<Qt::Orientation>::target_type & >() (args, heap);
+  const QVariant &arg3 = gsi::arg_reader<const QVariant & >() (args, heap);
+  int arg4 = args ? gsi::arg_reader<int >() (args, heap) : gsi::arg_maker<int >() (Qt::EditRole, heap);
   ret.write<bool > ((bool)((QAbstractItemModel_Adaptor *)cls)->cbs_setHeaderData_5242_1 (arg1, arg2, arg3, arg4));
 }
 
@@ -3110,8 +3110,8 @@ static void _call_cbs_setItemData_5414_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
-  const QMap<int, QVariant> &arg2 = args.read<const QMap<int, QVariant> & > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
+  const QMap<int, QVariant> &arg2 = gsi::arg_reader<const QMap<int, QVariant> & >() (args, heap);
   ret.write<bool > ((bool)((QAbstractItemModel_Adaptor *)cls)->cbs_setItemData_5414_0 (arg1, arg2));
 }
 
@@ -3155,8 +3155,8 @@ static void _call_cbs_sort_2340_1 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
-  const qt_gsi::Converter<Qt::SortOrder>::target_type & arg2 = args.read<const qt_gsi::Converter<Qt::SortOrder>::target_type & > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
+  const qt_gsi::Converter<Qt::SortOrder>::target_type & arg2 = args ? gsi::arg_reader<const qt_gsi::Converter<Qt::SortOrder>::target_type & >() (args, heap) : gsi::arg_maker<const qt_gsi::Converter<Qt::SortOrder>::target_type & >() (qt_gsi::CppToQtReadAdaptor<Qt::SortOrder>(heap, Qt::AscendingOrder), heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractItemModel_Adaptor *)cls)->cbs_sort_2340_1 (arg1, arg2);
 }
@@ -3180,7 +3180,7 @@ static void _call_cbs_span_c2395_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
   ret.write<QSize > ((QSize)((QAbstractItemModel_Adaptor *)cls)->cbs_span_c2395_0 (arg1));
 }
 
@@ -3241,7 +3241,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractItemModel_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }

src/gsiqt/qt4/QtCore/gsiDeclQAbstractListModel.cc

@@ -1125,7 +1125,7 @@ static void _call_cbs_buddy_c2395_0 (const qt_gsi::GenericMethod * /*decl*/, voi
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
   ret.write<QModelIndex > ((QModelIndex)((QAbstractListModel_Adaptor *)cls)->cbs_buddy_c2395_0 (arg1));
 }
 
@@ -1148,7 +1148,7 @@ static void _call_cbs_canFetchMore_c2395_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
   ret.write<bool > ((bool)((QAbstractListModel_Adaptor *)cls)->cbs_canFetchMore_c2395_0 (arg1));
 }
 
@@ -1215,7 +1215,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractListModel_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -1311,7 +1311,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractListModel_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -1337,8 +1337,8 @@ static void _call_cbs_data_c3054_1 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
-  int arg2 = args.read<int > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
+  int arg2 = args ? gsi::arg_reader<int >() (args, heap) : gsi::arg_maker<int >() (Qt::DisplayRole, heap);
   ret.write<QVariant > ((QVariant)((QAbstractListModel_Adaptor *)cls)->cbs_data_c3054_1 (arg1, arg2));
 }
 
@@ -1427,7 +1427,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractListModel_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -1459,11 +1459,11 @@ static void _call_cbs_dropMimeData_7425_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QMimeData *arg1 = args.read<const QMimeData * > (heap);
-  const qt_gsi::Converter<Qt::DropAction>::target_type & arg2 = args.read<const qt_gsi::Converter<Qt::DropAction>::target_type & > (heap);
-  int arg3 = args.read<int > (heap);
-  int arg4 = args.read<int > (heap);
-  const QModelIndex &arg5 = args.read<const QModelIndex & > (heap);
+  const QMimeData *arg1 = gsi::arg_reader<const QMimeData * >() (args, heap);
+  const qt_gsi::Converter<Qt::DropAction>::target_type & arg2 = gsi::arg_reader<const qt_gsi::Converter<Qt::DropAction>::target_type & >() (args, heap);
+  int arg3 = gsi::arg_reader<int >() (args, heap);
+  int arg4 = gsi::arg_reader<int >() (args, heap);
+  const QModelIndex &arg5 = gsi::arg_reader<const QModelIndex & >() (args, heap);
   ret.write<bool > ((bool)((QAbstractListModel_Adaptor *)cls)->cbs_dropMimeData_7425_0 (arg1, arg2, arg3, arg4, arg5));
 }
 
@@ -1613,7 +1613,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QAbstractListModel_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -1638,8 +1638,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QAbstractListModel_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -1662,7 +1662,7 @@ static void _call_cbs_fetchMore_2395_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractListModel_Adaptor *)cls)->cbs_fetchMore_2395_0 (arg1);
 }
@@ -1686,7 +1686,7 @@ static void _call_cbs_flags_c2395_0 (const qt_gsi::GenericMethod * /*decl*/, voi
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
   ret.write<QFlags<Qt::ItemFlag> > ((QFlags<Qt::ItemFlag>)((QAbstractListModel_Adaptor *)cls)->cbs_flags_c2395_0 (arg1));
 }
 
@@ -1713,9 +1713,9 @@ static void _call_cbs_headerData_c3231_1 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
-  const qt_gsi::Converter<Qt::Orientation>::target_type & arg2 = args.read<const qt_gsi::Converter<Qt::Orientation>::target_type & > (heap);
-  int arg3 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
+  const qt_gsi::Converter<Qt::Orientation>::target_type & arg2 = gsi::arg_reader<const qt_gsi::Converter<Qt::Orientation>::target_type & >() (args, heap);
+  int arg3 = args ? gsi::arg_reader<int >() (args, heap) : gsi::arg_maker<int >() (Qt::DisplayRole, heap);
   ret.write<QVariant > ((QVariant)((QAbstractListModel_Adaptor *)cls)->cbs_headerData_c3231_1 (arg1, arg2, arg3));
 }
 
@@ -1766,9 +1766,9 @@ static void _call_cbs_index_c3713_2 (const qt_gsi::GenericMethod * /*decl*/, voi
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
-  int arg2 = args.read<int > (heap);
-  const QModelIndex &arg3 = args.read<const QModelIndex & > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
+  int arg2 = args ? gsi::arg_reader<int >() (args, heap) : gsi::arg_maker<int >() (0, heap);
+  const QModelIndex &arg3 = args ? gsi::arg_reader<const QModelIndex & >() (args, heap) : gsi::arg_maker<const QModelIndex & >() (QModelIndex(), heap);
   ret.write<QModelIndex > ((QModelIndex)((QAbstractListModel_Adaptor *)cls)->cbs_index_c3713_2 (arg1, arg2, arg3));
 }
 
@@ -1795,9 +1795,9 @@ static void _call_cbs_insertColumns_3713_1 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
-  int arg2 = args.read<int > (heap);
-  const QModelIndex &arg3 = args.read<const QModelIndex & > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
+  int arg2 = gsi::arg_reader<int >() (args, heap);
+  const QModelIndex &arg3 = args ? gsi::arg_reader<const QModelIndex & >() (args, heap) : gsi::arg_maker<const QModelIndex & >() (QModelIndex(), heap);
   ret.write<bool > ((bool)((QAbstractListModel_Adaptor *)cls)->cbs_insertColumns_3713_1 (arg1, arg2, arg3));
 }
 
@@ -1824,9 +1824,9 @@ static void _call_cbs_insertRows_3713_1 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
-  int arg2 = args.read<int > (heap);
-  const QModelIndex &arg3 = args.read<const QModelIndex & > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
+  int arg2 = gsi::arg_reader<int >() (args, heap);
+  const QModelIndex &arg3 = args ? gsi::arg_reader<const QModelIndex & >() (args, heap) : gsi::arg_maker<const QModelIndex & >() (QModelIndex(), heap);
   ret.write<bool > ((bool)((QAbstractListModel_Adaptor *)cls)->cbs_insertRows_3713_1 (arg1, arg2, arg3));
 }
 
@@ -1849,7 +1849,7 @@ static void _call_cbs_itemData_c2395_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
   ret.write<QMap<int, QVariant> > ((QMap<int, QVariant>)((QAbstractListModel_Adaptor *)cls)->cbs_itemData_c2395_0 (arg1));
 }
 
@@ -1908,11 +1908,11 @@ static void _call_cbs_match_c7932_2 (const qt_gsi::GenericMethod * /*decl*/, voi
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
-  int arg2 = args.read<int > (heap);
-  const QVariant &arg3 = args.read<const QVariant & > (heap);
-  int arg4 = args.read<int > (heap);
-  QFlags<Qt::MatchFlag> arg5 = args.read<QFlags<Qt::MatchFlag> > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
+  int arg2 = gsi::arg_reader<int >() (args, heap);
+  const QVariant &arg3 = gsi::arg_reader<const QVariant & >() (args, heap);
+  int arg4 = args ? gsi::arg_reader<int >() (args, heap) : gsi::arg_maker<int >() (1, heap);
+  QFlags<Qt::MatchFlag> arg5 = args ? gsi::arg_reader<QFlags<Qt::MatchFlag> >() (args, heap) : gsi::arg_maker<QFlags<Qt::MatchFlag> >() (Qt::MatchFlags(Qt::MatchStartsWith|Qt::MatchWrap), heap);
   ret.write<QList<QModelIndex> > ((QList<QModelIndex>)((QAbstractListModel_Adaptor *)cls)->cbs_match_c7932_2 (arg1, arg2, arg3, arg4, arg5));
 }
 
@@ -1935,7 +1935,7 @@ static void _call_cbs_mimeData_c3010_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QList<QModelIndex> &arg1 = args.read<const QList<QModelIndex> & > (heap);
+  const QList<QModelIndex> &arg1 = gsi::arg_reader<const QList<QModelIndex> & >() (args, heap);
   ret.write<QMimeData * > ((QMimeData *)((QAbstractListModel_Adaptor *)cls)->cbs_mimeData_c3010_0 (arg1));
 }
 
@@ -2013,9 +2013,9 @@ static void _call_cbs_removeColumns_3713_1 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
-  int arg2 = args.read<int > (heap);
-  const QModelIndex &arg3 = args.read<const QModelIndex & > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
+  int arg2 = gsi::arg_reader<int >() (args, heap);
+  const QModelIndex &arg3 = args ? gsi::arg_reader<const QModelIndex & >() (args, heap) : gsi::arg_maker<const QModelIndex & >() (QModelIndex(), heap);
   ret.write<bool > ((bool)((QAbstractListModel_Adaptor *)cls)->cbs_removeColumns_3713_1 (arg1, arg2, arg3));
 }
 
@@ -2042,9 +2042,9 @@ static void _call_cbs_removeRows_3713_1 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
-  int arg2 = args.read<int > (heap);
-  const QModelIndex &arg3 = args.read<const QModelIndex & > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
+  int arg2 = gsi::arg_reader<int >() (args, heap);
+  const QModelIndex &arg3 = args ? gsi::arg_reader<const QModelIndex & >() (args, heap) : gsi::arg_maker<const QModelIndex & >() (QModelIndex(), heap);
   ret.write<bool > ((bool)((QAbstractListModel_Adaptor *)cls)->cbs_removeRows_3713_1 (arg1, arg2, arg3));
 }
 
@@ -2102,7 +2102,7 @@ static void _call_cbs_rowCount_c2395_1 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
+  const QModelIndex &arg1 = args ? gsi::arg_reader<const QModelIndex & >() (args, heap) : gsi::arg_maker<const QModelIndex & >() (QModelIndex(), heap);
   ret.write<int > ((int)((QAbstractListModel_Adaptor *)cls)->cbs_rowCount_c2395_1 (arg1));
 }
 
@@ -2143,9 +2143,9 @@ static void _call_cbs_setData_5065_1 (const qt_gsi::GenericMethod * /*decl*/, vo
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
-  const QVariant &arg2 = args.read<const QVariant & > (heap);
-  int arg3 = args.read<int > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
+  const QVariant &arg2 = gsi::arg_reader<const QVariant & >() (args, heap);
+  int arg3 = args ? gsi::arg_reader<int >() (args, heap) : gsi::arg_maker<int >() (Qt::EditRole, heap);
   ret.write<bool > ((bool)((QAbstractListModel_Adaptor *)cls)->cbs_setData_5065_1 (arg1, arg2, arg3));
 }
 
@@ -2174,10 +2174,10 @@ static void _call_cbs_setHeaderData_5242_1 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
-  const qt_gsi::Converter<Qt::Orientation>::target_type & arg2 = args.read<const qt_gsi::Converter<Qt::Orientation>::target_type & > (heap);
-  const QVariant &arg3 = args.read<const QVariant & > (heap);
-  int arg4 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
+  const qt_gsi::Converter<Qt::Orientation>::target_type & arg2 = gsi::arg_reader<const qt_gsi::Converter<Qt::Orientation>::target_type & >() (args, heap);
+  const QVariant &arg3 = gsi::arg_reader<const QVariant & >() (args, heap);
+  int arg4 = args ? gsi::arg_reader<int >() (args, heap) : gsi::arg_maker<int >() (Qt::EditRole, heap);
   ret.write<bool > ((bool)((QAbstractListModel_Adaptor *)cls)->cbs_setHeaderData_5242_1 (arg1, arg2, arg3, arg4));
 }
 
@@ -2202,8 +2202,8 @@ static void _call_cbs_setItemData_5414_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
-  const QMap<int, QVariant> &arg2 = args.read<const QMap<int, QVariant> & > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
+  const QMap<int, QVariant> &arg2 = gsi::arg_reader<const QMap<int, QVariant> & >() (args, heap);
   ret.write<bool > ((bool)((QAbstractListModel_Adaptor *)cls)->cbs_setItemData_5414_0 (arg1, arg2));
 }
 
@@ -2247,8 +2247,8 @@ static void _call_cbs_sort_2340_1 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
-  const qt_gsi::Converter<Qt::SortOrder>::target_type & arg2 = args.read<const qt_gsi::Converter<Qt::SortOrder>::target_type & > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
+  const qt_gsi::Converter<Qt::SortOrder>::target_type & arg2 = args ? gsi::arg_reader<const qt_gsi::Converter<Qt::SortOrder>::target_type & >() (args, heap) : gsi::arg_maker<const qt_gsi::Converter<Qt::SortOrder>::target_type & >() (qt_gsi::CppToQtReadAdaptor<Qt::SortOrder>(heap, Qt::AscendingOrder), heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractListModel_Adaptor *)cls)->cbs_sort_2340_1 (arg1, arg2);
 }
@@ -2272,7 +2272,7 @@ static void _call_cbs_span_c2395_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
   ret.write<QSize > ((QSize)((QAbstractListModel_Adaptor *)cls)->cbs_span_c2395_0 (arg1));
 }
 
@@ -2333,7 +2333,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractListModel_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }

src/gsiqt/qt4/QtCore/gsiDeclQAbstractTableModel.cc

@@ -1142,7 +1142,7 @@ static void _call_cbs_buddy_c2395_0 (const qt_gsi::GenericMethod * /*decl*/, voi
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
   ret.write<QModelIndex > ((QModelIndex)((QAbstractTableModel_Adaptor *)cls)->cbs_buddy_c2395_0 (arg1));
 }
 
@@ -1165,7 +1165,7 @@ static void _call_cbs_canFetchMore_c2395_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
   ret.write<bool > ((bool)((QAbstractTableModel_Adaptor *)cls)->cbs_canFetchMore_c2395_0 (arg1));
 }
 
@@ -1232,7 +1232,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractTableModel_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -1256,7 +1256,7 @@ static void _call_cbs_columnCount_c2395_1 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
+  const QModelIndex &arg1 = args ? gsi::arg_reader<const QModelIndex & >() (args, heap) : gsi::arg_maker<const QModelIndex & >() (QModelIndex(), heap);
   ret.write<int > ((int)((QAbstractTableModel_Adaptor *)cls)->cbs_columnCount_c2395_1 (arg1));
 }
 
@@ -1351,7 +1351,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractTableModel_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -1377,8 +1377,8 @@ static void _call_cbs_data_c3054_1 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
-  int arg2 = args.read<int > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
+  int arg2 = args ? gsi::arg_reader<int >() (args, heap) : gsi::arg_maker<int >() (Qt::DisplayRole, heap);
   ret.write<QVariant > ((QVariant)((QAbstractTableModel_Adaptor *)cls)->cbs_data_c3054_1 (arg1, arg2));
 }
 
@@ -1467,7 +1467,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractTableModel_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -1499,11 +1499,11 @@ static void _call_cbs_dropMimeData_7425_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QMimeData *arg1 = args.read<const QMimeData * > (heap);
-  const qt_gsi::Converter<Qt::DropAction>::target_type & arg2 = args.read<const qt_gsi::Converter<Qt::DropAction>::target_type & > (heap);
-  int arg3 = args.read<int > (heap);
-  int arg4 = args.read<int > (heap);
-  const QModelIndex &arg5 = args.read<const QModelIndex & > (heap);
+  const QMimeData *arg1 = gsi::arg_reader<const QMimeData * >() (args, heap);
+  const qt_gsi::Converter<Qt::DropAction>::target_type & arg2 = gsi::arg_reader<const qt_gsi::Converter<Qt::DropAction>::target_type & >() (args, heap);
+  int arg3 = gsi::arg_reader<int >() (args, heap);
+  int arg4 = gsi::arg_reader<int >() (args, heap);
+  const QModelIndex &arg5 = gsi::arg_reader<const QModelIndex & >() (args, heap);
   ret.write<bool > ((bool)((QAbstractTableModel_Adaptor *)cls)->cbs_dropMimeData_7425_0 (arg1, arg2, arg3, arg4, arg5));
 }
 
@@ -1653,7 +1653,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QAbstractTableModel_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -1678,8 +1678,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QAbstractTableModel_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -1702,7 +1702,7 @@ static void _call_cbs_fetchMore_2395_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractTableModel_Adaptor *)cls)->cbs_fetchMore_2395_0 (arg1);
 }
@@ -1726,7 +1726,7 @@ static void _call_cbs_flags_c2395_0 (const qt_gsi::GenericMethod * /*decl*/, voi
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
   ret.write<QFlags<Qt::ItemFlag> > ((QFlags<Qt::ItemFlag>)((QAbstractTableModel_Adaptor *)cls)->cbs_flags_c2395_0 (arg1));
 }
 
@@ -1753,9 +1753,9 @@ static void _call_cbs_headerData_c3231_1 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
-  const qt_gsi::Converter<Qt::Orientation>::target_type & arg2 = args.read<const qt_gsi::Converter<Qt::Orientation>::target_type & > (heap);
-  int arg3 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
+  const qt_gsi::Converter<Qt::Orientation>::target_type & arg2 = gsi::arg_reader<const qt_gsi::Converter<Qt::Orientation>::target_type & >() (args, heap);
+  int arg3 = args ? gsi::arg_reader<int >() (args, heap) : gsi::arg_maker<int >() (Qt::DisplayRole, heap);
   ret.write<QVariant > ((QVariant)((QAbstractTableModel_Adaptor *)cls)->cbs_headerData_c3231_1 (arg1, arg2, arg3));
 }
 
@@ -1806,9 +1806,9 @@ static void _call_cbs_index_c3713_1 (const qt_gsi::GenericMethod * /*decl*/, voi
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
-  int arg2 = args.read<int > (heap);
-  const QModelIndex &arg3 = args.read<const QModelIndex & > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
+  int arg2 = gsi::arg_reader<int >() (args, heap);
+  const QModelIndex &arg3 = args ? gsi::arg_reader<const QModelIndex & >() (args, heap) : gsi::arg_maker<const QModelIndex & >() (QModelIndex(), heap);
   ret.write<QModelIndex > ((QModelIndex)((QAbstractTableModel_Adaptor *)cls)->cbs_index_c3713_1 (arg1, arg2, arg3));
 }
 
@@ -1835,9 +1835,9 @@ static void _call_cbs_insertColumns_3713_1 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
-  int arg2 = args.read<int > (heap);
-  const QModelIndex &arg3 = args.read<const QModelIndex & > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
+  int arg2 = gsi::arg_reader<int >() (args, heap);
+  const QModelIndex &arg3 = args ? gsi::arg_reader<const QModelIndex & >() (args, heap) : gsi::arg_maker<const QModelIndex & >() (QModelIndex(), heap);
   ret.write<bool > ((bool)((QAbstractTableModel_Adaptor *)cls)->cbs_insertColumns_3713_1 (arg1, arg2, arg3));
 }
 
@@ -1864,9 +1864,9 @@ static void _call_cbs_insertRows_3713_1 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
-  int arg2 = args.read<int > (heap);
-  const QModelIndex &arg3 = args.read<const QModelIndex & > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
+  int arg2 = gsi::arg_reader<int >() (args, heap);
+  const QModelIndex &arg3 = args ? gsi::arg_reader<const QModelIndex & >() (args, heap) : gsi::arg_maker<const QModelIndex & >() (QModelIndex(), heap);
   ret.write<bool > ((bool)((QAbstractTableModel_Adaptor *)cls)->cbs_insertRows_3713_1 (arg1, arg2, arg3));
 }
 
@@ -1889,7 +1889,7 @@ static void _call_cbs_itemData_c2395_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
   ret.write<QMap<int, QVariant> > ((QMap<int, QVariant>)((QAbstractTableModel_Adaptor *)cls)->cbs_itemData_c2395_0 (arg1));
 }
 
@@ -1948,11 +1948,11 @@ static void _call_cbs_match_c7932_2 (const qt_gsi::GenericMethod * /*decl*/, voi
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
-  int arg2 = args.read<int > (heap);
-  const QVariant &arg3 = args.read<const QVariant & > (heap);
-  int arg4 = args.read<int > (heap);
-  QFlags<Qt::MatchFlag> arg5 = args.read<QFlags<Qt::MatchFlag> > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
+  int arg2 = gsi::arg_reader<int >() (args, heap);
+  const QVariant &arg3 = gsi::arg_reader<const QVariant & >() (args, heap);
+  int arg4 = args ? gsi::arg_reader<int >() (args, heap) : gsi::arg_maker<int >() (1, heap);
+  QFlags<Qt::MatchFlag> arg5 = args ? gsi::arg_reader<QFlags<Qt::MatchFlag> >() (args, heap) : gsi::arg_maker<QFlags<Qt::MatchFlag> >() (Qt::MatchFlags(Qt::MatchStartsWith|Qt::MatchWrap), heap);
   ret.write<QList<QModelIndex> > ((QList<QModelIndex>)((QAbstractTableModel_Adaptor *)cls)->cbs_match_c7932_2 (arg1, arg2, arg3, arg4, arg5));
 }
 
@@ -1975,7 +1975,7 @@ static void _call_cbs_mimeData_c3010_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QList<QModelIndex> &arg1 = args.read<const QList<QModelIndex> & > (heap);
+  const QList<QModelIndex> &arg1 = gsi::arg_reader<const QList<QModelIndex> & >() (args, heap);
   ret.write<QMimeData * > ((QMimeData *)((QAbstractTableModel_Adaptor *)cls)->cbs_mimeData_c3010_0 (arg1));
 }
 
@@ -2053,9 +2053,9 @@ static void _call_cbs_removeColumns_3713_1 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
-  int arg2 = args.read<int > (heap);
-  const QModelIndex &arg3 = args.read<const QModelIndex & > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
+  int arg2 = gsi::arg_reader<int >() (args, heap);
+  const QModelIndex &arg3 = args ? gsi::arg_reader<const QModelIndex & >() (args, heap) : gsi::arg_maker<const QModelIndex & >() (QModelIndex(), heap);
   ret.write<bool > ((bool)((QAbstractTableModel_Adaptor *)cls)->cbs_removeColumns_3713_1 (arg1, arg2, arg3));
 }
 
@@ -2082,9 +2082,9 @@ static void _call_cbs_removeRows_3713_1 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
-  int arg2 = args.read<int > (heap);
-  const QModelIndex &arg3 = args.read<const QModelIndex & > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
+  int arg2 = gsi::arg_reader<int >() (args, heap);
+  const QModelIndex &arg3 = args ? gsi::arg_reader<const QModelIndex & >() (args, heap) : gsi::arg_maker<const QModelIndex & >() (QModelIndex(), heap);
   ret.write<bool > ((bool)((QAbstractTableModel_Adaptor *)cls)->cbs_removeRows_3713_1 (arg1, arg2, arg3));
 }
 
@@ -2142,7 +2142,7 @@ static void _call_cbs_rowCount_c2395_1 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
+  const QModelIndex &arg1 = args ? gsi::arg_reader<const QModelIndex & >() (args, heap) : gsi::arg_maker<const QModelIndex & >() (QModelIndex(), heap);
   ret.write<int > ((int)((QAbstractTableModel_Adaptor *)cls)->cbs_rowCount_c2395_1 (arg1));
 }
 
@@ -2183,9 +2183,9 @@ static void _call_cbs_setData_5065_1 (const qt_gsi::GenericMethod * /*decl*/, vo
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
-  const QVariant &arg2 = args.read<const QVariant & > (heap);
-  int arg3 = args.read<int > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
+  const QVariant &arg2 = gsi::arg_reader<const QVariant & >() (args, heap);
+  int arg3 = args ? gsi::arg_reader<int >() (args, heap) : gsi::arg_maker<int >() (Qt::EditRole, heap);
   ret.write<bool > ((bool)((QAbstractTableModel_Adaptor *)cls)->cbs_setData_5065_1 (arg1, arg2, arg3));
 }
 
@@ -2214,10 +2214,10 @@ static void _call_cbs_setHeaderData_5242_1 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
-  const qt_gsi::Converter<Qt::Orientation>::target_type & arg2 = args.read<const qt_gsi::Converter<Qt::Orientation>::target_type & > (heap);
-  const QVariant &arg3 = args.read<const QVariant & > (heap);
-  int arg4 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
+  const qt_gsi::Converter<Qt::Orientation>::target_type & arg2 = gsi::arg_reader<const qt_gsi::Converter<Qt::Orientation>::target_type & >() (args, heap);
+  const QVariant &arg3 = gsi::arg_reader<const QVariant & >() (args, heap);
+  int arg4 = args ? gsi::arg_reader<int >() (args, heap) : gsi::arg_maker<int >() (Qt::EditRole, heap);
   ret.write<bool > ((bool)((QAbstractTableModel_Adaptor *)cls)->cbs_setHeaderData_5242_1 (arg1, arg2, arg3, arg4));
 }
 
@@ -2242,8 +2242,8 @@ static void _call_cbs_setItemData_5414_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
-  const QMap<int, QVariant> &arg2 = args.read<const QMap<int, QVariant> & > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
+  const QMap<int, QVariant> &arg2 = gsi::arg_reader<const QMap<int, QVariant> & >() (args, heap);
   ret.write<bool > ((bool)((QAbstractTableModel_Adaptor *)cls)->cbs_setItemData_5414_0 (arg1, arg2));
 }
 
@@ -2287,8 +2287,8 @@ static void _call_cbs_sort_2340_1 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
-  const qt_gsi::Converter<Qt::SortOrder>::target_type & arg2 = args.read<const qt_gsi::Converter<Qt::SortOrder>::target_type & > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
+  const qt_gsi::Converter<Qt::SortOrder>::target_type & arg2 = args ? gsi::arg_reader<const qt_gsi::Converter<Qt::SortOrder>::target_type & >() (args, heap) : gsi::arg_maker<const qt_gsi::Converter<Qt::SortOrder>::target_type & >() (qt_gsi::CppToQtReadAdaptor<Qt::SortOrder>(heap, Qt::AscendingOrder), heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractTableModel_Adaptor *)cls)->cbs_sort_2340_1 (arg1, arg2);
 }
@@ -2312,7 +2312,7 @@ static void _call_cbs_span_c2395_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
   ret.write<QSize > ((QSize)((QAbstractTableModel_Adaptor *)cls)->cbs_span_c2395_0 (arg1));
 }
 
@@ -2373,7 +2373,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractTableModel_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }

src/gsiqt/qt4/QtCore/gsiDeclQCoreApplication.cc

@@ -1160,7 +1160,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCoreApplication_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -1184,7 +1184,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCoreApplication_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -1226,7 +1226,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCoreApplication_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -1250,7 +1250,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QCoreApplication_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -1275,8 +1275,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QCoreApplication_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -1331,7 +1331,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCoreApplication_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }

src/gsiqt/qt4/QtCore/gsiDeclQEventLoop.cc

@@ -472,7 +472,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QEventLoop_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -496,7 +496,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QEventLoop_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -538,7 +538,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QEventLoop_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -562,7 +562,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QEventLoop_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -587,8 +587,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QEventLoop_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -643,7 +643,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QEventLoop_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }

src/gsiqt/qt4/QtCore/gsiDeclQFileSystemWatcher.cc

@@ -500,7 +500,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFileSystemWatcher_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -524,7 +524,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFileSystemWatcher_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -584,7 +584,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFileSystemWatcher_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -608,7 +608,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QFileSystemWatcher_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -633,8 +633,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QFileSystemWatcher_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -707,7 +707,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFileSystemWatcher_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }

src/gsiqt/qt4/QtCore/gsiDeclQLibrary.cc

@@ -743,7 +743,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QLibrary_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -767,7 +767,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QLibrary_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -809,7 +809,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QLibrary_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -833,7 +833,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QLibrary_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -858,8 +858,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QLibrary_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -914,7 +914,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QLibrary_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }

src/gsiqt/qt4/QtCore/gsiDeclQMimeData.cc

@@ -759,7 +759,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QMimeData_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -783,7 +783,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QMimeData_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -825,7 +825,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QMimeData_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -849,7 +849,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QMimeData_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -874,8 +874,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QMimeData_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -917,7 +917,7 @@ static void _call_cbs_hasFormat_c2025_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QString &arg1 = args.read<const QString & > (heap);
+  const QString &arg1 = gsi::arg_reader<const QString & >() (args, heap);
   ret.write<bool > ((bool)((QMimeData_Adaptor *)cls)->cbs_hasFormat_c2025_0 (arg1));
 }
 
@@ -960,8 +960,8 @@ static void _call_cbs_retrieveData_c3693_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QString &arg1 = args.read<const QString & > (heap);
-  const qt_gsi::Converter<QVariant::Type>::target_type & arg2 = args.read<const qt_gsi::Converter<QVariant::Type>::target_type & > (heap);
+  const QString &arg1 = gsi::arg_reader<const QString & >() (args, heap);
+  const qt_gsi::Converter<QVariant::Type>::target_type & arg2 = gsi::arg_reader<const qt_gsi::Converter<QVariant::Type>::target_type & >() (args, heap);
   ret.write<QVariant > ((QVariant)((QMimeData_Adaptor *)cls)->cbs_retrieveData_c3693_0 (arg1, arg2));
 }
 
@@ -998,7 +998,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QMimeData_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }

src/gsiqt/qt4/QtCore/gsiDeclQObject.cc

@@ -973,7 +973,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QObject_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -997,7 +997,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QObject_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -1039,7 +1039,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QObject_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -1063,7 +1063,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QObject_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -1088,8 +1088,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QObject_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -1144,7 +1144,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QObject_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }

src/gsiqt/qt4/QtCore/gsiDeclQPluginLoader.cc

@@ -540,7 +540,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QPluginLoader_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -564,7 +564,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QPluginLoader_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -606,7 +606,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QPluginLoader_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -630,7 +630,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QPluginLoader_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -655,8 +655,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QPluginLoader_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -711,7 +711,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QPluginLoader_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }

src/gsiqt/qt4/QtCore/gsiDeclQSettings.cc

@@ -1069,7 +1069,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QSettings_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -1093,7 +1093,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QSettings_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -1135,7 +1135,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QSettings_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -1159,7 +1159,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QSettings_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -1184,8 +1184,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QSettings_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -1240,7 +1240,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QSettings_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }

src/gsiqt/qt4/QtCore/gsiDeclQSignalMapper.cc

@@ -601,7 +601,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QSignalMapper_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -625,7 +625,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QSignalMapper_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -667,7 +667,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QSignalMapper_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -691,7 +691,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QSignalMapper_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -716,8 +716,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QSignalMapper_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -844,7 +844,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QSignalMapper_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }

src/gsiqt/qt4/QtCore/gsiDeclQSocketNotifier.cc

@@ -437,7 +437,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QSocketNotifier_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -461,7 +461,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QSocketNotifier_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -503,7 +503,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QSocketNotifier_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -527,7 +527,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QSocketNotifier_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -552,8 +552,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QSocketNotifier_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -608,7 +608,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QSocketNotifier_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }

src/gsiqt/qt4/QtCore/gsiDeclQSystemLocale.cc

@@ -188,8 +188,8 @@ static void _call_cbs_query_c3956_0 (const qt_gsi::GenericMethod * /*decl*/, voi
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QSystemLocale::QueryType>::target_type & arg1 = args.read<const qt_gsi::Converter<QSystemLocale::QueryType>::target_type & > (heap);
-  QVariant arg2 = args.read<QVariant > (heap);
+  const qt_gsi::Converter<QSystemLocale::QueryType>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QSystemLocale::QueryType>::target_type & >() (args, heap);
+  QVariant arg2 = gsi::arg_reader<QVariant >() (args, heap);
   ret.write<QVariant > ((QVariant)((QSystemLocale_Adaptor *)cls)->cbs_query_c3956_0 (arg1, arg2));
 }
 

src/gsiqt/qt4/QtCore/gsiDeclQTextCodec.cc

@@ -661,9 +661,9 @@ static void _call_cbs_convertFromUnicode_c5514_0 (const qt_gsi::GenericMethod *
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QChar>::target_type * arg1 = args.read<const qt_gsi::Converter<QChar>::target_type * > (heap);
-  int arg2 = args.read<int > (heap);
-  QTextCodec::ConverterState *arg3 = args.read<QTextCodec::ConverterState * > (heap);
+  const qt_gsi::Converter<QChar>::target_type * arg1 = gsi::arg_reader<const qt_gsi::Converter<QChar>::target_type * >() (args, heap);
+  int arg2 = gsi::arg_reader<int >() (args, heap);
+  QTextCodec::ConverterState *arg3 = gsi::arg_reader<QTextCodec::ConverterState * >() (args, heap);
   ret.write<QByteArray > ((QByteArray)((QTextCodec_Adaptor *)cls)->cbs_convertFromUnicode_c5514_0 (arg1, arg2, arg3));
 }
 
@@ -690,9 +690,9 @@ static void _call_cbs_convertToUnicode_c5465_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
-  int arg2 = args.read<int > (heap);
-  QTextCodec::ConverterState *arg3 = args.read<QTextCodec::ConverterState * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
+  int arg2 = gsi::arg_reader<int >() (args, heap);
+  QTextCodec::ConverterState *arg3 = gsi::arg_reader<QTextCodec::ConverterState * >() (args, heap);
   ret.write<QString > ((QString)((QTextCodec_Adaptor *)cls)->cbs_convertToUnicode_c5465_0 (arg1, arg2, arg3));
 }
 

src/gsiqt/qt4/QtCore/gsiDeclQThread.cc

@@ -665,7 +665,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QThread_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -689,7 +689,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QThread_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -731,7 +731,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QThread_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -755,7 +755,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QThread_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -780,8 +780,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QThread_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -969,7 +969,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QThread_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }

src/gsiqt/qt4/QtCore/gsiDeclQTimeLine.cc

@@ -925,7 +925,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QTimeLine_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -949,7 +949,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QTimeLine_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -991,7 +991,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QTimeLine_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -1015,7 +1015,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QTimeLine_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -1040,8 +1040,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QTimeLine_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -1146,7 +1146,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QTimeLine_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }
@@ -1188,7 +1188,7 @@ static void _call_cbs_valueForTime_c767_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   ret.write<double > ((double)((QTimeLine_Adaptor *)cls)->cbs_valueForTime_c767_0 (arg1));
 }
 

src/gsiqt/qt4/QtCore/gsiDeclQTimer.cc

@@ -505,7 +505,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QTimer_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -529,7 +529,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QTimer_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -571,7 +571,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QTimer_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -595,7 +595,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QTimer_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -620,8 +620,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QTimer_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -690,7 +690,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QTimer_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }

src/gsiqt/qt4/QtCore/gsiDeclQTranslator.cc

@@ -492,7 +492,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QTranslator_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -516,7 +516,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QTranslator_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -558,7 +558,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QTranslator_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -582,7 +582,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QTranslator_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -607,8 +607,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QTranslator_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -682,7 +682,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QTranslator_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }
@@ -710,9 +710,9 @@ static void _call_cbs_translate_c4977_1 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
-  const char *arg2 = args.read<const char * > (heap);
-  const char *arg3 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
+  const char *arg2 = gsi::arg_reader<const char * >() (args, heap);
+  const char *arg3 = args ? gsi::arg_reader<const char * >() (args, heap) : gsi::arg_maker<const char * >() (0, heap);
   ret.write<QString > ((QString)((QTranslator_Adaptor *)cls)->cbs_translate_c4977_1 (arg1, arg2, arg3));
 }
 

src/gsiqt/qt4/QtGui/gsiDeclQAbstractButton.cc

@@ -1613,7 +1613,7 @@ static void _call_cbs_actionEvent_1823_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QActionEvent *arg1 = args.read<QActionEvent * > (heap);
+  QActionEvent *arg1 = gsi::arg_reader<QActionEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractButton_Adaptor *)cls)->cbs_actionEvent_1823_0 (arg1);
 }
@@ -1637,7 +1637,7 @@ static void _call_cbs_changeEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractButton_Adaptor *)cls)->cbs_changeEvent_1217_0 (arg1);
 }
@@ -1681,7 +1681,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractButton_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -1723,7 +1723,7 @@ static void _call_cbs_closeEvent_1719_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QCloseEvent *arg1 = args.read<QCloseEvent * > (heap);
+  QCloseEvent *arg1 = gsi::arg_reader<QCloseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractButton_Adaptor *)cls)->cbs_closeEvent_1719_0 (arg1);
 }
@@ -1747,7 +1747,7 @@ static void _call_cbs_contextMenuEvent_2363_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QContextMenuEvent *arg1 = args.read<QContextMenuEvent * > (heap);
+  QContextMenuEvent *arg1 = gsi::arg_reader<QContextMenuEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractButton_Adaptor *)cls)->cbs_contextMenuEvent_2363_0 (arg1);
 }
@@ -1814,7 +1814,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractButton_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -1878,7 +1878,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractButton_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -1902,7 +1902,7 @@ static void _call_cbs_dragEnterEvent_2109_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragEnterEvent *arg1 = args.read<QDragEnterEvent * > (heap);
+  QDragEnterEvent *arg1 = gsi::arg_reader<QDragEnterEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractButton_Adaptor *)cls)->cbs_dragEnterEvent_2109_0 (arg1);
 }
@@ -1926,7 +1926,7 @@ static void _call_cbs_dragLeaveEvent_2092_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragLeaveEvent *arg1 = args.read<QDragLeaveEvent * > (heap);
+  QDragLeaveEvent *arg1 = gsi::arg_reader<QDragLeaveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractButton_Adaptor *)cls)->cbs_dragLeaveEvent_2092_0 (arg1);
 }
@@ -1950,7 +1950,7 @@ static void _call_cbs_dragMoveEvent_2006_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragMoveEvent *arg1 = args.read<QDragMoveEvent * > (heap);
+  QDragMoveEvent *arg1 = gsi::arg_reader<QDragMoveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractButton_Adaptor *)cls)->cbs_dragMoveEvent_2006_0 (arg1);
 }
@@ -1974,7 +1974,7 @@ static void _call_cbs_dropEvent_1622_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDropEvent *arg1 = args.read<QDropEvent * > (heap);
+  QDropEvent *arg1 = gsi::arg_reader<QDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractButton_Adaptor *)cls)->cbs_dropEvent_1622_0 (arg1);
 }
@@ -1998,7 +1998,7 @@ static void _call_cbs_enabledChange_864_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractButton_Adaptor *)cls)->cbs_enabledChange_864_0 (arg1);
 }
@@ -2022,7 +2022,7 @@ static void _call_cbs_enterEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractButton_Adaptor *)cls)->cbs_enterEvent_1217_0 (arg1);
 }
@@ -2046,7 +2046,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QAbstractButton_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -2071,8 +2071,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QAbstractButton_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -2095,7 +2095,7 @@ static void _call_cbs_focusInEvent_1729_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractButton_Adaptor *)cls)->cbs_focusInEvent_1729_0 (arg1);
 }
@@ -2133,7 +2133,7 @@ static void _call_cbs_focusNextPrevChild_864_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   ret.write<bool > ((bool)((QAbstractButton_Adaptor *)cls)->cbs_focusNextPrevChild_864_0 (arg1));
 }
 
@@ -2156,7 +2156,7 @@ static void _call_cbs_focusOutEvent_1729_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractButton_Adaptor *)cls)->cbs_focusOutEvent_1729_0 (arg1);
 }
@@ -2194,7 +2194,7 @@ static void _call_cbs_fontChange_1801_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QFont &arg1 = args.read<const QFont & > (heap);
+  const QFont &arg1 = gsi::arg_reader<const QFont & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractButton_Adaptor *)cls)->cbs_fontChange_1801_0 (arg1);
 }
@@ -2218,7 +2218,7 @@ static void _call_cbs_heightForWidth_c767_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   ret.write<int > ((int)((QAbstractButton_Adaptor *)cls)->cbs_heightForWidth_c767_0 (arg1));
 }
 
@@ -2241,7 +2241,7 @@ static void _call_cbs_hideEvent_1595_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QHideEvent *arg1 = args.read<QHideEvent * > (heap);
+  QHideEvent *arg1 = gsi::arg_reader<QHideEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractButton_Adaptor *)cls)->cbs_hideEvent_1595_0 (arg1);
 }
@@ -2265,7 +2265,7 @@ static void _call_cbs_hitButton_c1916_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QPoint &arg1 = args.read<const QPoint & > (heap);
+  const QPoint &arg1 = gsi::arg_reader<const QPoint & >() (args, heap);
   ret.write<bool > ((bool)((QAbstractButton_Adaptor *)cls)->cbs_hitButton_c1916_0 (arg1));
 }
 
@@ -2288,7 +2288,7 @@ static void _call_cbs_inputMethodEvent_2354_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QInputMethodEvent *arg1 = args.read<QInputMethodEvent * > (heap);
+  QInputMethodEvent *arg1 = gsi::arg_reader<QInputMethodEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractButton_Adaptor *)cls)->cbs_inputMethodEvent_2354_0 (arg1);
 }
@@ -2312,7 +2312,7 @@ static void _call_cbs_inputMethodQuery_c2420_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = args.read<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & > (heap);
+  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & >() (args, heap);
   ret.write<QVariant > ((QVariant)((QAbstractButton_Adaptor *)cls)->cbs_inputMethodQuery_c2420_0 (arg1));
 }
 
@@ -2335,7 +2335,7 @@ static void _call_cbs_keyPressEvent_1514_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractButton_Adaptor *)cls)->cbs_keyPressEvent_1514_0 (arg1);
 }
@@ -2359,7 +2359,7 @@ static void _call_cbs_keyReleaseEvent_1514_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractButton_Adaptor *)cls)->cbs_keyReleaseEvent_1514_0 (arg1);
 }
@@ -2403,7 +2403,7 @@ static void _call_cbs_leaveEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractButton_Adaptor *)cls)->cbs_leaveEvent_1217_0 (arg1);
 }
@@ -2427,7 +2427,7 @@ static void _call_cbs_metric_c3445_0 (const qt_gsi::GenericMethod * /*decl*/, vo
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & arg1 = args.read<const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & > (heap);
+  const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & >() (args, heap);
   ret.write<int > ((int)((QAbstractButton_Adaptor *)cls)->cbs_metric_c3445_0 (arg1));
 }
 
@@ -2469,7 +2469,7 @@ static void _call_cbs_mouseDoubleClickEvent_1738_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractButton_Adaptor *)cls)->cbs_mouseDoubleClickEvent_1738_0 (arg1);
 }
@@ -2493,7 +2493,7 @@ static void _call_cbs_mouseMoveEvent_1738_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractButton_Adaptor *)cls)->cbs_mouseMoveEvent_1738_0 (arg1);
 }
@@ -2517,7 +2517,7 @@ static void _call_cbs_mousePressEvent_1738_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractButton_Adaptor *)cls)->cbs_mousePressEvent_1738_0 (arg1);
 }
@@ -2541,7 +2541,7 @@ static void _call_cbs_mouseReleaseEvent_1738_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractButton_Adaptor *)cls)->cbs_mouseReleaseEvent_1738_0 (arg1);
 }
@@ -2565,7 +2565,7 @@ static void _call_cbs_moveEvent_1624_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMoveEvent *arg1 = args.read<QMoveEvent * > (heap);
+  QMoveEvent *arg1 = gsi::arg_reader<QMoveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractButton_Adaptor *)cls)->cbs_moveEvent_1624_0 (arg1);
 }
@@ -2628,7 +2628,7 @@ static void _call_cbs_paintEvent_1725_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QPaintEvent *arg1 = args.read<QPaintEvent * > (heap);
+  QPaintEvent *arg1 = gsi::arg_reader<QPaintEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractButton_Adaptor *)cls)->cbs_paintEvent_1725_0 (arg1);
 }
@@ -2652,7 +2652,7 @@ static void _call_cbs_paletteChange_2113_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QPalette &arg1 = args.read<const QPalette & > (heap);
+  const QPalette &arg1 = gsi::arg_reader<const QPalette & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractButton_Adaptor *)cls)->cbs_paletteChange_2113_0 (arg1);
 }
@@ -2737,7 +2737,7 @@ static void _call_cbs_resizeEvent_1843_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QResizeEvent *arg1 = args.read<QResizeEvent * > (heap);
+  QResizeEvent *arg1 = gsi::arg_reader<QResizeEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractButton_Adaptor *)cls)->cbs_resizeEvent_1843_0 (arg1);
 }
@@ -2775,7 +2775,7 @@ static void _call_cbs_setVisible_864_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractButton_Adaptor *)cls)->cbs_setVisible_864_0 (arg1);
 }
@@ -2799,7 +2799,7 @@ static void _call_cbs_showEvent_1634_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QShowEvent *arg1 = args.read<QShowEvent * > (heap);
+  QShowEvent *arg1 = gsi::arg_reader<QShowEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractButton_Adaptor *)cls)->cbs_showEvent_1634_0 (arg1);
 }
@@ -2842,7 +2842,7 @@ static void _call_cbs_styleChange_1228_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QStyle &arg1 = args.read<QStyle & > (heap);
+  QStyle &arg1 = gsi::arg_reader<QStyle & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractButton_Adaptor *)cls)->cbs_styleChange_1228_0 (arg1);
 }
@@ -2866,7 +2866,7 @@ static void _call_cbs_tabletEvent_1821_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTabletEvent *arg1 = args.read<QTabletEvent * > (heap);
+  QTabletEvent *arg1 = gsi::arg_reader<QTabletEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractButton_Adaptor *)cls)->cbs_tabletEvent_1821_0 (arg1);
 }
@@ -2890,7 +2890,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractButton_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }
@@ -2947,7 +2947,7 @@ static void _call_cbs_wheelEvent_1718_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QWheelEvent *arg1 = args.read<QWheelEvent * > (heap);
+  QWheelEvent *arg1 = gsi::arg_reader<QWheelEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractButton_Adaptor *)cls)->cbs_wheelEvent_1718_0 (arg1);
 }
@@ -2971,7 +2971,7 @@ static void _call_cbs_windowActivationChange_864_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractButton_Adaptor *)cls)->cbs_windowActivationChange_864_0 (arg1);
 }

src/gsiqt/qt4/QtGui/gsiDeclQAbstractGraphicsShapeItem.cc

@@ -848,7 +848,7 @@ static void _call_cbs_advance_767_0 (const qt_gsi::GenericMethod * /*decl*/, voi
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractGraphicsShapeItem_Adaptor *)cls)->cbs_advance_767_0 (arg1);
 }
@@ -893,8 +893,8 @@ static void _call_cbs_collidesWithItem_c4977_1 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QGraphicsItem *arg1 = args.read<const QGraphicsItem * > (heap);
-  const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & arg2 = args.read<const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & > (heap);
+  const QGraphicsItem *arg1 = gsi::arg_reader<const QGraphicsItem * >() (args, heap);
+  const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & arg2 = args ? gsi::arg_reader<const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & >() (args, heap) : gsi::arg_maker<const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & >() (qt_gsi::CppToQtReadAdaptor<Qt::ItemSelectionMode>(heap, Qt::IntersectsItemShape), heap);
   ret.write<bool > ((bool)((QAbstractGraphicsShapeItem_Adaptor *)cls)->cbs_collidesWithItem_c4977_1 (arg1, arg2));
 }
 
@@ -919,8 +919,8 @@ static void _call_cbs_collidesWithPath_c4877_1 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QPainterPath &arg1 = args.read<const QPainterPath & > (heap);
-  const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & arg2 = args.read<const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & > (heap);
+  const QPainterPath &arg1 = gsi::arg_reader<const QPainterPath & >() (args, heap);
+  const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & arg2 = args ? gsi::arg_reader<const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & >() (args, heap) : gsi::arg_maker<const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & >() (qt_gsi::CppToQtReadAdaptor<Qt::ItemSelectionMode>(heap, Qt::IntersectsItemShape), heap);
   ret.write<bool > ((bool)((QAbstractGraphicsShapeItem_Adaptor *)cls)->cbs_collidesWithPath_c4877_1 (arg1, arg2));
 }
 
@@ -943,7 +943,7 @@ static void _call_cbs_contains_c1986_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QPointF &arg1 = args.read<const QPointF & > (heap);
+  const QPointF &arg1 = gsi::arg_reader<const QPointF & >() (args, heap);
   ret.write<bool > ((bool)((QAbstractGraphicsShapeItem_Adaptor *)cls)->cbs_contains_c1986_0 (arg1));
 }
 
@@ -966,7 +966,7 @@ static void _call_cbs_contextMenuEvent_3674_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneContextMenuEvent *arg1 = args.read<QGraphicsSceneContextMenuEvent * > (heap);
+  QGraphicsSceneContextMenuEvent *arg1 = gsi::arg_reader<QGraphicsSceneContextMenuEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractGraphicsShapeItem_Adaptor *)cls)->cbs_contextMenuEvent_3674_0 (arg1);
 }
@@ -990,7 +990,7 @@ static void _call_cbs_dragEnterEvent_3315_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneDragDropEvent *arg1 = args.read<QGraphicsSceneDragDropEvent * > (heap);
+  QGraphicsSceneDragDropEvent *arg1 = gsi::arg_reader<QGraphicsSceneDragDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractGraphicsShapeItem_Adaptor *)cls)->cbs_dragEnterEvent_3315_0 (arg1);
 }
@@ -1014,7 +1014,7 @@ static void _call_cbs_dragLeaveEvent_3315_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneDragDropEvent *arg1 = args.read<QGraphicsSceneDragDropEvent * > (heap);
+  QGraphicsSceneDragDropEvent *arg1 = gsi::arg_reader<QGraphicsSceneDragDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractGraphicsShapeItem_Adaptor *)cls)->cbs_dragLeaveEvent_3315_0 (arg1);
 }
@@ -1038,7 +1038,7 @@ static void _call_cbs_dragMoveEvent_3315_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneDragDropEvent *arg1 = args.read<QGraphicsSceneDragDropEvent * > (heap);
+  QGraphicsSceneDragDropEvent *arg1 = gsi::arg_reader<QGraphicsSceneDragDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractGraphicsShapeItem_Adaptor *)cls)->cbs_dragMoveEvent_3315_0 (arg1);
 }
@@ -1062,7 +1062,7 @@ static void _call_cbs_dropEvent_3315_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneDragDropEvent *arg1 = args.read<QGraphicsSceneDragDropEvent * > (heap);
+  QGraphicsSceneDragDropEvent *arg1 = gsi::arg_reader<QGraphicsSceneDragDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractGraphicsShapeItem_Adaptor *)cls)->cbs_dropEvent_3315_0 (arg1);
 }
@@ -1086,7 +1086,7 @@ static void _call_cbs_extension_c2119_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QVariant &arg1 = args.read<const QVariant & > (heap);
+  const QVariant &arg1 = gsi::arg_reader<const QVariant & >() (args, heap);
   ret.write<QVariant > ((QVariant)((QAbstractGraphicsShapeItem_Adaptor *)cls)->cbs_extension_c2119_0 (arg1));
 }
 
@@ -1109,7 +1109,7 @@ static void _call_cbs_focusInEvent_1729_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractGraphicsShapeItem_Adaptor *)cls)->cbs_focusInEvent_1729_0 (arg1);
 }
@@ -1133,7 +1133,7 @@ static void _call_cbs_focusOutEvent_1729_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractGraphicsShapeItem_Adaptor *)cls)->cbs_focusOutEvent_1729_0 (arg1);
 }
@@ -1157,7 +1157,7 @@ static void _call_cbs_hoverEnterEvent_3044_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneHoverEvent *arg1 = args.read<QGraphicsSceneHoverEvent * > (heap);
+  QGraphicsSceneHoverEvent *arg1 = gsi::arg_reader<QGraphicsSceneHoverEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractGraphicsShapeItem_Adaptor *)cls)->cbs_hoverEnterEvent_3044_0 (arg1);
 }
@@ -1181,7 +1181,7 @@ static void _call_cbs_hoverLeaveEvent_3044_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneHoverEvent *arg1 = args.read<QGraphicsSceneHoverEvent * > (heap);
+  QGraphicsSceneHoverEvent *arg1 = gsi::arg_reader<QGraphicsSceneHoverEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractGraphicsShapeItem_Adaptor *)cls)->cbs_hoverLeaveEvent_3044_0 (arg1);
 }
@@ -1205,7 +1205,7 @@ static void _call_cbs_hoverMoveEvent_3044_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneHoverEvent *arg1 = args.read<QGraphicsSceneHoverEvent * > (heap);
+  QGraphicsSceneHoverEvent *arg1 = gsi::arg_reader<QGraphicsSceneHoverEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractGraphicsShapeItem_Adaptor *)cls)->cbs_hoverMoveEvent_3044_0 (arg1);
 }
@@ -1229,7 +1229,7 @@ static void _call_cbs_inputMethodEvent_2354_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QInputMethodEvent *arg1 = args.read<QInputMethodEvent * > (heap);
+  QInputMethodEvent *arg1 = gsi::arg_reader<QInputMethodEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractGraphicsShapeItem_Adaptor *)cls)->cbs_inputMethodEvent_2354_0 (arg1);
 }
@@ -1253,7 +1253,7 @@ static void _call_cbs_inputMethodQuery_c2420_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = args.read<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & > (heap);
+  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & >() (args, heap);
   ret.write<QVariant > ((QVariant)((QAbstractGraphicsShapeItem_Adaptor *)cls)->cbs_inputMethodQuery_c2420_0 (arg1));
 }
 
@@ -1276,7 +1276,7 @@ static void _call_cbs_isObscuredBy_c2614_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QGraphicsItem *arg1 = args.read<const QGraphicsItem * > (heap);
+  const QGraphicsItem *arg1 = gsi::arg_reader<const QGraphicsItem * >() (args, heap);
   ret.write<bool > ((bool)((QAbstractGraphicsShapeItem_Adaptor *)cls)->cbs_isObscuredBy_c2614_0 (arg1));
 }
 
@@ -1301,8 +1301,8 @@ static void _call_cbs_itemChange_5658_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QGraphicsItem::GraphicsItemChange>::target_type & arg1 = args.read<const qt_gsi::Converter<QGraphicsItem::GraphicsItemChange>::target_type & > (heap);
-  const QVariant &arg2 = args.read<const QVariant & > (heap);
+  const qt_gsi::Converter<QGraphicsItem::GraphicsItemChange>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QGraphicsItem::GraphicsItemChange>::target_type & >() (args, heap);
+  const QVariant &arg2 = gsi::arg_reader<const QVariant & >() (args, heap);
   ret.write<QVariant > ((QVariant)((QAbstractGraphicsShapeItem_Adaptor *)cls)->cbs_itemChange_5658_0 (arg1, arg2));
 }
 
@@ -1325,7 +1325,7 @@ static void _call_cbs_keyPressEvent_1514_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractGraphicsShapeItem_Adaptor *)cls)->cbs_keyPressEvent_1514_0 (arg1);
 }
@@ -1349,7 +1349,7 @@ static void _call_cbs_keyReleaseEvent_1514_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractGraphicsShapeItem_Adaptor *)cls)->cbs_keyReleaseEvent_1514_0 (arg1);
 }
@@ -1373,7 +1373,7 @@ static void _call_cbs_mouseDoubleClickEvent_3049_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneMouseEvent *arg1 = args.read<QGraphicsSceneMouseEvent * > (heap);
+  QGraphicsSceneMouseEvent *arg1 = gsi::arg_reader<QGraphicsSceneMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractGraphicsShapeItem_Adaptor *)cls)->cbs_mouseDoubleClickEvent_3049_0 (arg1);
 }
@@ -1397,7 +1397,7 @@ static void _call_cbs_mouseMoveEvent_3049_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneMouseEvent *arg1 = args.read<QGraphicsSceneMouseEvent * > (heap);
+  QGraphicsSceneMouseEvent *arg1 = gsi::arg_reader<QGraphicsSceneMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractGraphicsShapeItem_Adaptor *)cls)->cbs_mouseMoveEvent_3049_0 (arg1);
 }
@@ -1421,7 +1421,7 @@ static void _call_cbs_mousePressEvent_3049_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneMouseEvent *arg1 = args.read<QGraphicsSceneMouseEvent * > (heap);
+  QGraphicsSceneMouseEvent *arg1 = gsi::arg_reader<QGraphicsSceneMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractGraphicsShapeItem_Adaptor *)cls)->cbs_mousePressEvent_3049_0 (arg1);
 }
@@ -1445,7 +1445,7 @@ static void _call_cbs_mouseReleaseEvent_3049_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneMouseEvent *arg1 = args.read<QGraphicsSceneMouseEvent * > (heap);
+  QGraphicsSceneMouseEvent *arg1 = gsi::arg_reader<QGraphicsSceneMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractGraphicsShapeItem_Adaptor *)cls)->cbs_mouseReleaseEvent_3049_0 (arg1);
 }
@@ -1492,9 +1492,9 @@ static void _call_cbs_paint_6301_1 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QPainter *arg1 = args.read<QPainter * > (heap);
-  const QStyleOptionGraphicsItem *arg2 = args.read<const QStyleOptionGraphicsItem * > (heap);
-  QWidget *arg3 = args.read<QWidget * > (heap);
+  QPainter *arg1 = gsi::arg_reader<QPainter * >() (args, heap);
+  const QStyleOptionGraphicsItem *arg2 = gsi::arg_reader<const QStyleOptionGraphicsItem * >() (args, heap);
+  QWidget *arg3 = args ? gsi::arg_reader<QWidget * >() (args, heap) : gsi::arg_maker<QWidget * >() (0, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractGraphicsShapeItem_Adaptor *)cls)->cbs_paint_6301_1 (arg1, arg2, arg3);
 }
@@ -1548,7 +1548,7 @@ static void _call_cbs_sceneEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QAbstractGraphicsShapeItem_Adaptor *)cls)->cbs_sceneEvent_1217_0 (arg1));
 }
 
@@ -1573,8 +1573,8 @@ static void _call_cbs_sceneEventFilter_3028_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsItem *arg1 = args.read<QGraphicsItem * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QGraphicsItem *arg1 = gsi::arg_reader<QGraphicsItem * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QAbstractGraphicsShapeItem_Adaptor *)cls)->cbs_sceneEventFilter_3028_0 (arg1, arg2));
 }
 
@@ -1599,8 +1599,8 @@ static void _call_cbs_setExtension_4817_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  unsigned int arg1 = args.read<unsigned int > (heap);
-  const QVariant &arg2 = args.read<const QVariant & > (heap);
+  unsigned int arg1 = gsi::arg_reader<unsigned int >() (args, heap);
+  const QVariant &arg2 = gsi::arg_reader<const QVariant & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractGraphicsShapeItem_Adaptor *)cls)->cbs_setExtension_4817_0 (arg1, arg2);
 }
@@ -1643,7 +1643,7 @@ static void _call_cbs_supportsExtension_c2806_0 (const qt_gsi::GenericMethod * /
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  unsigned int arg1 = args.read<unsigned int > (heap);
+  unsigned int arg1 = gsi::arg_reader<unsigned int >() (args, heap);
   ret.write<bool > ((bool)((QAbstractGraphicsShapeItem_Adaptor *)cls)->cbs_supportsExtension_c2806_0 (arg1));
 }
 
@@ -1685,7 +1685,7 @@ static void _call_cbs_wheelEvent_3029_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneWheelEvent *arg1 = args.read<QGraphicsSceneWheelEvent * > (heap);
+  QGraphicsSceneWheelEvent *arg1 = gsi::arg_reader<QGraphicsSceneWheelEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractGraphicsShapeItem_Adaptor *)cls)->cbs_wheelEvent_3029_0 (arg1);
 }

src/gsiqt/qt4/QtGui/gsiDeclQAbstractItemDelegate.cc

@@ -725,7 +725,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractItemDelegate_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -792,9 +792,9 @@ static void _call_cbs_createEditor_c6860_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QWidget *arg1 = args.read<QWidget * > (heap);
-  const QStyleOptionViewItem &arg2 = args.read<const QStyleOptionViewItem & > (heap);
-  const QModelIndex &arg3 = args.read<const QModelIndex & > (heap);
+  QWidget *arg1 = gsi::arg_reader<QWidget * >() (args, heap);
+  const QStyleOptionViewItem &arg2 = gsi::arg_reader<const QStyleOptionViewItem & >() (args, heap);
+  const QModelIndex &arg3 = gsi::arg_reader<const QModelIndex & >() (args, heap);
   ret.write<QWidget * > ((QWidget *)((QAbstractItemDelegate_Adaptor *)cls)->cbs_createEditor_c6860_0 (arg1, arg2, arg3));
 }
 
@@ -817,7 +817,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractItemDelegate_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -859,7 +859,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractItemDelegate_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -889,10 +889,10 @@ static void _call_cbs_editorEvent_9073_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
-  QAbstractItemModel *arg2 = args.read<QAbstractItemModel * > (heap);
-  const QStyleOptionViewItem &arg3 = args.read<const QStyleOptionViewItem & > (heap);
-  const QModelIndex &arg4 = args.read<const QModelIndex & > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
+  QAbstractItemModel *arg2 = gsi::arg_reader<QAbstractItemModel * >() (args, heap);
+  const QStyleOptionViewItem &arg3 = gsi::arg_reader<const QStyleOptionViewItem & >() (args, heap);
+  const QModelIndex &arg4 = gsi::arg_reader<const QModelIndex & >() (args, heap);
   ret.write<bool > ((bool)((QAbstractItemDelegate_Adaptor *)cls)->cbs_editorEvent_9073_0 (arg1, arg2, arg3, arg4));
 }
 
@@ -915,7 +915,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QAbstractItemDelegate_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -940,8 +940,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QAbstractItemDelegate_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -968,9 +968,9 @@ static void _call_cbs_paint_c6971_0 (const qt_gsi::GenericMethod * /*decl*/, voi
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QPainter *arg1 = args.read<QPainter * > (heap);
-  const QStyleOptionViewItem &arg2 = args.read<const QStyleOptionViewItem & > (heap);
-  const QModelIndex &arg3 = args.read<const QModelIndex & > (heap);
+  QPainter *arg1 = gsi::arg_reader<QPainter * >() (args, heap);
+  const QStyleOptionViewItem &arg2 = gsi::arg_reader<const QStyleOptionViewItem & >() (args, heap);
+  const QModelIndex &arg3 = gsi::arg_reader<const QModelIndex & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractItemDelegate_Adaptor *)cls)->cbs_paint_c6971_0 (arg1, arg2, arg3);
 }
@@ -1028,8 +1028,8 @@ static void _call_cbs_setEditorData_c3602_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QWidget *arg1 = args.read<QWidget * > (heap);
-  const QModelIndex &arg2 = args.read<const QModelIndex & > (heap);
+  QWidget *arg1 = gsi::arg_reader<QWidget * >() (args, heap);
+  const QModelIndex &arg2 = gsi::arg_reader<const QModelIndex & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractItemDelegate_Adaptor *)cls)->cbs_setEditorData_c3602_0 (arg1, arg2);
 }
@@ -1057,9 +1057,9 @@ static void _call_cbs_setModelData_c5913_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QWidget *arg1 = args.read<QWidget * > (heap);
-  QAbstractItemModel *arg2 = args.read<QAbstractItemModel * > (heap);
-  const QModelIndex &arg3 = args.read<const QModelIndex & > (heap);
+  QWidget *arg1 = gsi::arg_reader<QWidget * >() (args, heap);
+  QAbstractItemModel *arg2 = gsi::arg_reader<QAbstractItemModel * >() (args, heap);
+  const QModelIndex &arg3 = gsi::arg_reader<const QModelIndex & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractItemDelegate_Adaptor *)cls)->cbs_setModelData_c5913_0 (arg1, arg2, arg3);
 }
@@ -1085,8 +1085,8 @@ static void _call_cbs_sizeHint_c5653_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QStyleOptionViewItem &arg1 = args.read<const QStyleOptionViewItem & > (heap);
-  const QModelIndex &arg2 = args.read<const QModelIndex & > (heap);
+  const QStyleOptionViewItem &arg1 = gsi::arg_reader<const QStyleOptionViewItem & >() (args, heap);
+  const QModelIndex &arg2 = gsi::arg_reader<const QModelIndex & >() (args, heap);
   ret.write<QSize > ((QSize)((QAbstractItemDelegate_Adaptor *)cls)->cbs_sizeHint_c5653_0 (arg1, arg2));
 }
 
@@ -1127,7 +1127,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractItemDelegate_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }
@@ -1155,9 +1155,9 @@ static void _call_cbs_updateEditorGeometry_c6860_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QWidget *arg1 = args.read<QWidget * > (heap);
-  const QStyleOptionViewItem &arg2 = args.read<const QStyleOptionViewItem & > (heap);
-  const QModelIndex &arg3 = args.read<const QModelIndex & > (heap);
+  QWidget *arg1 = gsi::arg_reader<QWidget * >() (args, heap);
+  const QStyleOptionViewItem &arg2 = gsi::arg_reader<const QStyleOptionViewItem & >() (args, heap);
+  const QModelIndex &arg3 = gsi::arg_reader<const QModelIndex & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractItemDelegate_Adaptor *)cls)->cbs_updateEditorGeometry_c6860_0 (arg1, arg2, arg3);
 }

src/gsiqt/qt4/QtGui/gsiDeclQAbstractItemView.cc

@@ -3152,7 +3152,7 @@ static void _call_cbs_actionEvent_1823_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QActionEvent *arg1 = args.read<QActionEvent * > (heap);
+  QActionEvent *arg1 = gsi::arg_reader<QActionEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractItemView_Adaptor *)cls)->cbs_actionEvent_1823_0 (arg1);
 }
@@ -3194,7 +3194,7 @@ static void _call_cbs_changeEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractItemView_Adaptor *)cls)->cbs_changeEvent_1217_0 (arg1);
 }
@@ -3218,7 +3218,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractItemView_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -3262,8 +3262,8 @@ static void _call_cbs_closeEditor_4926_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QWidget *arg1 = args.read<QWidget * > (heap);
-  const qt_gsi::Converter<QAbstractItemDelegate::EndEditHint>::target_type & arg2 = args.read<const qt_gsi::Converter<QAbstractItemDelegate::EndEditHint>::target_type & > (heap);
+  QWidget *arg1 = gsi::arg_reader<QWidget * >() (args, heap);
+  const qt_gsi::Converter<QAbstractItemDelegate::EndEditHint>::target_type & arg2 = gsi::arg_reader<const qt_gsi::Converter<QAbstractItemDelegate::EndEditHint>::target_type & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractItemView_Adaptor *)cls)->cbs_closeEditor_4926_0 (arg1, arg2);
 }
@@ -3287,7 +3287,7 @@ static void _call_cbs_closeEvent_1719_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QCloseEvent *arg1 = args.read<QCloseEvent * > (heap);
+  QCloseEvent *arg1 = gsi::arg_reader<QCloseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractItemView_Adaptor *)cls)->cbs_closeEvent_1719_0 (arg1);
 }
@@ -3311,7 +3311,7 @@ static void _call_cbs_commitData_1315_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QWidget *arg1 = args.read<QWidget * > (heap);
+  QWidget *arg1 = gsi::arg_reader<QWidget * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractItemView_Adaptor *)cls)->cbs_commitData_1315_0 (arg1);
 }
@@ -3335,7 +3335,7 @@ static void _call_cbs_contextMenuEvent_2363_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QContextMenuEvent *arg1 = args.read<QContextMenuEvent * > (heap);
+  QContextMenuEvent *arg1 = gsi::arg_reader<QContextMenuEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractItemView_Adaptor *)cls)->cbs_contextMenuEvent_2363_0 (arg1);
 }
@@ -3386,8 +3386,8 @@ static void _call_cbs_currentChanged_4682_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
-  const QModelIndex &arg2 = args.read<const QModelIndex & > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
+  const QModelIndex &arg2 = gsi::arg_reader<const QModelIndex & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractItemView_Adaptor *)cls)->cbs_currentChanged_4682_0 (arg1, arg2);
 }
@@ -3429,7 +3429,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractItemView_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -3455,8 +3455,8 @@ static void _call_cbs_dataChanged_4682_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
-  const QModelIndex &arg2 = args.read<const QModelIndex & > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
+  const QModelIndex &arg2 = gsi::arg_reader<const QModelIndex & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractItemView_Adaptor *)cls)->cbs_dataChanged_4682_0 (arg1, arg2);
 }
@@ -3534,7 +3534,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractItemView_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -3611,7 +3611,7 @@ static void _call_cbs_dragEnterEvent_2109_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragEnterEvent *arg1 = args.read<QDragEnterEvent * > (heap);
+  QDragEnterEvent *arg1 = gsi::arg_reader<QDragEnterEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractItemView_Adaptor *)cls)->cbs_dragEnterEvent_2109_0 (arg1);
 }
@@ -3635,7 +3635,7 @@ static void _call_cbs_dragLeaveEvent_2092_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragLeaveEvent *arg1 = args.read<QDragLeaveEvent * > (heap);
+  QDragLeaveEvent *arg1 = gsi::arg_reader<QDragLeaveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractItemView_Adaptor *)cls)->cbs_dragLeaveEvent_2092_0 (arg1);
 }
@@ -3659,7 +3659,7 @@ static void _call_cbs_dragMoveEvent_2006_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragMoveEvent *arg1 = args.read<QDragMoveEvent * > (heap);
+  QDragMoveEvent *arg1 = gsi::arg_reader<QDragMoveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractItemView_Adaptor *)cls)->cbs_dragMoveEvent_2006_0 (arg1);
 }
@@ -3702,7 +3702,7 @@ static void _call_cbs_dropEvent_1622_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDropEvent *arg1 = args.read<QDropEvent * > (heap);
+  QDropEvent *arg1 = gsi::arg_reader<QDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractItemView_Adaptor *)cls)->cbs_dropEvent_1622_0 (arg1);
 }
@@ -3744,9 +3744,9 @@ static void _call_cbs_edit_6773_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
-  const qt_gsi::Converter<QAbstractItemView::EditTrigger>::target_type & arg2 = args.read<const qt_gsi::Converter<QAbstractItemView::EditTrigger>::target_type & > (heap);
-  QEvent *arg3 = args.read<QEvent * > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
+  const qt_gsi::Converter<QAbstractItemView::EditTrigger>::target_type & arg2 = gsi::arg_reader<const qt_gsi::Converter<QAbstractItemView::EditTrigger>::target_type & >() (args, heap);
+  QEvent *arg3 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QAbstractItemView_Adaptor *)cls)->cbs_edit_6773_0 (arg1, arg2, arg3));
 }
 
@@ -3769,7 +3769,7 @@ static void _call_cbs_editorDestroyed_1302_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractItemView_Adaptor *)cls)->cbs_editorDestroyed_1302_0 (arg1);
 }
@@ -3793,7 +3793,7 @@ static void _call_cbs_enabledChange_864_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractItemView_Adaptor *)cls)->cbs_enabledChange_864_0 (arg1);
 }
@@ -3817,7 +3817,7 @@ static void _call_cbs_enterEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractItemView_Adaptor *)cls)->cbs_enterEvent_1217_0 (arg1);
 }
@@ -3859,7 +3859,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QAbstractItemView_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -3884,8 +3884,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QAbstractItemView_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -3923,7 +3923,7 @@ static void _call_cbs_focusInEvent_1729_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractItemView_Adaptor *)cls)->cbs_focusInEvent_1729_0 (arg1);
 }
@@ -3961,7 +3961,7 @@ static void _call_cbs_focusNextPrevChild_864_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   ret.write<bool > ((bool)((QAbstractItemView_Adaptor *)cls)->cbs_focusNextPrevChild_864_0 (arg1));
 }
 
@@ -3984,7 +3984,7 @@ static void _call_cbs_focusOutEvent_1729_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractItemView_Adaptor *)cls)->cbs_focusOutEvent_1729_0 (arg1);
 }
@@ -4022,7 +4022,7 @@ static void _call_cbs_fontChange_1801_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QFont &arg1 = args.read<const QFont & > (heap);
+  const QFont &arg1 = gsi::arg_reader<const QFont & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractItemView_Adaptor *)cls)->cbs_fontChange_1801_0 (arg1);
 }
@@ -4046,7 +4046,7 @@ static void _call_cbs_heightForWidth_c767_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   ret.write<int > ((int)((QAbstractItemView_Adaptor *)cls)->cbs_heightForWidth_c767_0 (arg1));
 }
 
@@ -4069,7 +4069,7 @@ static void _call_cbs_hideEvent_1595_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QHideEvent *arg1 = args.read<QHideEvent * > (heap);
+  QHideEvent *arg1 = gsi::arg_reader<QHideEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractItemView_Adaptor *)cls)->cbs_hideEvent_1595_0 (arg1);
 }
@@ -4112,7 +4112,7 @@ static void _call_cbs_horizontalScrollbarAction_767_0 (const qt_gsi::GenericMeth
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractItemView_Adaptor *)cls)->cbs_horizontalScrollbarAction_767_0 (arg1);
 }
@@ -4136,7 +4136,7 @@ static void _call_cbs_horizontalScrollbarValueChanged_767_0 (const qt_gsi::Gener
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractItemView_Adaptor *)cls)->cbs_horizontalScrollbarValueChanged_767_0 (arg1);
 }
@@ -4174,7 +4174,7 @@ static void _call_cbs_indexAt_c1916_0 (const qt_gsi::GenericMethod * /*decl*/, v
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QPoint &arg1 = args.read<const QPoint & > (heap);
+  const QPoint &arg1 = gsi::arg_reader<const QPoint & >() (args, heap);
   ret.write<QModelIndex > ((QModelIndex)((QAbstractItemView_Adaptor *)cls)->cbs_indexAt_c1916_0 (arg1));
 }
 
@@ -4197,7 +4197,7 @@ static void _call_cbs_inputMethodEvent_2354_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QInputMethodEvent *arg1 = args.read<QInputMethodEvent * > (heap);
+  QInputMethodEvent *arg1 = gsi::arg_reader<QInputMethodEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractItemView_Adaptor *)cls)->cbs_inputMethodEvent_2354_0 (arg1);
 }
@@ -4221,7 +4221,7 @@ static void _call_cbs_inputMethodQuery_c2420_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = args.read<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & > (heap);
+  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & >() (args, heap);
   ret.write<QVariant > ((QVariant)((QAbstractItemView_Adaptor *)cls)->cbs_inputMethodQuery_c2420_0 (arg1));
 }
 
@@ -4244,7 +4244,7 @@ static void _call_cbs_isIndexHidden_c2395_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
   ret.write<bool > ((bool)((QAbstractItemView_Adaptor *)cls)->cbs_isIndexHidden_c2395_0 (arg1));
 }
 
@@ -4267,7 +4267,7 @@ static void _call_cbs_keyPressEvent_1514_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractItemView_Adaptor *)cls)->cbs_keyPressEvent_1514_0 (arg1);
 }
@@ -4291,7 +4291,7 @@ static void _call_cbs_keyReleaseEvent_1514_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractItemView_Adaptor *)cls)->cbs_keyReleaseEvent_1514_0 (arg1);
 }
@@ -4315,7 +4315,7 @@ static void _call_cbs_keyboardSearch_2025_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QString &arg1 = args.read<const QString & > (heap);
+  const QString &arg1 = gsi::arg_reader<const QString & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractItemView_Adaptor *)cls)->cbs_keyboardSearch_2025_0 (arg1);
 }
@@ -4359,7 +4359,7 @@ static void _call_cbs_leaveEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractItemView_Adaptor *)cls)->cbs_leaveEvent_1217_0 (arg1);
 }
@@ -4383,7 +4383,7 @@ static void _call_cbs_metric_c3445_0 (const qt_gsi::GenericMethod * /*decl*/, vo
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & arg1 = args.read<const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & > (heap);
+  const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & >() (args, heap);
   ret.write<int > ((int)((QAbstractItemView_Adaptor *)cls)->cbs_metric_c3445_0 (arg1));
 }
 
@@ -4425,7 +4425,7 @@ static void _call_cbs_mouseDoubleClickEvent_1738_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractItemView_Adaptor *)cls)->cbs_mouseDoubleClickEvent_1738_0 (arg1);
 }
@@ -4449,7 +4449,7 @@ static void _call_cbs_mouseMoveEvent_1738_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractItemView_Adaptor *)cls)->cbs_mouseMoveEvent_1738_0 (arg1);
 }
@@ -4473,7 +4473,7 @@ static void _call_cbs_mousePressEvent_1738_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractItemView_Adaptor *)cls)->cbs_mousePressEvent_1738_0 (arg1);
 }
@@ -4497,7 +4497,7 @@ static void _call_cbs_mouseReleaseEvent_1738_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractItemView_Adaptor *)cls)->cbs_mouseReleaseEvent_1738_0 (arg1);
 }
@@ -4523,8 +4523,8 @@ static void _call_cbs_moveCursor_6476_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  unsigned int arg1 = args.read<unsigned int > (heap);
-  QFlags<Qt::KeyboardModifier> arg2 = args.read<QFlags<Qt::KeyboardModifier> > (heap);
+  unsigned int arg1 = gsi::arg_reader<unsigned int >() (args, heap);
+  QFlags<Qt::KeyboardModifier> arg2 = gsi::arg_reader<QFlags<Qt::KeyboardModifier> >() (args, heap);
   ret.write<QModelIndex > ((QModelIndex)((QAbstractItemView_Adaptor *)cls)->cbs_moveCursor_6476_0 (arg1, arg2));
 }
 
@@ -4547,7 +4547,7 @@ static void _call_cbs_moveEvent_1624_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMoveEvent *arg1 = args.read<QMoveEvent * > (heap);
+  QMoveEvent *arg1 = gsi::arg_reader<QMoveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractItemView_Adaptor *)cls)->cbs_moveEvent_1624_0 (arg1);
 }
@@ -4590,7 +4590,7 @@ static void _call_cbs_paintEvent_1725_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QPaintEvent *arg1 = args.read<QPaintEvent * > (heap);
+  QPaintEvent *arg1 = gsi::arg_reader<QPaintEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractItemView_Adaptor *)cls)->cbs_paintEvent_1725_0 (arg1);
 }
@@ -4614,7 +4614,7 @@ static void _call_cbs_paletteChange_2113_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QPalette &arg1 = args.read<const QPalette & > (heap);
+  const QPalette &arg1 = gsi::arg_reader<const QPalette & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractItemView_Adaptor *)cls)->cbs_paletteChange_2113_0 (arg1);
 }
@@ -4709,7 +4709,7 @@ static void _call_cbs_resizeEvent_1843_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QResizeEvent *arg1 = args.read<QResizeEvent * > (heap);
+  QResizeEvent *arg1 = gsi::arg_reader<QResizeEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractItemView_Adaptor *)cls)->cbs_resizeEvent_1843_0 (arg1);
 }
@@ -4737,9 +4737,9 @@ static void _call_cbs_rowsAboutToBeRemoved_3713_0 (const qt_gsi::GenericMethod *
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
-  int arg2 = args.read<int > (heap);
-  int arg3 = args.read<int > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
+  int arg2 = gsi::arg_reader<int >() (args, heap);
+  int arg3 = gsi::arg_reader<int >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractItemView_Adaptor *)cls)->cbs_rowsAboutToBeRemoved_3713_0 (arg1, arg2, arg3);
 }
@@ -4767,9 +4767,9 @@ static void _call_cbs_rowsInserted_3713_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
-  int arg2 = args.read<int > (heap);
-  int arg3 = args.read<int > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
+  int arg2 = gsi::arg_reader<int >() (args, heap);
+  int arg3 = gsi::arg_reader<int >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractItemView_Adaptor *)cls)->cbs_rowsInserted_3713_0 (arg1, arg2, arg3);
 }
@@ -4810,8 +4810,8 @@ static void _call_cbs_scrollContentsBy_1426_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
-  int arg2 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
+  int arg2 = gsi::arg_reader<int >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractItemView_Adaptor *)cls)->cbs_scrollContentsBy_1426_0 (arg1, arg2);
 }
@@ -4859,8 +4859,8 @@ static void _call_cbs_scrollTo_5576_1 (const qt_gsi::GenericMethod * /*decl*/, v
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
-  const qt_gsi::Converter<QAbstractItemView::ScrollHint>::target_type & arg2 = args.read<const qt_gsi::Converter<QAbstractItemView::ScrollHint>::target_type & > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
+  const qt_gsi::Converter<QAbstractItemView::ScrollHint>::target_type & arg2 = args ? gsi::arg_reader<const qt_gsi::Converter<QAbstractItemView::ScrollHint>::target_type & >() (args, heap) : gsi::arg_maker<const qt_gsi::Converter<QAbstractItemView::ScrollHint>::target_type & >() (qt_gsi::CppToQtReadAdaptor<QAbstractItemView::ScrollHint>(heap, QAbstractItemView::EnsureVisible), heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractItemView_Adaptor *)cls)->cbs_scrollTo_5576_1 (arg1, arg2);
 }
@@ -4925,8 +4925,8 @@ static void _call_cbs_selectionChanged_5346_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QItemSelection &arg1 = args.read<const QItemSelection & > (heap);
-  const QItemSelection &arg2 = args.read<const QItemSelection & > (heap);
+  const QItemSelection &arg1 = gsi::arg_reader<const QItemSelection & >() (args, heap);
+  const QItemSelection &arg2 = gsi::arg_reader<const QItemSelection & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractItemView_Adaptor *)cls)->cbs_selectionChanged_5346_0 (arg1, arg2);
 }
@@ -4952,8 +4952,8 @@ static void _call_cbs_selectionCommand_c4199_1 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
-  const QEvent *arg2 = args.read<const QEvent * > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
+  const QEvent *arg2 = args ? gsi::arg_reader<const QEvent * >() (args, heap) : gsi::arg_maker<const QEvent * >() (0, heap);
   ret.write<QFlags<QItemSelectionModel::SelectionFlag> > ((QFlags<QItemSelectionModel::SelectionFlag>)((QAbstractItemView_Adaptor *)cls)->cbs_selectionCommand_c4199_1 (arg1, arg2));
 }
 
@@ -5028,7 +5028,7 @@ static void _call_cbs_setModel_2419_0 (const qt_gsi::GenericMethod * /*decl*/, v
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QAbstractItemModel *arg1 = args.read<QAbstractItemModel * > (heap);
+  QAbstractItemModel *arg1 = gsi::arg_reader<QAbstractItemModel * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractItemView_Adaptor *)cls)->cbs_setModel_2419_0 (arg1);
 }
@@ -5052,7 +5052,7 @@ static void _call_cbs_setRootIndex_2395_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractItemView_Adaptor *)cls)->cbs_setRootIndex_2395_0 (arg1);
 }
@@ -5078,8 +5078,8 @@ static void _call_cbs_setSelection_6155_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QRect &arg1 = args.read<const QRect & > (heap);
-  QFlags<QItemSelectionModel::SelectionFlag> arg2 = args.read<QFlags<QItemSelectionModel::SelectionFlag> > (heap);
+  const QRect &arg1 = gsi::arg_reader<const QRect & >() (args, heap);
+  QFlags<QItemSelectionModel::SelectionFlag> arg2 = gsi::arg_reader<QFlags<QItemSelectionModel::SelectionFlag> >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractItemView_Adaptor *)cls)->cbs_setSelection_6155_0 (arg1, arg2);
 }
@@ -5103,7 +5103,7 @@ static void _call_cbs_setSelectionModel_2533_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QItemSelectionModel *arg1 = args.read<QItemSelectionModel * > (heap);
+  QItemSelectionModel *arg1 = gsi::arg_reader<QItemSelectionModel * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractItemView_Adaptor *)cls)->cbs_setSelectionModel_2533_0 (arg1);
 }
@@ -5212,7 +5212,7 @@ static void _call_cbs_setVisible_864_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractItemView_Adaptor *)cls)->cbs_setVisible_864_0 (arg1);
 }
@@ -5255,7 +5255,7 @@ static void _call_cbs_showEvent_1634_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QShowEvent *arg1 = args.read<QShowEvent * > (heap);
+  QShowEvent *arg1 = gsi::arg_reader<QShowEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractItemView_Adaptor *)cls)->cbs_showEvent_1634_0 (arg1);
 }
@@ -5298,7 +5298,7 @@ static void _call_cbs_sizeHintForColumn_c767_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   ret.write<int > ((int)((QAbstractItemView_Adaptor *)cls)->cbs_sizeHintForColumn_c767_0 (arg1));
 }
 
@@ -5321,7 +5321,7 @@ static void _call_cbs_sizeHintForRow_c767_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   ret.write<int > ((int)((QAbstractItemView_Adaptor *)cls)->cbs_sizeHintForRow_c767_0 (arg1));
 }
 
@@ -5359,7 +5359,7 @@ static void _call_cbs_startDrag_2456_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFlags<Qt::DropAction> arg1 = args.read<QFlags<Qt::DropAction> > (heap);
+  QFlags<Qt::DropAction> arg1 = gsi::arg_reader<QFlags<Qt::DropAction> >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractItemView_Adaptor *)cls)->cbs_startDrag_2456_0 (arg1);
 }
@@ -5412,7 +5412,7 @@ static void _call_cbs_styleChange_1228_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QStyle &arg1 = args.read<QStyle & > (heap);
+  QStyle &arg1 = gsi::arg_reader<QStyle & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractItemView_Adaptor *)cls)->cbs_styleChange_1228_0 (arg1);
 }
@@ -5436,7 +5436,7 @@ static void _call_cbs_tabletEvent_1821_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTabletEvent *arg1 = args.read<QTabletEvent * > (heap);
+  QTabletEvent *arg1 = gsi::arg_reader<QTabletEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractItemView_Adaptor *)cls)->cbs_tabletEvent_1821_0 (arg1);
 }
@@ -5460,7 +5460,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractItemView_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }
@@ -5578,7 +5578,7 @@ static void _call_cbs_verticalScrollbarAction_767_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractItemView_Adaptor *)cls)->cbs_verticalScrollbarAction_767_0 (arg1);
 }
@@ -5602,7 +5602,7 @@ static void _call_cbs_verticalScrollbarValueChanged_767_0 (const qt_gsi::Generic
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractItemView_Adaptor *)cls)->cbs_verticalScrollbarValueChanged_767_0 (arg1);
 }
@@ -5673,7 +5673,7 @@ static void _call_cbs_viewportEvent_1217_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QAbstractItemView_Adaptor *)cls)->cbs_viewportEvent_1217_0 (arg1));
 }
 
@@ -5696,7 +5696,7 @@ static void _call_cbs_visualRect_c2395_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
   ret.write<QRect > ((QRect)((QAbstractItemView_Adaptor *)cls)->cbs_visualRect_c2395_0 (arg1));
 }
 
@@ -5719,7 +5719,7 @@ static void _call_cbs_visualRegionForSelection_c2727_0 (const qt_gsi::GenericMet
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QItemSelection &arg1 = args.read<const QItemSelection & > (heap);
+  const QItemSelection &arg1 = gsi::arg_reader<const QItemSelection & >() (args, heap);
   ret.write<QRegion > ((QRegion)((QAbstractItemView_Adaptor *)cls)->cbs_visualRegionForSelection_c2727_0 (arg1));
 }
 
@@ -5742,7 +5742,7 @@ static void _call_cbs_wheelEvent_1718_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QWheelEvent *arg1 = args.read<QWheelEvent * > (heap);
+  QWheelEvent *arg1 = gsi::arg_reader<QWheelEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractItemView_Adaptor *)cls)->cbs_wheelEvent_1718_0 (arg1);
 }
@@ -5766,7 +5766,7 @@ static void _call_cbs_windowActivationChange_864_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractItemView_Adaptor *)cls)->cbs_windowActivationChange_864_0 (arg1);
 }

src/gsiqt/qt4/QtGui/gsiDeclQAbstractPageSetupDialog.cc

@@ -1229,7 +1229,7 @@ static void _call_cbs_actionEvent_1823_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QActionEvent *arg1 = args.read<QActionEvent * > (heap);
+  QActionEvent *arg1 = gsi::arg_reader<QActionEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPageSetupDialog_Adaptor *)cls)->cbs_actionEvent_1823_0 (arg1);
 }
@@ -1272,7 +1272,7 @@ static void _call_cbs_changeEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPageSetupDialog_Adaptor *)cls)->cbs_changeEvent_1217_0 (arg1);
 }
@@ -1296,7 +1296,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPageSetupDialog_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -1320,7 +1320,7 @@ static void _call_cbs_closeEvent_1719_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QCloseEvent *arg1 = args.read<QCloseEvent * > (heap);
+  QCloseEvent *arg1 = gsi::arg_reader<QCloseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPageSetupDialog_Adaptor *)cls)->cbs_closeEvent_1719_0 (arg1);
 }
@@ -1344,7 +1344,7 @@ static void _call_cbs_contextMenuEvent_2363_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QContextMenuEvent *arg1 = args.read<QContextMenuEvent * > (heap);
+  QContextMenuEvent *arg1 = gsi::arg_reader<QContextMenuEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPageSetupDialog_Adaptor *)cls)->cbs_contextMenuEvent_2363_0 (arg1);
 }
@@ -1412,7 +1412,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPageSetupDialog_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -1477,7 +1477,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPageSetupDialog_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -1501,7 +1501,7 @@ static void _call_cbs_done_767_0 (const qt_gsi::GenericMethod * /*decl*/, void *
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPageSetupDialog_Adaptor *)cls)->cbs_done_767_0 (arg1);
 }
@@ -1525,7 +1525,7 @@ static void _call_cbs_dragEnterEvent_2109_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragEnterEvent *arg1 = args.read<QDragEnterEvent * > (heap);
+  QDragEnterEvent *arg1 = gsi::arg_reader<QDragEnterEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPageSetupDialog_Adaptor *)cls)->cbs_dragEnterEvent_2109_0 (arg1);
 }
@@ -1549,7 +1549,7 @@ static void _call_cbs_dragLeaveEvent_2092_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragLeaveEvent *arg1 = args.read<QDragLeaveEvent * > (heap);
+  QDragLeaveEvent *arg1 = gsi::arg_reader<QDragLeaveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPageSetupDialog_Adaptor *)cls)->cbs_dragLeaveEvent_2092_0 (arg1);
 }
@@ -1573,7 +1573,7 @@ static void _call_cbs_dragMoveEvent_2006_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragMoveEvent *arg1 = args.read<QDragMoveEvent * > (heap);
+  QDragMoveEvent *arg1 = gsi::arg_reader<QDragMoveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPageSetupDialog_Adaptor *)cls)->cbs_dragMoveEvent_2006_0 (arg1);
 }
@@ -1597,7 +1597,7 @@ static void _call_cbs_dropEvent_1622_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDropEvent *arg1 = args.read<QDropEvent * > (heap);
+  QDropEvent *arg1 = gsi::arg_reader<QDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPageSetupDialog_Adaptor *)cls)->cbs_dropEvent_1622_0 (arg1);
 }
@@ -1621,7 +1621,7 @@ static void _call_cbs_enabledChange_864_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPageSetupDialog_Adaptor *)cls)->cbs_enabledChange_864_0 (arg1);
 }
@@ -1645,7 +1645,7 @@ static void _call_cbs_enterEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPageSetupDialog_Adaptor *)cls)->cbs_enterEvent_1217_0 (arg1);
 }
@@ -1669,7 +1669,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QAbstractPageSetupDialog_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -1694,8 +1694,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QAbstractPageSetupDialog_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -1756,7 +1756,7 @@ static void _call_cbs_focusInEvent_1729_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPageSetupDialog_Adaptor *)cls)->cbs_focusInEvent_1729_0 (arg1);
 }
@@ -1794,7 +1794,7 @@ static void _call_cbs_focusNextPrevChild_864_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   ret.write<bool > ((bool)((QAbstractPageSetupDialog_Adaptor *)cls)->cbs_focusNextPrevChild_864_0 (arg1));
 }
 
@@ -1817,7 +1817,7 @@ static void _call_cbs_focusOutEvent_1729_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPageSetupDialog_Adaptor *)cls)->cbs_focusOutEvent_1729_0 (arg1);
 }
@@ -1855,7 +1855,7 @@ static void _call_cbs_fontChange_1801_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QFont &arg1 = args.read<const QFont & > (heap);
+  const QFont &arg1 = gsi::arg_reader<const QFont & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPageSetupDialog_Adaptor *)cls)->cbs_fontChange_1801_0 (arg1);
 }
@@ -1879,7 +1879,7 @@ static void _call_cbs_heightForWidth_c767_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   ret.write<int > ((int)((QAbstractPageSetupDialog_Adaptor *)cls)->cbs_heightForWidth_c767_0 (arg1));
 }
 
@@ -1902,7 +1902,7 @@ static void _call_cbs_hideEvent_1595_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QHideEvent *arg1 = args.read<QHideEvent * > (heap);
+  QHideEvent *arg1 = gsi::arg_reader<QHideEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPageSetupDialog_Adaptor *)cls)->cbs_hideEvent_1595_0 (arg1);
 }
@@ -1926,7 +1926,7 @@ static void _call_cbs_inputMethodEvent_2354_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QInputMethodEvent *arg1 = args.read<QInputMethodEvent * > (heap);
+  QInputMethodEvent *arg1 = gsi::arg_reader<QInputMethodEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPageSetupDialog_Adaptor *)cls)->cbs_inputMethodEvent_2354_0 (arg1);
 }
@@ -1950,7 +1950,7 @@ static void _call_cbs_inputMethodQuery_c2420_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = args.read<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & > (heap);
+  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & >() (args, heap);
   ret.write<QVariant > ((QVariant)((QAbstractPageSetupDialog_Adaptor *)cls)->cbs_inputMethodQuery_c2420_0 (arg1));
 }
 
@@ -1973,7 +1973,7 @@ static void _call_cbs_keyPressEvent_1514_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPageSetupDialog_Adaptor *)cls)->cbs_keyPressEvent_1514_0 (arg1);
 }
@@ -1997,7 +1997,7 @@ static void _call_cbs_keyReleaseEvent_1514_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPageSetupDialog_Adaptor *)cls)->cbs_keyReleaseEvent_1514_0 (arg1);
 }
@@ -2041,7 +2041,7 @@ static void _call_cbs_leaveEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPageSetupDialog_Adaptor *)cls)->cbs_leaveEvent_1217_0 (arg1);
 }
@@ -2065,7 +2065,7 @@ static void _call_cbs_metric_c3445_0 (const qt_gsi::GenericMethod * /*decl*/, vo
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & arg1 = args.read<const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & > (heap);
+  const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & >() (args, heap);
   ret.write<int > ((int)((QAbstractPageSetupDialog_Adaptor *)cls)->cbs_metric_c3445_0 (arg1));
 }
 
@@ -2107,7 +2107,7 @@ static void _call_cbs_mouseDoubleClickEvent_1738_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPageSetupDialog_Adaptor *)cls)->cbs_mouseDoubleClickEvent_1738_0 (arg1);
 }
@@ -2131,7 +2131,7 @@ static void _call_cbs_mouseMoveEvent_1738_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPageSetupDialog_Adaptor *)cls)->cbs_mouseMoveEvent_1738_0 (arg1);
 }
@@ -2155,7 +2155,7 @@ static void _call_cbs_mousePressEvent_1738_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPageSetupDialog_Adaptor *)cls)->cbs_mousePressEvent_1738_0 (arg1);
 }
@@ -2179,7 +2179,7 @@ static void _call_cbs_mouseReleaseEvent_1738_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPageSetupDialog_Adaptor *)cls)->cbs_mouseReleaseEvent_1738_0 (arg1);
 }
@@ -2203,7 +2203,7 @@ static void _call_cbs_moveEvent_1624_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMoveEvent *arg1 = args.read<QMoveEvent * > (heap);
+  QMoveEvent *arg1 = gsi::arg_reader<QMoveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPageSetupDialog_Adaptor *)cls)->cbs_moveEvent_1624_0 (arg1);
 }
@@ -2246,7 +2246,7 @@ static void _call_cbs_paintEvent_1725_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QPaintEvent *arg1 = args.read<QPaintEvent * > (heap);
+  QPaintEvent *arg1 = gsi::arg_reader<QPaintEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPageSetupDialog_Adaptor *)cls)->cbs_paintEvent_1725_0 (arg1);
 }
@@ -2270,7 +2270,7 @@ static void _call_cbs_paletteChange_2113_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QPalette &arg1 = args.read<const QPalette & > (heap);
+  const QPalette &arg1 = gsi::arg_reader<const QPalette & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPageSetupDialog_Adaptor *)cls)->cbs_paletteChange_2113_0 (arg1);
 }
@@ -2362,7 +2362,7 @@ static void _call_cbs_resizeEvent_1843_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QResizeEvent *arg1 = args.read<QResizeEvent * > (heap);
+  QResizeEvent *arg1 = gsi::arg_reader<QResizeEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPageSetupDialog_Adaptor *)cls)->cbs_resizeEvent_1843_0 (arg1);
 }
@@ -2400,7 +2400,7 @@ static void _call_cbs_setVisible_864_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPageSetupDialog_Adaptor *)cls)->cbs_setVisible_864_0 (arg1);
 }
@@ -2424,7 +2424,7 @@ static void _call_cbs_showEvent_1634_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QShowEvent *arg1 = args.read<QShowEvent * > (heap);
+  QShowEvent *arg1 = gsi::arg_reader<QShowEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPageSetupDialog_Adaptor *)cls)->cbs_showEvent_1634_0 (arg1);
 }
@@ -2467,7 +2467,7 @@ static void _call_cbs_styleChange_1228_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QStyle &arg1 = args.read<QStyle & > (heap);
+  QStyle &arg1 = gsi::arg_reader<QStyle & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPageSetupDialog_Adaptor *)cls)->cbs_styleChange_1228_0 (arg1);
 }
@@ -2491,7 +2491,7 @@ static void _call_cbs_tabletEvent_1821_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTabletEvent *arg1 = args.read<QTabletEvent * > (heap);
+  QTabletEvent *arg1 = gsi::arg_reader<QTabletEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPageSetupDialog_Adaptor *)cls)->cbs_tabletEvent_1821_0 (arg1);
 }
@@ -2515,7 +2515,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPageSetupDialog_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }
@@ -2554,7 +2554,7 @@ static void _call_cbs_wheelEvent_1718_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QWheelEvent *arg1 = args.read<QWheelEvent * > (heap);
+  QWheelEvent *arg1 = gsi::arg_reader<QWheelEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPageSetupDialog_Adaptor *)cls)->cbs_wheelEvent_1718_0 (arg1);
 }
@@ -2578,7 +2578,7 @@ static void _call_cbs_windowActivationChange_864_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPageSetupDialog_Adaptor *)cls)->cbs_windowActivationChange_864_0 (arg1);
 }

src/gsiqt/qt4/QtGui/gsiDeclQAbstractPrintDialog.cc

@@ -1465,7 +1465,7 @@ static void _call_cbs_actionEvent_1823_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QActionEvent *arg1 = args.read<QActionEvent * > (heap);
+  QActionEvent *arg1 = gsi::arg_reader<QActionEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPrintDialog_Adaptor *)cls)->cbs_actionEvent_1823_0 (arg1);
 }
@@ -1508,7 +1508,7 @@ static void _call_cbs_changeEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPrintDialog_Adaptor *)cls)->cbs_changeEvent_1217_0 (arg1);
 }
@@ -1532,7 +1532,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPrintDialog_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -1556,7 +1556,7 @@ static void _call_cbs_closeEvent_1719_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QCloseEvent *arg1 = args.read<QCloseEvent * > (heap);
+  QCloseEvent *arg1 = gsi::arg_reader<QCloseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPrintDialog_Adaptor *)cls)->cbs_closeEvent_1719_0 (arg1);
 }
@@ -1580,7 +1580,7 @@ static void _call_cbs_contextMenuEvent_2363_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QContextMenuEvent *arg1 = args.read<QContextMenuEvent * > (heap);
+  QContextMenuEvent *arg1 = gsi::arg_reader<QContextMenuEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPrintDialog_Adaptor *)cls)->cbs_contextMenuEvent_2363_0 (arg1);
 }
@@ -1647,7 +1647,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPrintDialog_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -1711,7 +1711,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPrintDialog_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -1735,7 +1735,7 @@ static void _call_cbs_done_767_0 (const qt_gsi::GenericMethod * /*decl*/, void *
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPrintDialog_Adaptor *)cls)->cbs_done_767_0 (arg1);
 }
@@ -1759,7 +1759,7 @@ static void _call_cbs_dragEnterEvent_2109_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragEnterEvent *arg1 = args.read<QDragEnterEvent * > (heap);
+  QDragEnterEvent *arg1 = gsi::arg_reader<QDragEnterEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPrintDialog_Adaptor *)cls)->cbs_dragEnterEvent_2109_0 (arg1);
 }
@@ -1783,7 +1783,7 @@ static void _call_cbs_dragLeaveEvent_2092_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragLeaveEvent *arg1 = args.read<QDragLeaveEvent * > (heap);
+  QDragLeaveEvent *arg1 = gsi::arg_reader<QDragLeaveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPrintDialog_Adaptor *)cls)->cbs_dragLeaveEvent_2092_0 (arg1);
 }
@@ -1807,7 +1807,7 @@ static void _call_cbs_dragMoveEvent_2006_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragMoveEvent *arg1 = args.read<QDragMoveEvent * > (heap);
+  QDragMoveEvent *arg1 = gsi::arg_reader<QDragMoveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPrintDialog_Adaptor *)cls)->cbs_dragMoveEvent_2006_0 (arg1);
 }
@@ -1831,7 +1831,7 @@ static void _call_cbs_dropEvent_1622_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDropEvent *arg1 = args.read<QDropEvent * > (heap);
+  QDropEvent *arg1 = gsi::arg_reader<QDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPrintDialog_Adaptor *)cls)->cbs_dropEvent_1622_0 (arg1);
 }
@@ -1855,7 +1855,7 @@ static void _call_cbs_enabledChange_864_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPrintDialog_Adaptor *)cls)->cbs_enabledChange_864_0 (arg1);
 }
@@ -1879,7 +1879,7 @@ static void _call_cbs_enterEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPrintDialog_Adaptor *)cls)->cbs_enterEvent_1217_0 (arg1);
 }
@@ -1903,7 +1903,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QAbstractPrintDialog_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -1928,8 +1928,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QAbstractPrintDialog_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -1989,7 +1989,7 @@ static void _call_cbs_focusInEvent_1729_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPrintDialog_Adaptor *)cls)->cbs_focusInEvent_1729_0 (arg1);
 }
@@ -2027,7 +2027,7 @@ static void _call_cbs_focusNextPrevChild_864_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   ret.write<bool > ((bool)((QAbstractPrintDialog_Adaptor *)cls)->cbs_focusNextPrevChild_864_0 (arg1));
 }
 
@@ -2050,7 +2050,7 @@ static void _call_cbs_focusOutEvent_1729_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPrintDialog_Adaptor *)cls)->cbs_focusOutEvent_1729_0 (arg1);
 }
@@ -2088,7 +2088,7 @@ static void _call_cbs_fontChange_1801_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QFont &arg1 = args.read<const QFont & > (heap);
+  const QFont &arg1 = gsi::arg_reader<const QFont & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPrintDialog_Adaptor *)cls)->cbs_fontChange_1801_0 (arg1);
 }
@@ -2112,7 +2112,7 @@ static void _call_cbs_heightForWidth_c767_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   ret.write<int > ((int)((QAbstractPrintDialog_Adaptor *)cls)->cbs_heightForWidth_c767_0 (arg1));
 }
 
@@ -2135,7 +2135,7 @@ static void _call_cbs_hideEvent_1595_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QHideEvent *arg1 = args.read<QHideEvent * > (heap);
+  QHideEvent *arg1 = gsi::arg_reader<QHideEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPrintDialog_Adaptor *)cls)->cbs_hideEvent_1595_0 (arg1);
 }
@@ -2159,7 +2159,7 @@ static void _call_cbs_inputMethodEvent_2354_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QInputMethodEvent *arg1 = args.read<QInputMethodEvent * > (heap);
+  QInputMethodEvent *arg1 = gsi::arg_reader<QInputMethodEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPrintDialog_Adaptor *)cls)->cbs_inputMethodEvent_2354_0 (arg1);
 }
@@ -2183,7 +2183,7 @@ static void _call_cbs_inputMethodQuery_c2420_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = args.read<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & > (heap);
+  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & >() (args, heap);
   ret.write<QVariant > ((QVariant)((QAbstractPrintDialog_Adaptor *)cls)->cbs_inputMethodQuery_c2420_0 (arg1));
 }
 
@@ -2206,7 +2206,7 @@ static void _call_cbs_keyPressEvent_1514_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPrintDialog_Adaptor *)cls)->cbs_keyPressEvent_1514_0 (arg1);
 }
@@ -2230,7 +2230,7 @@ static void _call_cbs_keyReleaseEvent_1514_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPrintDialog_Adaptor *)cls)->cbs_keyReleaseEvent_1514_0 (arg1);
 }
@@ -2274,7 +2274,7 @@ static void _call_cbs_leaveEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPrintDialog_Adaptor *)cls)->cbs_leaveEvent_1217_0 (arg1);
 }
@@ -2298,7 +2298,7 @@ static void _call_cbs_metric_c3445_0 (const qt_gsi::GenericMethod * /*decl*/, vo
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & arg1 = args.read<const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & > (heap);
+  const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & >() (args, heap);
   ret.write<int > ((int)((QAbstractPrintDialog_Adaptor *)cls)->cbs_metric_c3445_0 (arg1));
 }
 
@@ -2340,7 +2340,7 @@ static void _call_cbs_mouseDoubleClickEvent_1738_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPrintDialog_Adaptor *)cls)->cbs_mouseDoubleClickEvent_1738_0 (arg1);
 }
@@ -2364,7 +2364,7 @@ static void _call_cbs_mouseMoveEvent_1738_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPrintDialog_Adaptor *)cls)->cbs_mouseMoveEvent_1738_0 (arg1);
 }
@@ -2388,7 +2388,7 @@ static void _call_cbs_mousePressEvent_1738_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPrintDialog_Adaptor *)cls)->cbs_mousePressEvent_1738_0 (arg1);
 }
@@ -2412,7 +2412,7 @@ static void _call_cbs_mouseReleaseEvent_1738_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPrintDialog_Adaptor *)cls)->cbs_mouseReleaseEvent_1738_0 (arg1);
 }
@@ -2436,7 +2436,7 @@ static void _call_cbs_moveEvent_1624_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMoveEvent *arg1 = args.read<QMoveEvent * > (heap);
+  QMoveEvent *arg1 = gsi::arg_reader<QMoveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPrintDialog_Adaptor *)cls)->cbs_moveEvent_1624_0 (arg1);
 }
@@ -2479,7 +2479,7 @@ static void _call_cbs_paintEvent_1725_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QPaintEvent *arg1 = args.read<QPaintEvent * > (heap);
+  QPaintEvent *arg1 = gsi::arg_reader<QPaintEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPrintDialog_Adaptor *)cls)->cbs_paintEvent_1725_0 (arg1);
 }
@@ -2503,7 +2503,7 @@ static void _call_cbs_paletteChange_2113_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QPalette &arg1 = args.read<const QPalette & > (heap);
+  const QPalette &arg1 = gsi::arg_reader<const QPalette & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPrintDialog_Adaptor *)cls)->cbs_paletteChange_2113_0 (arg1);
 }
@@ -2594,7 +2594,7 @@ static void _call_cbs_resizeEvent_1843_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QResizeEvent *arg1 = args.read<QResizeEvent * > (heap);
+  QResizeEvent *arg1 = gsi::arg_reader<QResizeEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPrintDialog_Adaptor *)cls)->cbs_resizeEvent_1843_0 (arg1);
 }
@@ -2632,7 +2632,7 @@ static void _call_cbs_setVisible_864_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPrintDialog_Adaptor *)cls)->cbs_setVisible_864_0 (arg1);
 }
@@ -2656,7 +2656,7 @@ static void _call_cbs_showEvent_1634_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QShowEvent *arg1 = args.read<QShowEvent * > (heap);
+  QShowEvent *arg1 = gsi::arg_reader<QShowEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPrintDialog_Adaptor *)cls)->cbs_showEvent_1634_0 (arg1);
 }
@@ -2699,7 +2699,7 @@ static void _call_cbs_styleChange_1228_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QStyle &arg1 = args.read<QStyle & > (heap);
+  QStyle &arg1 = gsi::arg_reader<QStyle & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPrintDialog_Adaptor *)cls)->cbs_styleChange_1228_0 (arg1);
 }
@@ -2723,7 +2723,7 @@ static void _call_cbs_tabletEvent_1821_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTabletEvent *arg1 = args.read<QTabletEvent * > (heap);
+  QTabletEvent *arg1 = gsi::arg_reader<QTabletEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPrintDialog_Adaptor *)cls)->cbs_tabletEvent_1821_0 (arg1);
 }
@@ -2747,7 +2747,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPrintDialog_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }
@@ -2786,7 +2786,7 @@ static void _call_cbs_wheelEvent_1718_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QWheelEvent *arg1 = args.read<QWheelEvent * > (heap);
+  QWheelEvent *arg1 = gsi::arg_reader<QWheelEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPrintDialog_Adaptor *)cls)->cbs_wheelEvent_1718_0 (arg1);
 }
@@ -2810,7 +2810,7 @@ static void _call_cbs_windowActivationChange_864_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractPrintDialog_Adaptor *)cls)->cbs_windowActivationChange_864_0 (arg1);
 }

src/gsiqt/qt4/QtGui/gsiDeclQAbstractProxyModel.cc

@@ -1496,7 +1496,7 @@ static void _call_cbs_buddy_c2395_0 (const qt_gsi::GenericMethod * /*decl*/, voi
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
   ret.write<QModelIndex > ((QModelIndex)((QAbstractProxyModel_Adaptor *)cls)->cbs_buddy_c2395_0 (arg1));
 }
 
@@ -1519,7 +1519,7 @@ static void _call_cbs_canFetchMore_c2395_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
   ret.write<bool > ((bool)((QAbstractProxyModel_Adaptor *)cls)->cbs_canFetchMore_c2395_0 (arg1));
 }
 
@@ -1586,7 +1586,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractProxyModel_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -1610,7 +1610,7 @@ static void _call_cbs_columnCount_c2395_1 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
+  const QModelIndex &arg1 = args ? gsi::arg_reader<const QModelIndex & >() (args, heap) : gsi::arg_maker<const QModelIndex & >() (QModelIndex(), heap);
   ret.write<int > ((int)((QAbstractProxyModel_Adaptor *)cls)->cbs_columnCount_c2395_1 (arg1));
 }
 
@@ -1705,7 +1705,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractProxyModel_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -1731,8 +1731,8 @@ static void _call_cbs_data_c3054_1 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
-  int arg2 = args.read<int > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
+  int arg2 = args ? gsi::arg_reader<int >() (args, heap) : gsi::arg_maker<int >() (Qt::DisplayRole, heap);
   ret.write<QVariant > ((QVariant)((QAbstractProxyModel_Adaptor *)cls)->cbs_data_c3054_1 (arg1, arg2));
 }
 
@@ -1821,7 +1821,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractProxyModel_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -1853,11 +1853,11 @@ static void _call_cbs_dropMimeData_7425_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QMimeData *arg1 = args.read<const QMimeData * > (heap);
-  const qt_gsi::Converter<Qt::DropAction>::target_type & arg2 = args.read<const qt_gsi::Converter<Qt::DropAction>::target_type & > (heap);
-  int arg3 = args.read<int > (heap);
-  int arg4 = args.read<int > (heap);
-  const QModelIndex &arg5 = args.read<const QModelIndex & > (heap);
+  const QMimeData *arg1 = gsi::arg_reader<const QMimeData * >() (args, heap);
+  const qt_gsi::Converter<Qt::DropAction>::target_type & arg2 = gsi::arg_reader<const qt_gsi::Converter<Qt::DropAction>::target_type & >() (args, heap);
+  int arg3 = gsi::arg_reader<int >() (args, heap);
+  int arg4 = gsi::arg_reader<int >() (args, heap);
+  const QModelIndex &arg5 = gsi::arg_reader<const QModelIndex & >() (args, heap);
   ret.write<bool > ((bool)((QAbstractProxyModel_Adaptor *)cls)->cbs_dropMimeData_7425_0 (arg1, arg2, arg3, arg4, arg5));
 }
 
@@ -2007,7 +2007,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QAbstractProxyModel_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -2032,8 +2032,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QAbstractProxyModel_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -2056,7 +2056,7 @@ static void _call_cbs_fetchMore_2395_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractProxyModel_Adaptor *)cls)->cbs_fetchMore_2395_0 (arg1);
 }
@@ -2080,7 +2080,7 @@ static void _call_cbs_flags_c2395_0 (const qt_gsi::GenericMethod * /*decl*/, voi
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
   ret.write<QFlags<Qt::ItemFlag> > ((QFlags<Qt::ItemFlag>)((QAbstractProxyModel_Adaptor *)cls)->cbs_flags_c2395_0 (arg1));
 }
 
@@ -2103,7 +2103,7 @@ static void _call_cbs_hasChildren_c2395_1 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
+  const QModelIndex &arg1 = args ? gsi::arg_reader<const QModelIndex & >() (args, heap) : gsi::arg_maker<const QModelIndex & >() (QModelIndex(), heap);
   ret.write<bool > ((bool)((QAbstractProxyModel_Adaptor *)cls)->cbs_hasChildren_c2395_1 (arg1));
 }
 
@@ -2130,9 +2130,9 @@ static void _call_cbs_headerData_c3231_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
-  const qt_gsi::Converter<Qt::Orientation>::target_type & arg2 = args.read<const qt_gsi::Converter<Qt::Orientation>::target_type & > (heap);
-  int arg3 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
+  const qt_gsi::Converter<Qt::Orientation>::target_type & arg2 = gsi::arg_reader<const qt_gsi::Converter<Qt::Orientation>::target_type & >() (args, heap);
+  int arg3 = gsi::arg_reader<int >() (args, heap);
   ret.write<QVariant > ((QVariant)((QAbstractProxyModel_Adaptor *)cls)->cbs_headerData_c3231_0 (arg1, arg2, arg3));
 }
 
@@ -2183,9 +2183,9 @@ static void _call_cbs_index_c3713_1 (const qt_gsi::GenericMethod * /*decl*/, voi
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
-  int arg2 = args.read<int > (heap);
-  const QModelIndex &arg3 = args.read<const QModelIndex & > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
+  int arg2 = gsi::arg_reader<int >() (args, heap);
+  const QModelIndex &arg3 = args ? gsi::arg_reader<const QModelIndex & >() (args, heap) : gsi::arg_maker<const QModelIndex & >() (QModelIndex(), heap);
   ret.write<QModelIndex > ((QModelIndex)((QAbstractProxyModel_Adaptor *)cls)->cbs_index_c3713_1 (arg1, arg2, arg3));
 }
 
@@ -2212,9 +2212,9 @@ static void _call_cbs_insertColumns_3713_1 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
-  int arg2 = args.read<int > (heap);
-  const QModelIndex &arg3 = args.read<const QModelIndex & > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
+  int arg2 = gsi::arg_reader<int >() (args, heap);
+  const QModelIndex &arg3 = args ? gsi::arg_reader<const QModelIndex & >() (args, heap) : gsi::arg_maker<const QModelIndex & >() (QModelIndex(), heap);
   ret.write<bool > ((bool)((QAbstractProxyModel_Adaptor *)cls)->cbs_insertColumns_3713_1 (arg1, arg2, arg3));
 }
 
@@ -2241,9 +2241,9 @@ static void _call_cbs_insertRows_3713_1 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
-  int arg2 = args.read<int > (heap);
-  const QModelIndex &arg3 = args.read<const QModelIndex & > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
+  int arg2 = gsi::arg_reader<int >() (args, heap);
+  const QModelIndex &arg3 = args ? gsi::arg_reader<const QModelIndex & >() (args, heap) : gsi::arg_maker<const QModelIndex & >() (QModelIndex(), heap);
   ret.write<bool > ((bool)((QAbstractProxyModel_Adaptor *)cls)->cbs_insertRows_3713_1 (arg1, arg2, arg3));
 }
 
@@ -2266,7 +2266,7 @@ static void _call_cbs_itemData_c2395_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
   ret.write<QMap<int, QVariant> > ((QMap<int, QVariant>)((QAbstractProxyModel_Adaptor *)cls)->cbs_itemData_c2395_0 (arg1));
 }
 
@@ -2317,7 +2317,7 @@ static void _call_cbs_mapFromSource_c2395_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
   ret.write<QModelIndex > ((QModelIndex)((QAbstractProxyModel_Adaptor *)cls)->cbs_mapFromSource_c2395_0 (arg1));
 }
 
@@ -2340,7 +2340,7 @@ static void _call_cbs_mapSelectionFromSource_c2727_0 (const qt_gsi::GenericMetho
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QItemSelection &arg1 = args.read<const QItemSelection & > (heap);
+  const QItemSelection &arg1 = gsi::arg_reader<const QItemSelection & >() (args, heap);
   ret.write<QItemSelection > ((QItemSelection)((QAbstractProxyModel_Adaptor *)cls)->cbs_mapSelectionFromSource_c2727_0 (arg1));
 }
 
@@ -2363,7 +2363,7 @@ static void _call_cbs_mapSelectionToSource_c2727_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QItemSelection &arg1 = args.read<const QItemSelection & > (heap);
+  const QItemSelection &arg1 = gsi::arg_reader<const QItemSelection & >() (args, heap);
   ret.write<QItemSelection > ((QItemSelection)((QAbstractProxyModel_Adaptor *)cls)->cbs_mapSelectionToSource_c2727_0 (arg1));
 }
 
@@ -2386,7 +2386,7 @@ static void _call_cbs_mapToSource_c2395_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
   ret.write<QModelIndex > ((QModelIndex)((QAbstractProxyModel_Adaptor *)cls)->cbs_mapToSource_c2395_0 (arg1));
 }
 
@@ -2417,11 +2417,11 @@ static void _call_cbs_match_c7932_2 (const qt_gsi::GenericMethod * /*decl*/, voi
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
-  int arg2 = args.read<int > (heap);
-  const QVariant &arg3 = args.read<const QVariant & > (heap);
-  int arg4 = args.read<int > (heap);
-  QFlags<Qt::MatchFlag> arg5 = args.read<QFlags<Qt::MatchFlag> > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
+  int arg2 = gsi::arg_reader<int >() (args, heap);
+  const QVariant &arg3 = gsi::arg_reader<const QVariant & >() (args, heap);
+  int arg4 = args ? gsi::arg_reader<int >() (args, heap) : gsi::arg_maker<int >() (1, heap);
+  QFlags<Qt::MatchFlag> arg5 = args ? gsi::arg_reader<QFlags<Qt::MatchFlag> >() (args, heap) : gsi::arg_maker<QFlags<Qt::MatchFlag> >() (Qt::MatchFlags(Qt::MatchStartsWith|Qt::MatchWrap), heap);
   ret.write<QList<QModelIndex> > ((QList<QModelIndex>)((QAbstractProxyModel_Adaptor *)cls)->cbs_match_c7932_2 (arg1, arg2, arg3, arg4, arg5));
 }
 
@@ -2444,7 +2444,7 @@ static void _call_cbs_mimeData_c3010_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QList<QModelIndex> &arg1 = args.read<const QList<QModelIndex> & > (heap);
+  const QList<QModelIndex> &arg1 = gsi::arg_reader<const QList<QModelIndex> & >() (args, heap);
   ret.write<QMimeData * > ((QMimeData *)((QAbstractProxyModel_Adaptor *)cls)->cbs_mimeData_c3010_0 (arg1));
 }
 
@@ -2486,7 +2486,7 @@ static void _call_cbs_parent_c2395_0 (const qt_gsi::GenericMethod * /*decl*/, vo
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
   ret.write<QModelIndex > ((QModelIndex)((QAbstractProxyModel_Adaptor *)cls)->cbs_parent_c2395_0 (arg1));
 }
 
@@ -2545,9 +2545,9 @@ static void _call_cbs_removeColumns_3713_1 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
-  int arg2 = args.read<int > (heap);
-  const QModelIndex &arg3 = args.read<const QModelIndex & > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
+  int arg2 = gsi::arg_reader<int >() (args, heap);
+  const QModelIndex &arg3 = args ? gsi::arg_reader<const QModelIndex & >() (args, heap) : gsi::arg_maker<const QModelIndex & >() (QModelIndex(), heap);
   ret.write<bool > ((bool)((QAbstractProxyModel_Adaptor *)cls)->cbs_removeColumns_3713_1 (arg1, arg2, arg3));
 }
 
@@ -2574,9 +2574,9 @@ static void _call_cbs_removeRows_3713_1 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
-  int arg2 = args.read<int > (heap);
-  const QModelIndex &arg3 = args.read<const QModelIndex & > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
+  int arg2 = gsi::arg_reader<int >() (args, heap);
+  const QModelIndex &arg3 = args ? gsi::arg_reader<const QModelIndex & >() (args, heap) : gsi::arg_maker<const QModelIndex & >() (QModelIndex(), heap);
   ret.write<bool > ((bool)((QAbstractProxyModel_Adaptor *)cls)->cbs_removeRows_3713_1 (arg1, arg2, arg3));
 }
 
@@ -2634,7 +2634,7 @@ static void _call_cbs_rowCount_c2395_1 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
+  const QModelIndex &arg1 = args ? gsi::arg_reader<const QModelIndex & >() (args, heap) : gsi::arg_maker<const QModelIndex & >() (QModelIndex(), heap);
   ret.write<int > ((int)((QAbstractProxyModel_Adaptor *)cls)->cbs_rowCount_c2395_1 (arg1));
 }
 
@@ -2675,9 +2675,9 @@ static void _call_cbs_setData_5065_1 (const qt_gsi::GenericMethod * /*decl*/, vo
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
-  const QVariant &arg2 = args.read<const QVariant & > (heap);
-  int arg3 = args.read<int > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
+  const QVariant &arg2 = gsi::arg_reader<const QVariant & >() (args, heap);
+  int arg3 = args ? gsi::arg_reader<int >() (args, heap) : gsi::arg_maker<int >() (Qt::EditRole, heap);
   ret.write<bool > ((bool)((QAbstractProxyModel_Adaptor *)cls)->cbs_setData_5065_1 (arg1, arg2, arg3));
 }
 
@@ -2706,10 +2706,10 @@ static void _call_cbs_setHeaderData_5242_1 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
-  const qt_gsi::Converter<Qt::Orientation>::target_type & arg2 = args.read<const qt_gsi::Converter<Qt::Orientation>::target_type & > (heap);
-  const QVariant &arg3 = args.read<const QVariant & > (heap);
-  int arg4 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
+  const qt_gsi::Converter<Qt::Orientation>::target_type & arg2 = gsi::arg_reader<const qt_gsi::Converter<Qt::Orientation>::target_type & >() (args, heap);
+  const QVariant &arg3 = gsi::arg_reader<const QVariant & >() (args, heap);
+  int arg4 = args ? gsi::arg_reader<int >() (args, heap) : gsi::arg_maker<int >() (Qt::EditRole, heap);
   ret.write<bool > ((bool)((QAbstractProxyModel_Adaptor *)cls)->cbs_setHeaderData_5242_1 (arg1, arg2, arg3, arg4));
 }
 
@@ -2734,8 +2734,8 @@ static void _call_cbs_setItemData_5414_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
-  const QMap<int, QVariant> &arg2 = args.read<const QMap<int, QVariant> & > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
+  const QMap<int, QVariant> &arg2 = gsi::arg_reader<const QMap<int, QVariant> & >() (args, heap);
   ret.write<bool > ((bool)((QAbstractProxyModel_Adaptor *)cls)->cbs_setItemData_5414_0 (arg1, arg2));
 }
 
@@ -2777,7 +2777,7 @@ static void _call_cbs_setSourceModel_2419_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QAbstractItemModel *arg1 = args.read<QAbstractItemModel * > (heap);
+  QAbstractItemModel *arg1 = gsi::arg_reader<QAbstractItemModel * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractProxyModel_Adaptor *)cls)->cbs_setSourceModel_2419_0 (arg1);
 }
@@ -2803,8 +2803,8 @@ static void _call_cbs_sort_2340_1 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
-  const qt_gsi::Converter<Qt::SortOrder>::target_type & arg2 = args.read<const qt_gsi::Converter<Qt::SortOrder>::target_type & > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
+  const qt_gsi::Converter<Qt::SortOrder>::target_type & arg2 = args ? gsi::arg_reader<const qt_gsi::Converter<Qt::SortOrder>::target_type & >() (args, heap) : gsi::arg_maker<const qt_gsi::Converter<Qt::SortOrder>::target_type & >() (qt_gsi::CppToQtReadAdaptor<Qt::SortOrder>(heap, Qt::AscendingOrder), heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractProxyModel_Adaptor *)cls)->cbs_sort_2340_1 (arg1, arg2);
 }
@@ -2828,7 +2828,7 @@ static void _call_cbs_span_c2395_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
   ret.write<QSize > ((QSize)((QAbstractProxyModel_Adaptor *)cls)->cbs_span_c2395_0 (arg1));
 }
 
@@ -2889,7 +2889,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractProxyModel_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }

src/gsiqt/qt4/QtGui/gsiDeclQAbstractScrollArea.cc

@@ -1424,7 +1424,7 @@ static void _call_cbs_actionEvent_1823_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QActionEvent *arg1 = args.read<QActionEvent * > (heap);
+  QActionEvent *arg1 = gsi::arg_reader<QActionEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractScrollArea_Adaptor *)cls)->cbs_actionEvent_1823_0 (arg1);
 }
@@ -1448,7 +1448,7 @@ static void _call_cbs_changeEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractScrollArea_Adaptor *)cls)->cbs_changeEvent_1217_0 (arg1);
 }
@@ -1472,7 +1472,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractScrollArea_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -1496,7 +1496,7 @@ static void _call_cbs_closeEvent_1719_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QCloseEvent *arg1 = args.read<QCloseEvent * > (heap);
+  QCloseEvent *arg1 = gsi::arg_reader<QCloseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractScrollArea_Adaptor *)cls)->cbs_closeEvent_1719_0 (arg1);
 }
@@ -1520,7 +1520,7 @@ static void _call_cbs_contextMenuEvent_2363_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QContextMenuEvent *arg1 = args.read<QContextMenuEvent * > (heap);
+  QContextMenuEvent *arg1 = gsi::arg_reader<QContextMenuEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractScrollArea_Adaptor *)cls)->cbs_contextMenuEvent_2363_0 (arg1);
 }
@@ -1587,7 +1587,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractScrollArea_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -1651,7 +1651,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractScrollArea_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -1675,7 +1675,7 @@ static void _call_cbs_dragEnterEvent_2109_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragEnterEvent *arg1 = args.read<QDragEnterEvent * > (heap);
+  QDragEnterEvent *arg1 = gsi::arg_reader<QDragEnterEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractScrollArea_Adaptor *)cls)->cbs_dragEnterEvent_2109_0 (arg1);
 }
@@ -1699,7 +1699,7 @@ static void _call_cbs_dragLeaveEvent_2092_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragLeaveEvent *arg1 = args.read<QDragLeaveEvent * > (heap);
+  QDragLeaveEvent *arg1 = gsi::arg_reader<QDragLeaveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractScrollArea_Adaptor *)cls)->cbs_dragLeaveEvent_2092_0 (arg1);
 }
@@ -1723,7 +1723,7 @@ static void _call_cbs_dragMoveEvent_2006_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragMoveEvent *arg1 = args.read<QDragMoveEvent * > (heap);
+  QDragMoveEvent *arg1 = gsi::arg_reader<QDragMoveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractScrollArea_Adaptor *)cls)->cbs_dragMoveEvent_2006_0 (arg1);
 }
@@ -1766,7 +1766,7 @@ static void _call_cbs_dropEvent_1622_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDropEvent *arg1 = args.read<QDropEvent * > (heap);
+  QDropEvent *arg1 = gsi::arg_reader<QDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractScrollArea_Adaptor *)cls)->cbs_dropEvent_1622_0 (arg1);
 }
@@ -1790,7 +1790,7 @@ static void _call_cbs_enabledChange_864_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractScrollArea_Adaptor *)cls)->cbs_enabledChange_864_0 (arg1);
 }
@@ -1814,7 +1814,7 @@ static void _call_cbs_enterEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractScrollArea_Adaptor *)cls)->cbs_enterEvent_1217_0 (arg1);
 }
@@ -1838,7 +1838,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QAbstractScrollArea_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -1863,8 +1863,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QAbstractScrollArea_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -1887,7 +1887,7 @@ static void _call_cbs_focusInEvent_1729_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractScrollArea_Adaptor *)cls)->cbs_focusInEvent_1729_0 (arg1);
 }
@@ -1925,7 +1925,7 @@ static void _call_cbs_focusNextPrevChild_864_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   ret.write<bool > ((bool)((QAbstractScrollArea_Adaptor *)cls)->cbs_focusNextPrevChild_864_0 (arg1));
 }
 
@@ -1948,7 +1948,7 @@ static void _call_cbs_focusOutEvent_1729_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractScrollArea_Adaptor *)cls)->cbs_focusOutEvent_1729_0 (arg1);
 }
@@ -1986,7 +1986,7 @@ static void _call_cbs_fontChange_1801_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QFont &arg1 = args.read<const QFont & > (heap);
+  const QFont &arg1 = gsi::arg_reader<const QFont & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractScrollArea_Adaptor *)cls)->cbs_fontChange_1801_0 (arg1);
 }
@@ -2010,7 +2010,7 @@ static void _call_cbs_heightForWidth_c767_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   ret.write<int > ((int)((QAbstractScrollArea_Adaptor *)cls)->cbs_heightForWidth_c767_0 (arg1));
 }
 
@@ -2033,7 +2033,7 @@ static void _call_cbs_hideEvent_1595_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QHideEvent *arg1 = args.read<QHideEvent * > (heap);
+  QHideEvent *arg1 = gsi::arg_reader<QHideEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractScrollArea_Adaptor *)cls)->cbs_hideEvent_1595_0 (arg1);
 }
@@ -2057,7 +2057,7 @@ static void _call_cbs_inputMethodEvent_2354_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QInputMethodEvent *arg1 = args.read<QInputMethodEvent * > (heap);
+  QInputMethodEvent *arg1 = gsi::arg_reader<QInputMethodEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractScrollArea_Adaptor *)cls)->cbs_inputMethodEvent_2354_0 (arg1);
 }
@@ -2081,7 +2081,7 @@ static void _call_cbs_inputMethodQuery_c2420_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = args.read<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & > (heap);
+  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & >() (args, heap);
   ret.write<QVariant > ((QVariant)((QAbstractScrollArea_Adaptor *)cls)->cbs_inputMethodQuery_c2420_0 (arg1));
 }
 
@@ -2104,7 +2104,7 @@ static void _call_cbs_keyPressEvent_1514_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractScrollArea_Adaptor *)cls)->cbs_keyPressEvent_1514_0 (arg1);
 }
@@ -2128,7 +2128,7 @@ static void _call_cbs_keyReleaseEvent_1514_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractScrollArea_Adaptor *)cls)->cbs_keyReleaseEvent_1514_0 (arg1);
 }
@@ -2172,7 +2172,7 @@ static void _call_cbs_leaveEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractScrollArea_Adaptor *)cls)->cbs_leaveEvent_1217_0 (arg1);
 }
@@ -2196,7 +2196,7 @@ static void _call_cbs_metric_c3445_0 (const qt_gsi::GenericMethod * /*decl*/, vo
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & arg1 = args.read<const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & > (heap);
+  const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & >() (args, heap);
   ret.write<int > ((int)((QAbstractScrollArea_Adaptor *)cls)->cbs_metric_c3445_0 (arg1));
 }
 
@@ -2238,7 +2238,7 @@ static void _call_cbs_mouseDoubleClickEvent_1738_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractScrollArea_Adaptor *)cls)->cbs_mouseDoubleClickEvent_1738_0 (arg1);
 }
@@ -2262,7 +2262,7 @@ static void _call_cbs_mouseMoveEvent_1738_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractScrollArea_Adaptor *)cls)->cbs_mouseMoveEvent_1738_0 (arg1);
 }
@@ -2286,7 +2286,7 @@ static void _call_cbs_mousePressEvent_1738_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractScrollArea_Adaptor *)cls)->cbs_mousePressEvent_1738_0 (arg1);
 }
@@ -2310,7 +2310,7 @@ static void _call_cbs_mouseReleaseEvent_1738_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractScrollArea_Adaptor *)cls)->cbs_mouseReleaseEvent_1738_0 (arg1);
 }
@@ -2334,7 +2334,7 @@ static void _call_cbs_moveEvent_1624_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMoveEvent *arg1 = args.read<QMoveEvent * > (heap);
+  QMoveEvent *arg1 = gsi::arg_reader<QMoveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractScrollArea_Adaptor *)cls)->cbs_moveEvent_1624_0 (arg1);
 }
@@ -2377,7 +2377,7 @@ static void _call_cbs_paintEvent_1725_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QPaintEvent *arg1 = args.read<QPaintEvent * > (heap);
+  QPaintEvent *arg1 = gsi::arg_reader<QPaintEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractScrollArea_Adaptor *)cls)->cbs_paintEvent_1725_0 (arg1);
 }
@@ -2401,7 +2401,7 @@ static void _call_cbs_paletteChange_2113_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QPalette &arg1 = args.read<const QPalette & > (heap);
+  const QPalette &arg1 = gsi::arg_reader<const QPalette & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractScrollArea_Adaptor *)cls)->cbs_paletteChange_2113_0 (arg1);
 }
@@ -2458,7 +2458,7 @@ static void _call_cbs_resizeEvent_1843_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QResizeEvent *arg1 = args.read<QResizeEvent * > (heap);
+  QResizeEvent *arg1 = gsi::arg_reader<QResizeEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractScrollArea_Adaptor *)cls)->cbs_resizeEvent_1843_0 (arg1);
 }
@@ -2484,8 +2484,8 @@ static void _call_cbs_scrollContentsBy_1426_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
-  int arg2 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
+  int arg2 = gsi::arg_reader<int >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractScrollArea_Adaptor *)cls)->cbs_scrollContentsBy_1426_0 (arg1, arg2);
 }
@@ -2570,7 +2570,7 @@ static void _call_cbs_setVisible_864_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractScrollArea_Adaptor *)cls)->cbs_setVisible_864_0 (arg1);
 }
@@ -2613,7 +2613,7 @@ static void _call_cbs_showEvent_1634_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QShowEvent *arg1 = args.read<QShowEvent * > (heap);
+  QShowEvent *arg1 = gsi::arg_reader<QShowEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractScrollArea_Adaptor *)cls)->cbs_showEvent_1634_0 (arg1);
 }
@@ -2656,7 +2656,7 @@ static void _call_cbs_styleChange_1228_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QStyle &arg1 = args.read<QStyle & > (heap);
+  QStyle &arg1 = gsi::arg_reader<QStyle & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractScrollArea_Adaptor *)cls)->cbs_styleChange_1228_0 (arg1);
 }
@@ -2680,7 +2680,7 @@ static void _call_cbs_tabletEvent_1821_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTabletEvent *arg1 = args.read<QTabletEvent * > (heap);
+  QTabletEvent *arg1 = gsi::arg_reader<QTabletEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractScrollArea_Adaptor *)cls)->cbs_tabletEvent_1821_0 (arg1);
 }
@@ -2704,7 +2704,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractScrollArea_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }
@@ -2743,7 +2743,7 @@ static void _call_cbs_viewportEvent_1217_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QAbstractScrollArea_Adaptor *)cls)->cbs_viewportEvent_1217_0 (arg1));
 }
 
@@ -2766,7 +2766,7 @@ static void _call_cbs_wheelEvent_1718_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QWheelEvent *arg1 = args.read<QWheelEvent * > (heap);
+  QWheelEvent *arg1 = gsi::arg_reader<QWheelEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractScrollArea_Adaptor *)cls)->cbs_wheelEvent_1718_0 (arg1);
 }
@@ -2790,7 +2790,7 @@ static void _call_cbs_windowActivationChange_864_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractScrollArea_Adaptor *)cls)->cbs_windowActivationChange_864_0 (arg1);
 }

src/gsiqt/qt4/QtGui/gsiDeclQAbstractSlider.cc

@@ -1577,7 +1577,7 @@ static void _call_cbs_actionEvent_1823_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QActionEvent *arg1 = args.read<QActionEvent * > (heap);
+  QActionEvent *arg1 = gsi::arg_reader<QActionEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSlider_Adaptor *)cls)->cbs_actionEvent_1823_0 (arg1);
 }
@@ -1619,7 +1619,7 @@ static void _call_cbs_changeEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSlider_Adaptor *)cls)->cbs_changeEvent_1217_0 (arg1);
 }
@@ -1643,7 +1643,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSlider_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -1667,7 +1667,7 @@ static void _call_cbs_closeEvent_1719_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QCloseEvent *arg1 = args.read<QCloseEvent * > (heap);
+  QCloseEvent *arg1 = gsi::arg_reader<QCloseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSlider_Adaptor *)cls)->cbs_closeEvent_1719_0 (arg1);
 }
@@ -1691,7 +1691,7 @@ static void _call_cbs_contextMenuEvent_2363_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QContextMenuEvent *arg1 = args.read<QContextMenuEvent * > (heap);
+  QContextMenuEvent *arg1 = gsi::arg_reader<QContextMenuEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSlider_Adaptor *)cls)->cbs_contextMenuEvent_2363_0 (arg1);
 }
@@ -1758,7 +1758,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSlider_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -1822,7 +1822,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSlider_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -1846,7 +1846,7 @@ static void _call_cbs_dragEnterEvent_2109_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragEnterEvent *arg1 = args.read<QDragEnterEvent * > (heap);
+  QDragEnterEvent *arg1 = gsi::arg_reader<QDragEnterEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSlider_Adaptor *)cls)->cbs_dragEnterEvent_2109_0 (arg1);
 }
@@ -1870,7 +1870,7 @@ static void _call_cbs_dragLeaveEvent_2092_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragLeaveEvent *arg1 = args.read<QDragLeaveEvent * > (heap);
+  QDragLeaveEvent *arg1 = gsi::arg_reader<QDragLeaveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSlider_Adaptor *)cls)->cbs_dragLeaveEvent_2092_0 (arg1);
 }
@@ -1894,7 +1894,7 @@ static void _call_cbs_dragMoveEvent_2006_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragMoveEvent *arg1 = args.read<QDragMoveEvent * > (heap);
+  QDragMoveEvent *arg1 = gsi::arg_reader<QDragMoveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSlider_Adaptor *)cls)->cbs_dragMoveEvent_2006_0 (arg1);
 }
@@ -1918,7 +1918,7 @@ static void _call_cbs_dropEvent_1622_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDropEvent *arg1 = args.read<QDropEvent * > (heap);
+  QDropEvent *arg1 = gsi::arg_reader<QDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSlider_Adaptor *)cls)->cbs_dropEvent_1622_0 (arg1);
 }
@@ -1942,7 +1942,7 @@ static void _call_cbs_enabledChange_864_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSlider_Adaptor *)cls)->cbs_enabledChange_864_0 (arg1);
 }
@@ -1966,7 +1966,7 @@ static void _call_cbs_enterEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSlider_Adaptor *)cls)->cbs_enterEvent_1217_0 (arg1);
 }
@@ -1990,7 +1990,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QAbstractSlider_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -2015,8 +2015,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QAbstractSlider_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -2039,7 +2039,7 @@ static void _call_cbs_focusInEvent_1729_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSlider_Adaptor *)cls)->cbs_focusInEvent_1729_0 (arg1);
 }
@@ -2077,7 +2077,7 @@ static void _call_cbs_focusNextPrevChild_864_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   ret.write<bool > ((bool)((QAbstractSlider_Adaptor *)cls)->cbs_focusNextPrevChild_864_0 (arg1));
 }
 
@@ -2100,7 +2100,7 @@ static void _call_cbs_focusOutEvent_1729_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSlider_Adaptor *)cls)->cbs_focusOutEvent_1729_0 (arg1);
 }
@@ -2138,7 +2138,7 @@ static void _call_cbs_fontChange_1801_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QFont &arg1 = args.read<const QFont & > (heap);
+  const QFont &arg1 = gsi::arg_reader<const QFont & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSlider_Adaptor *)cls)->cbs_fontChange_1801_0 (arg1);
 }
@@ -2162,7 +2162,7 @@ static void _call_cbs_heightForWidth_c767_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   ret.write<int > ((int)((QAbstractSlider_Adaptor *)cls)->cbs_heightForWidth_c767_0 (arg1));
 }
 
@@ -2185,7 +2185,7 @@ static void _call_cbs_hideEvent_1595_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QHideEvent *arg1 = args.read<QHideEvent * > (heap);
+  QHideEvent *arg1 = gsi::arg_reader<QHideEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSlider_Adaptor *)cls)->cbs_hideEvent_1595_0 (arg1);
 }
@@ -2209,7 +2209,7 @@ static void _call_cbs_inputMethodEvent_2354_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QInputMethodEvent *arg1 = args.read<QInputMethodEvent * > (heap);
+  QInputMethodEvent *arg1 = gsi::arg_reader<QInputMethodEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSlider_Adaptor *)cls)->cbs_inputMethodEvent_2354_0 (arg1);
 }
@@ -2233,7 +2233,7 @@ static void _call_cbs_inputMethodQuery_c2420_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = args.read<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & > (heap);
+  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & >() (args, heap);
   ret.write<QVariant > ((QVariant)((QAbstractSlider_Adaptor *)cls)->cbs_inputMethodQuery_c2420_0 (arg1));
 }
 
@@ -2256,7 +2256,7 @@ static void _call_cbs_keyPressEvent_1514_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSlider_Adaptor *)cls)->cbs_keyPressEvent_1514_0 (arg1);
 }
@@ -2280,7 +2280,7 @@ static void _call_cbs_keyReleaseEvent_1514_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSlider_Adaptor *)cls)->cbs_keyReleaseEvent_1514_0 (arg1);
 }
@@ -2324,7 +2324,7 @@ static void _call_cbs_leaveEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSlider_Adaptor *)cls)->cbs_leaveEvent_1217_0 (arg1);
 }
@@ -2348,7 +2348,7 @@ static void _call_cbs_metric_c3445_0 (const qt_gsi::GenericMethod * /*decl*/, vo
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & arg1 = args.read<const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & > (heap);
+  const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & >() (args, heap);
   ret.write<int > ((int)((QAbstractSlider_Adaptor *)cls)->cbs_metric_c3445_0 (arg1));
 }
 
@@ -2390,7 +2390,7 @@ static void _call_cbs_mouseDoubleClickEvent_1738_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSlider_Adaptor *)cls)->cbs_mouseDoubleClickEvent_1738_0 (arg1);
 }
@@ -2414,7 +2414,7 @@ static void _call_cbs_mouseMoveEvent_1738_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSlider_Adaptor *)cls)->cbs_mouseMoveEvent_1738_0 (arg1);
 }
@@ -2438,7 +2438,7 @@ static void _call_cbs_mousePressEvent_1738_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSlider_Adaptor *)cls)->cbs_mousePressEvent_1738_0 (arg1);
 }
@@ -2462,7 +2462,7 @@ static void _call_cbs_mouseReleaseEvent_1738_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSlider_Adaptor *)cls)->cbs_mouseReleaseEvent_1738_0 (arg1);
 }
@@ -2486,7 +2486,7 @@ static void _call_cbs_moveEvent_1624_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMoveEvent *arg1 = args.read<QMoveEvent * > (heap);
+  QMoveEvent *arg1 = gsi::arg_reader<QMoveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSlider_Adaptor *)cls)->cbs_moveEvent_1624_0 (arg1);
 }
@@ -2529,7 +2529,7 @@ static void _call_cbs_paintEvent_1725_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QPaintEvent *arg1 = args.read<QPaintEvent * > (heap);
+  QPaintEvent *arg1 = gsi::arg_reader<QPaintEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSlider_Adaptor *)cls)->cbs_paintEvent_1725_0 (arg1);
 }
@@ -2553,7 +2553,7 @@ static void _call_cbs_paletteChange_2113_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QPalette &arg1 = args.read<const QPalette & > (heap);
+  const QPalette &arg1 = gsi::arg_reader<const QPalette & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSlider_Adaptor *)cls)->cbs_paletteChange_2113_0 (arg1);
 }
@@ -2645,7 +2645,7 @@ static void _call_cbs_resizeEvent_1843_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QResizeEvent *arg1 = args.read<QResizeEvent * > (heap);
+  QResizeEvent *arg1 = gsi::arg_reader<QResizeEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSlider_Adaptor *)cls)->cbs_resizeEvent_1843_0 (arg1);
 }
@@ -2708,7 +2708,7 @@ static void _call_cbs_setVisible_864_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSlider_Adaptor *)cls)->cbs_setVisible_864_0 (arg1);
 }
@@ -2732,7 +2732,7 @@ static void _call_cbs_showEvent_1634_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QShowEvent *arg1 = args.read<QShowEvent * > (heap);
+  QShowEvent *arg1 = gsi::arg_reader<QShowEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSlider_Adaptor *)cls)->cbs_showEvent_1634_0 (arg1);
 }
@@ -2775,7 +2775,7 @@ static void _call_cbs_sliderChange_3257_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  unsigned int arg1 = args.read<unsigned int > (heap);
+  unsigned int arg1 = gsi::arg_reader<unsigned int >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSlider_Adaptor *)cls)->cbs_sliderChange_3257_0 (arg1);
 }
@@ -2845,7 +2845,7 @@ static void _call_cbs_styleChange_1228_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QStyle &arg1 = args.read<QStyle & > (heap);
+  QStyle &arg1 = gsi::arg_reader<QStyle & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSlider_Adaptor *)cls)->cbs_styleChange_1228_0 (arg1);
 }
@@ -2869,7 +2869,7 @@ static void _call_cbs_tabletEvent_1821_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTabletEvent *arg1 = args.read<QTabletEvent * > (heap);
+  QTabletEvent *arg1 = gsi::arg_reader<QTabletEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSlider_Adaptor *)cls)->cbs_tabletEvent_1821_0 (arg1);
 }
@@ -2893,7 +2893,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSlider_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }
@@ -2950,7 +2950,7 @@ static void _call_cbs_wheelEvent_1718_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QWheelEvent *arg1 = args.read<QWheelEvent * > (heap);
+  QWheelEvent *arg1 = gsi::arg_reader<QWheelEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSlider_Adaptor *)cls)->cbs_wheelEvent_1718_0 (arg1);
 }
@@ -2974,7 +2974,7 @@ static void _call_cbs_windowActivationChange_864_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSlider_Adaptor *)cls)->cbs_windowActivationChange_864_0 (arg1);
 }

src/gsiqt/qt4/QtGui/gsiDeclQAbstractSpinBox.cc

@@ -1748,7 +1748,7 @@ static void _call_cbs_actionEvent_1823_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QActionEvent *arg1 = args.read<QActionEvent * > (heap);
+  QActionEvent *arg1 = gsi::arg_reader<QActionEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSpinBox_Adaptor *)cls)->cbs_actionEvent_1823_0 (arg1);
 }
@@ -1772,7 +1772,7 @@ static void _call_cbs_changeEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSpinBox_Adaptor *)cls)->cbs_changeEvent_1217_0 (arg1);
 }
@@ -1796,7 +1796,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSpinBox_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -1840,7 +1840,7 @@ static void _call_cbs_closeEvent_1719_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QCloseEvent *arg1 = args.read<QCloseEvent * > (heap);
+  QCloseEvent *arg1 = gsi::arg_reader<QCloseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSpinBox_Adaptor *)cls)->cbs_closeEvent_1719_0 (arg1);
 }
@@ -1864,7 +1864,7 @@ static void _call_cbs_contextMenuEvent_2363_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QContextMenuEvent *arg1 = args.read<QContextMenuEvent * > (heap);
+  QContextMenuEvent *arg1 = gsi::arg_reader<QContextMenuEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSpinBox_Adaptor *)cls)->cbs_contextMenuEvent_2363_0 (arg1);
 }
@@ -1931,7 +1931,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSpinBox_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -1995,7 +1995,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSpinBox_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -2019,7 +2019,7 @@ static void _call_cbs_dragEnterEvent_2109_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragEnterEvent *arg1 = args.read<QDragEnterEvent * > (heap);
+  QDragEnterEvent *arg1 = gsi::arg_reader<QDragEnterEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSpinBox_Adaptor *)cls)->cbs_dragEnterEvent_2109_0 (arg1);
 }
@@ -2043,7 +2043,7 @@ static void _call_cbs_dragLeaveEvent_2092_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragLeaveEvent *arg1 = args.read<QDragLeaveEvent * > (heap);
+  QDragLeaveEvent *arg1 = gsi::arg_reader<QDragLeaveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSpinBox_Adaptor *)cls)->cbs_dragLeaveEvent_2092_0 (arg1);
 }
@@ -2067,7 +2067,7 @@ static void _call_cbs_dragMoveEvent_2006_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragMoveEvent *arg1 = args.read<QDragMoveEvent * > (heap);
+  QDragMoveEvent *arg1 = gsi::arg_reader<QDragMoveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSpinBox_Adaptor *)cls)->cbs_dragMoveEvent_2006_0 (arg1);
 }
@@ -2091,7 +2091,7 @@ static void _call_cbs_dropEvent_1622_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDropEvent *arg1 = args.read<QDropEvent * > (heap);
+  QDropEvent *arg1 = gsi::arg_reader<QDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSpinBox_Adaptor *)cls)->cbs_dropEvent_1622_0 (arg1);
 }
@@ -2129,7 +2129,7 @@ static void _call_cbs_enabledChange_864_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSpinBox_Adaptor *)cls)->cbs_enabledChange_864_0 (arg1);
 }
@@ -2153,7 +2153,7 @@ static void _call_cbs_enterEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSpinBox_Adaptor *)cls)->cbs_enterEvent_1217_0 (arg1);
 }
@@ -2177,7 +2177,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QAbstractSpinBox_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -2202,8 +2202,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QAbstractSpinBox_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -2226,7 +2226,7 @@ static void _call_cbs_fixup_c1330_0 (const qt_gsi::GenericMethod * /*decl*/, voi
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QString &arg1 = args.read<QString & > (heap);
+  QString &arg1 = gsi::arg_reader<QString & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSpinBox_Adaptor *)cls)->cbs_fixup_c1330_0 (arg1);
 }
@@ -2250,7 +2250,7 @@ static void _call_cbs_focusInEvent_1729_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSpinBox_Adaptor *)cls)->cbs_focusInEvent_1729_0 (arg1);
 }
@@ -2288,7 +2288,7 @@ static void _call_cbs_focusNextPrevChild_864_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   ret.write<bool > ((bool)((QAbstractSpinBox_Adaptor *)cls)->cbs_focusNextPrevChild_864_0 (arg1));
 }
 
@@ -2311,7 +2311,7 @@ static void _call_cbs_focusOutEvent_1729_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSpinBox_Adaptor *)cls)->cbs_focusOutEvent_1729_0 (arg1);
 }
@@ -2349,7 +2349,7 @@ static void _call_cbs_fontChange_1801_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QFont &arg1 = args.read<const QFont & > (heap);
+  const QFont &arg1 = gsi::arg_reader<const QFont & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSpinBox_Adaptor *)cls)->cbs_fontChange_1801_0 (arg1);
 }
@@ -2373,7 +2373,7 @@ static void _call_cbs_heightForWidth_c767_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   ret.write<int > ((int)((QAbstractSpinBox_Adaptor *)cls)->cbs_heightForWidth_c767_0 (arg1));
 }
 
@@ -2396,7 +2396,7 @@ static void _call_cbs_hideEvent_1595_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QHideEvent *arg1 = args.read<QHideEvent * > (heap);
+  QHideEvent *arg1 = gsi::arg_reader<QHideEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSpinBox_Adaptor *)cls)->cbs_hideEvent_1595_0 (arg1);
 }
@@ -2439,7 +2439,7 @@ static void _call_cbs_inputMethodEvent_2354_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QInputMethodEvent *arg1 = args.read<QInputMethodEvent * > (heap);
+  QInputMethodEvent *arg1 = gsi::arg_reader<QInputMethodEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSpinBox_Adaptor *)cls)->cbs_inputMethodEvent_2354_0 (arg1);
 }
@@ -2463,7 +2463,7 @@ static void _call_cbs_inputMethodQuery_c2420_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = args.read<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & > (heap);
+  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & >() (args, heap);
   ret.write<QVariant > ((QVariant)((QAbstractSpinBox_Adaptor *)cls)->cbs_inputMethodQuery_c2420_0 (arg1));
 }
 
@@ -2486,7 +2486,7 @@ static void _call_cbs_keyPressEvent_1514_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSpinBox_Adaptor *)cls)->cbs_keyPressEvent_1514_0 (arg1);
 }
@@ -2510,7 +2510,7 @@ static void _call_cbs_keyReleaseEvent_1514_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSpinBox_Adaptor *)cls)->cbs_keyReleaseEvent_1514_0 (arg1);
 }
@@ -2554,7 +2554,7 @@ static void _call_cbs_leaveEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSpinBox_Adaptor *)cls)->cbs_leaveEvent_1217_0 (arg1);
 }
@@ -2592,7 +2592,7 @@ static void _call_cbs_metric_c3445_0 (const qt_gsi::GenericMethod * /*decl*/, vo
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & arg1 = args.read<const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & > (heap);
+  const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & >() (args, heap);
   ret.write<int > ((int)((QAbstractSpinBox_Adaptor *)cls)->cbs_metric_c3445_0 (arg1));
 }
 
@@ -2634,7 +2634,7 @@ static void _call_cbs_mouseDoubleClickEvent_1738_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSpinBox_Adaptor *)cls)->cbs_mouseDoubleClickEvent_1738_0 (arg1);
 }
@@ -2658,7 +2658,7 @@ static void _call_cbs_mouseMoveEvent_1738_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSpinBox_Adaptor *)cls)->cbs_mouseMoveEvent_1738_0 (arg1);
 }
@@ -2682,7 +2682,7 @@ static void _call_cbs_mousePressEvent_1738_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSpinBox_Adaptor *)cls)->cbs_mousePressEvent_1738_0 (arg1);
 }
@@ -2706,7 +2706,7 @@ static void _call_cbs_mouseReleaseEvent_1738_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSpinBox_Adaptor *)cls)->cbs_mouseReleaseEvent_1738_0 (arg1);
 }
@@ -2730,7 +2730,7 @@ static void _call_cbs_moveEvent_1624_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMoveEvent *arg1 = args.read<QMoveEvent * > (heap);
+  QMoveEvent *arg1 = gsi::arg_reader<QMoveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSpinBox_Adaptor *)cls)->cbs_moveEvent_1624_0 (arg1);
 }
@@ -2773,7 +2773,7 @@ static void _call_cbs_paintEvent_1725_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QPaintEvent *arg1 = args.read<QPaintEvent * > (heap);
+  QPaintEvent *arg1 = gsi::arg_reader<QPaintEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSpinBox_Adaptor *)cls)->cbs_paintEvent_1725_0 (arg1);
 }
@@ -2797,7 +2797,7 @@ static void _call_cbs_paletteChange_2113_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QPalette &arg1 = args.read<const QPalette & > (heap);
+  const QPalette &arg1 = gsi::arg_reader<const QPalette & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSpinBox_Adaptor *)cls)->cbs_paletteChange_2113_0 (arg1);
 }
@@ -2854,7 +2854,7 @@ static void _call_cbs_resizeEvent_1843_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QResizeEvent *arg1 = args.read<QResizeEvent * > (heap);
+  QResizeEvent *arg1 = gsi::arg_reader<QResizeEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSpinBox_Adaptor *)cls)->cbs_resizeEvent_1843_0 (arg1);
 }
@@ -2911,7 +2911,7 @@ static void _call_cbs_setVisible_864_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSpinBox_Adaptor *)cls)->cbs_setVisible_864_0 (arg1);
 }
@@ -2935,7 +2935,7 @@ static void _call_cbs_showEvent_1634_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QShowEvent *arg1 = args.read<QShowEvent * > (heap);
+  QShowEvent *arg1 = gsi::arg_reader<QShowEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSpinBox_Adaptor *)cls)->cbs_showEvent_1634_0 (arg1);
 }
@@ -2978,7 +2978,7 @@ static void _call_cbs_stepBy_767_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSpinBox_Adaptor *)cls)->cbs_stepBy_767_0 (arg1);
 }
@@ -3021,7 +3021,7 @@ static void _call_cbs_styleChange_1228_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QStyle &arg1 = args.read<QStyle & > (heap);
+  QStyle &arg1 = gsi::arg_reader<QStyle & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSpinBox_Adaptor *)cls)->cbs_styleChange_1228_0 (arg1);
 }
@@ -3045,7 +3045,7 @@ static void _call_cbs_tabletEvent_1821_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTabletEvent *arg1 = args.read<QTabletEvent * > (heap);
+  QTabletEvent *arg1 = gsi::arg_reader<QTabletEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSpinBox_Adaptor *)cls)->cbs_tabletEvent_1821_0 (arg1);
 }
@@ -3069,7 +3069,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSpinBox_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }
@@ -3110,8 +3110,8 @@ static void _call_cbs_validate_c2171_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QString &arg1 = args.read<QString & > (heap);
-  int &arg2 = args.read<int & > (heap);
+  QString &arg1 = gsi::arg_reader<QString & >() (args, heap);
+  int &arg2 = gsi::arg_reader<int & >() (args, heap);
   ret.write<qt_gsi::Converter<QValidator::State>::target_type > ((qt_gsi::Converter<QValidator::State>::target_type)((QAbstractSpinBox_Adaptor *)cls)->cbs_validate_c2171_0 (arg1, arg2));
 }
 
@@ -3134,7 +3134,7 @@ static void _call_cbs_wheelEvent_1718_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QWheelEvent *arg1 = args.read<QWheelEvent * > (heap);
+  QWheelEvent *arg1 = gsi::arg_reader<QWheelEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSpinBox_Adaptor *)cls)->cbs_wheelEvent_1718_0 (arg1);
 }
@@ -3158,7 +3158,7 @@ static void _call_cbs_windowActivationChange_864_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractSpinBox_Adaptor *)cls)->cbs_windowActivationChange_864_0 (arg1);
 }

src/gsiqt/qt4/QtGui/gsiDeclQAbstractTextDocumentLayout.cc

@@ -786,7 +786,7 @@ static void _call_cbs_blockBoundingRect_c2306_0 (const qt_gsi::GenericMethod * /
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QTextBlock &arg1 = args.read<const QTextBlock & > (heap);
+  const QTextBlock &arg1 = gsi::arg_reader<const QTextBlock & >() (args, heap);
   ret.write<QRectF > ((QRectF)((QAbstractTextDocumentLayout_Adaptor *)cls)->cbs_blockBoundingRect_c2306_0 (arg1));
 }
 
@@ -809,7 +809,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractTextDocumentLayout_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -833,7 +833,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractTextDocumentLayout_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -875,7 +875,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractTextDocumentLayout_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -903,9 +903,9 @@ static void _call_cbs_documentChanged_2085_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
-  int arg2 = args.read<int > (heap);
-  int arg3 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
+  int arg2 = gsi::arg_reader<int >() (args, heap);
+  int arg3 = gsi::arg_reader<int >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractTextDocumentLayout_Adaptor *)cls)->cbs_documentChanged_2085_0 (arg1, arg2, arg3);
 }
@@ -968,8 +968,8 @@ static void _call_cbs_draw_6787_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QPainter *arg1 = args.read<QPainter * > (heap);
-  const QAbstractTextDocumentLayout::PaintContext &arg2 = args.read<const QAbstractTextDocumentLayout::PaintContext & > (heap);
+  QPainter *arg1 = gsi::arg_reader<QPainter * >() (args, heap);
+  const QAbstractTextDocumentLayout::PaintContext &arg2 = gsi::arg_reader<const QAbstractTextDocumentLayout::PaintContext & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractTextDocumentLayout_Adaptor *)cls)->cbs_draw_6787_0 (arg1, arg2);
 }
@@ -1001,11 +1001,11 @@ static void _call_cbs_drawInlineObject_8199_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QPainter *arg1 = args.read<QPainter * > (heap);
-  const QRectF &arg2 = args.read<const QRectF & > (heap);
-  QTextInlineObject arg3 = args.read<QTextInlineObject > (heap);
-  int arg4 = args.read<int > (heap);
-  const QTextFormat &arg5 = args.read<const QTextFormat & > (heap);
+  QPainter *arg1 = gsi::arg_reader<QPainter * >() (args, heap);
+  const QRectF &arg2 = gsi::arg_reader<const QRectF & >() (args, heap);
+  QTextInlineObject arg3 = gsi::arg_reader<QTextInlineObject >() (args, heap);
+  int arg4 = gsi::arg_reader<int >() (args, heap);
+  const QTextFormat &arg5 = gsi::arg_reader<const QTextFormat & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractTextDocumentLayout_Adaptor *)cls)->cbs_drawInlineObject_8199_0 (arg1, arg2, arg3, arg4, arg5);
 }
@@ -1029,7 +1029,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QAbstractTextDocumentLayout_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -1054,8 +1054,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QAbstractTextDocumentLayout_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -1114,7 +1114,7 @@ static void _call_cbs_frameBoundingRect_c1615_0 (const qt_gsi::GenericMethod * /
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTextFrame *arg1 = args.read<QTextFrame * > (heap);
+  QTextFrame *arg1 = gsi::arg_reader<QTextFrame * >() (args, heap);
   ret.write<QRectF > ((QRectF)((QAbstractTextDocumentLayout_Adaptor *)cls)->cbs_frameBoundingRect_c1615_0 (arg1));
 }
 
@@ -1139,8 +1139,8 @@ static void _call_cbs_hitTest_c4147_0 (const qt_gsi::GenericMethod * /*decl*/, v
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QPointF &arg1 = args.read<const QPointF & > (heap);
-  const qt_gsi::Converter<Qt::HitTestAccuracy>::target_type & arg2 = args.read<const qt_gsi::Converter<Qt::HitTestAccuracy>::target_type & > (heap);
+  const QPointF &arg1 = gsi::arg_reader<const QPointF & >() (args, heap);
+  const qt_gsi::Converter<Qt::HitTestAccuracy>::target_type & arg2 = gsi::arg_reader<const qt_gsi::Converter<Qt::HitTestAccuracy>::target_type & >() (args, heap);
   ret.write<int > ((int)((QAbstractTextDocumentLayout_Adaptor *)cls)->cbs_hitTest_c4147_0 (arg1, arg2));
 }
 
@@ -1204,9 +1204,9 @@ static void _call_cbs_positionInlineObject_5127_0 (const qt_gsi::GenericMethod *
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTextInlineObject arg1 = args.read<QTextInlineObject > (heap);
-  int arg2 = args.read<int > (heap);
-  const QTextFormat &arg3 = args.read<const QTextFormat & > (heap);
+  QTextInlineObject arg1 = gsi::arg_reader<QTextInlineObject >() (args, heap);
+  int arg2 = gsi::arg_reader<int >() (args, heap);
+  const QTextFormat &arg3 = gsi::arg_reader<const QTextFormat & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractTextDocumentLayout_Adaptor *)cls)->cbs_positionInlineObject_5127_0 (arg1, arg2, arg3);
 }
@@ -1252,9 +1252,9 @@ static void _call_cbs_resizeInlineObject_5127_0 (const qt_gsi::GenericMethod * /
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTextInlineObject arg1 = args.read<QTextInlineObject > (heap);
-  int arg2 = args.read<int > (heap);
-  const QTextFormat &arg3 = args.read<const QTextFormat & > (heap);
+  QTextInlineObject arg1 = gsi::arg_reader<QTextInlineObject >() (args, heap);
+  int arg2 = gsi::arg_reader<int >() (args, heap);
+  const QTextFormat &arg3 = gsi::arg_reader<const QTextFormat & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractTextDocumentLayout_Adaptor *)cls)->cbs_resizeInlineObject_5127_0 (arg1, arg2, arg3);
 }
@@ -1292,7 +1292,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAbstractTextDocumentLayout_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }

src/gsiqt/qt4/QtGui/gsiDeclQAccessibleApplication.cc

@@ -549,9 +549,9 @@ static void _call_cbs_actionText_c3378_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
-  const qt_gsi::Converter<QAccessible::Text>::target_type & arg2 = args.read<const qt_gsi::Converter<QAccessible::Text>::target_type & > (heap);
-  int arg3 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
+  const qt_gsi::Converter<QAccessible::Text>::target_type & arg2 = gsi::arg_reader<const qt_gsi::Converter<QAccessible::Text>::target_type & >() (args, heap);
+  int arg3 = gsi::arg_reader<int >() (args, heap);
   ret.write<QString > ((QString)((QAccessibleApplication_Adaptor *)cls)->cbs_actionText_c3378_0 (arg1, arg2, arg3));
 }
 
@@ -576,8 +576,8 @@ static void _call_cbs_childAt_c1426_0 (const qt_gsi::GenericMethod * /*decl*/, v
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
-  int arg2 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
+  int arg2 = gsi::arg_reader<int >() (args, heap);
   ret.write<int > ((int)((QAccessibleApplication_Adaptor *)cls)->cbs_childAt_c1426_0 (arg1, arg2));
 }
 
@@ -623,9 +623,9 @@ static void _call_cbs_doAction_4052_0 (const qt_gsi::GenericMethod * /*decl*/, v
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
-  int arg2 = args.read<int > (heap);
-  const QList<QVariant> &arg3 = args.read<const QList<QVariant> & > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
+  int arg2 = gsi::arg_reader<int >() (args, heap);
+  const QList<QVariant> &arg3 = gsi::arg_reader<const QList<QVariant> & >() (args, heap);
   ret.write<bool > ((bool)((QAccessibleApplication_Adaptor *)cls)->cbs_doAction_4052_0 (arg1, arg2, arg3));
 }
 
@@ -648,7 +648,7 @@ static void _call_cbs_indexOfChild_c3317_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QAccessibleInterface *arg1 = args.read<const QAccessibleInterface * > (heap);
+  const QAccessibleInterface *arg1 = gsi::arg_reader<const QAccessibleInterface * >() (args, heap);
   ret.write<int > ((int)((QAccessibleApplication_Adaptor *)cls)->cbs_indexOfChild_c3317_0 (arg1));
 }
 
@@ -709,7 +709,7 @@ static void _call_cbs_rect_c767_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   ret.write<QRect > ((QRect)((QAccessibleApplication_Adaptor *)cls)->cbs_rect_c767_0 (arg1));
 }
 
@@ -736,9 +736,9 @@ static void _call_cbs_relationTo_c4635_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
-  const QAccessibleInterface *arg2 = args.read<const QAccessibleInterface * > (heap);
-  int arg3 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
+  const QAccessibleInterface *arg2 = gsi::arg_reader<const QAccessibleInterface * >() (args, heap);
+  int arg3 = gsi::arg_reader<int >() (args, heap);
   ret.write<QFlags<QAccessible::RelationFlag> > ((QFlags<QAccessible::RelationFlag>)((QAccessibleApplication_Adaptor *)cls)->cbs_relationTo_c4635_0 (arg1, arg2, arg3));
 }
 
@@ -761,7 +761,7 @@ static void _call_cbs_role_c767_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   ret.write<qt_gsi::Converter<QAccessible::Role>::target_type > ((qt_gsi::Converter<QAccessible::Role>::target_type)((QAccessibleApplication_Adaptor *)cls)->cbs_role_c767_0 (arg1));
 }
 
@@ -788,9 +788,9 @@ static void _call_cbs_setText_4636_0 (const qt_gsi::GenericMethod * /*decl*/, vo
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QAccessible::Text>::target_type & arg1 = args.read<const qt_gsi::Converter<QAccessible::Text>::target_type & > (heap);
-  int arg2 = args.read<int > (heap);
-  const QString &arg3 = args.read<const QString & > (heap);
+  const qt_gsi::Converter<QAccessible::Text>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QAccessible::Text>::target_type & >() (args, heap);
+  int arg2 = gsi::arg_reader<int >() (args, heap);
+  const QString &arg3 = gsi::arg_reader<const QString & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAccessibleApplication_Adaptor *)cls)->cbs_setText_4636_0 (arg1, arg2, arg3);
 }
@@ -814,7 +814,7 @@ static void _call_cbs_state_c767_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   ret.write<QFlags<QAccessible::StateFlag> > ((QFlags<QAccessible::StateFlag>)((QAccessibleApplication_Adaptor *)cls)->cbs_state_c767_0 (arg1));
 }
 
@@ -839,8 +839,8 @@ static void _call_cbs_text_c2719_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QAccessible::Text>::target_type & arg1 = args.read<const qt_gsi::Converter<QAccessible::Text>::target_type & > (heap);
-  int arg2 = args.read<int > (heap);
+  const qt_gsi::Converter<QAccessible::Text>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QAccessible::Text>::target_type & >() (args, heap);
+  int arg2 = gsi::arg_reader<int >() (args, heap);
   ret.write<QString > ((QString)((QAccessibleApplication_Adaptor *)cls)->cbs_text_c2719_0 (arg1, arg2));
 }
 
@@ -863,7 +863,7 @@ static void _call_cbs_userActionCount_c767_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   ret.write<int > ((int)((QAccessibleApplication_Adaptor *)cls)->cbs_userActionCount_c767_0 (arg1));
 }
 

src/gsiqt/qt4/QtGui/gsiDeclQAction.cc

@@ -1460,7 +1460,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAction_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -1484,7 +1484,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAction_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -1526,7 +1526,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAction_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -1550,7 +1550,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QAction_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -1575,8 +1575,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QAction_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -1645,7 +1645,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QAction_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }

src/gsiqt/qt4/QtGui/gsiDeclQActionGroup.cc

@@ -602,7 +602,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QActionGroup_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -626,7 +626,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QActionGroup_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -668,7 +668,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QActionGroup_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -692,7 +692,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QActionGroup_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -717,8 +717,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QActionGroup_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -809,7 +809,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QActionGroup_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }

src/gsiqt/qt4/QtGui/gsiDeclQApplication.cc

@@ -1810,7 +1810,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QApplication_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -1834,7 +1834,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QApplication_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -1876,7 +1876,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QApplication_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -1900,7 +1900,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QApplication_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -1925,8 +1925,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QApplication_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -2030,7 +2030,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QApplication_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }

src/gsiqt/qt4/QtGui/gsiDeclQBitmap.cc

@@ -375,7 +375,7 @@ static void _call_cbs_metric_c3445_0 (const qt_gsi::GenericMethod * /*decl*/, vo
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & arg1 = args.read<const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & > (heap);
+  const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & >() (args, heap);
   ret.write<int > ((int)((QBitmap_Adaptor *)cls)->cbs_metric_c3445_0 (arg1));
 }
 

src/gsiqt/qt4/QtGui/gsiDeclQBoxLayout.cc

@@ -1385,7 +1385,8 @@ static void _call_cbs_addItem_1740_0 (const qt_gsi::GenericMethod * /*decl*/, vo
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QLayoutItem *arg1 = args.read<QLayoutItem * > (heap);
+  QLayoutItem *arg1 = gsi::arg_reader<QLayoutItem * >() (args, heap);
+  qt_gsi::qt_keep (arg1);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QBoxLayout_Adaptor *)cls)->cbs_addItem_1740_0 (arg1);
 }
@@ -1427,7 +1428,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QBoxLayout_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -1470,7 +1471,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QBoxLayout_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -1512,7 +1513,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QBoxLayout_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -1536,7 +1537,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QBoxLayout_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -1561,8 +1562,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QBoxLayout_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -1642,7 +1643,7 @@ static void _call_cbs_heightForWidth_c767_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   ret.write<int > ((int)((QBoxLayout_Adaptor *)cls)->cbs_heightForWidth_c767_0 (arg1));
 }
 
@@ -1665,7 +1666,7 @@ static void _call_cbs_indexOf_c1315_0 (const qt_gsi::GenericMethod * /*decl*/, v
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QWidget *arg1 = args.read<QWidget * > (heap);
+  QWidget *arg1 = gsi::arg_reader<QWidget * >() (args, heap);
   ret.write<int > ((int)((QBoxLayout_Adaptor *)cls)->cbs_indexOf_c1315_0 (arg1));
 }
 
@@ -1750,7 +1751,7 @@ static void _call_cbs_itemAt_c767_0 (const qt_gsi::GenericMethod * /*decl*/, voi
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   ret.write<QLayoutItem * > ((QLayoutItem *)((QBoxLayout_Adaptor *)cls)->cbs_itemAt_c767_0 (arg1));
 }
 
@@ -1811,7 +1812,7 @@ static void _call_cbs_minimumHeightForWidth_c767_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   ret.write<int > ((int)((QBoxLayout_Adaptor *)cls)->cbs_minimumHeightForWidth_c767_0 (arg1));
 }
 
@@ -1885,7 +1886,7 @@ static void _call_cbs_setGeometry_1792_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QRect &arg1 = args.read<const QRect & > (heap);
+  const QRect &arg1 = gsi::arg_reader<const QRect & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QBoxLayout_Adaptor *)cls)->cbs_setGeometry_1792_0 (arg1);
 }
@@ -1947,7 +1948,7 @@ static void _call_cbs_takeAt_767_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   ret.write<QLayoutItem * > ((QLayoutItem *)((QBoxLayout_Adaptor *)cls)->cbs_takeAt_767_0 (arg1));
 }
 
@@ -1970,7 +1971,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QBoxLayout_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }

src/gsiqt/qt4/QtGui/gsiDeclQButtonGroup.cc

@@ -703,7 +703,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QButtonGroup_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -727,7 +727,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QButtonGroup_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -769,7 +769,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QButtonGroup_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -793,7 +793,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QButtonGroup_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -818,8 +818,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QButtonGroup_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -874,7 +874,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QButtonGroup_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }

src/gsiqt/qt4/QtGui/gsiDeclQCDEStyle.cc

@@ -799,7 +799,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCDEStyle_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -823,7 +823,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCDEStyle_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -865,7 +865,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCDEStyle_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -895,10 +895,10 @@ static void _call_cbs_drawComplexControl_c9027_1 (const qt_gsi::GenericMethod *
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QStyle::ComplexControl>::target_type & arg1 = args.read<const qt_gsi::Converter<QStyle::ComplexControl>::target_type & > (heap);
-  const QStyleOptionComplex *arg2 = args.read<const QStyleOptionComplex * > (heap);
-  QPainter *arg3 = args.read<QPainter * > (heap);
-  const QWidget *arg4 = args.read<const QWidget * > (heap);
+  const qt_gsi::Converter<QStyle::ComplexControl>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QStyle::ComplexControl>::target_type & >() (args, heap);
+  const QStyleOptionComplex *arg2 = gsi::arg_reader<const QStyleOptionComplex * >() (args, heap);
+  QPainter *arg3 = gsi::arg_reader<QPainter * >() (args, heap);
+  const QWidget *arg4 = args ? gsi::arg_reader<const QWidget * >() (args, heap) : gsi::arg_maker<const QWidget * >() (0, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCDEStyle_Adaptor *)cls)->cbs_drawComplexControl_c9027_1 (arg1, arg2, arg3, arg4);
 }
@@ -928,10 +928,10 @@ static void _call_cbs_drawControl_c8285_1 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QStyle::ControlElement>::target_type & arg1 = args.read<const qt_gsi::Converter<QStyle::ControlElement>::target_type & > (heap);
-  const QStyleOption *arg2 = args.read<const QStyleOption * > (heap);
-  QPainter *arg3 = args.read<QPainter * > (heap);
-  const QWidget *arg4 = args.read<const QWidget * > (heap);
+  const qt_gsi::Converter<QStyle::ControlElement>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QStyle::ControlElement>::target_type & >() (args, heap);
+  const QStyleOption *arg2 = gsi::arg_reader<const QStyleOption * >() (args, heap);
+  QPainter *arg3 = gsi::arg_reader<QPainter * >() (args, heap);
+  const QWidget *arg4 = args ? gsi::arg_reader<const QWidget * >() (args, heap) : gsi::arg_maker<const QWidget * >() (0, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCDEStyle_Adaptor *)cls)->cbs_drawControl_c8285_1 (arg1, arg2, arg3, arg4);
 }
@@ -961,10 +961,10 @@ static void _call_cbs_drawItemPixmap_c5678_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QPainter *arg1 = args.read<QPainter * > (heap);
-  const QRect &arg2 = args.read<const QRect & > (heap);
-  int arg3 = args.read<int > (heap);
-  const QPixmap &arg4 = args.read<const QPixmap & > (heap);
+  QPainter *arg1 = gsi::arg_reader<QPainter * >() (args, heap);
+  const QRect &arg2 = gsi::arg_reader<const QRect & >() (args, heap);
+  int arg3 = gsi::arg_reader<int >() (args, heap);
+  const QPixmap &arg4 = gsi::arg_reader<const QPixmap & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCDEStyle_Adaptor *)cls)->cbs_drawItemPixmap_c5678_0 (arg1, arg2, arg3, arg4);
 }
@@ -1000,13 +1000,13 @@ static void _call_cbs_drawItemText_c10604_1 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QPainter *arg1 = args.read<QPainter * > (heap);
-  const QRect &arg2 = args.read<const QRect & > (heap);
-  int arg3 = args.read<int > (heap);
-  const QPalette &arg4 = args.read<const QPalette & > (heap);
-  bool arg5 = args.read<bool > (heap);
-  const QString &arg6 = args.read<const QString & > (heap);
-  const qt_gsi::Converter<QPalette::ColorRole>::target_type & arg7 = args.read<const qt_gsi::Converter<QPalette::ColorRole>::target_type & > (heap);
+  QPainter *arg1 = gsi::arg_reader<QPainter * >() (args, heap);
+  const QRect &arg2 = gsi::arg_reader<const QRect & >() (args, heap);
+  int arg3 = gsi::arg_reader<int >() (args, heap);
+  const QPalette &arg4 = gsi::arg_reader<const QPalette & >() (args, heap);
+  bool arg5 = gsi::arg_reader<bool >() (args, heap);
+  const QString &arg6 = gsi::arg_reader<const QString & >() (args, heap);
+  const qt_gsi::Converter<QPalette::ColorRole>::target_type & arg7 = args ? gsi::arg_reader<const qt_gsi::Converter<QPalette::ColorRole>::target_type & >() (args, heap) : gsi::arg_maker<const qt_gsi::Converter<QPalette::ColorRole>::target_type & >() (qt_gsi::CppToQtReadAdaptor<QPalette::ColorRole>(heap, QPalette::NoRole), heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCDEStyle_Adaptor *)cls)->cbs_drawItemText_c10604_1 (arg1, arg2, arg3, arg4, arg5, arg6, arg7);
 }
@@ -1036,10 +1036,10 @@ static void _call_cbs_drawPrimitive_c8501_1 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QStyle::PrimitiveElement>::target_type & arg1 = args.read<const qt_gsi::Converter<QStyle::PrimitiveElement>::target_type & > (heap);
-  const QStyleOption *arg2 = args.read<const QStyleOption * > (heap);
-  QPainter *arg3 = args.read<QPainter * > (heap);
-  const QWidget *arg4 = args.read<const QWidget * > (heap);
+  const qt_gsi::Converter<QStyle::PrimitiveElement>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QStyle::PrimitiveElement>::target_type & >() (args, heap);
+  const QStyleOption *arg2 = gsi::arg_reader<const QStyleOption * >() (args, heap);
+  QPainter *arg3 = gsi::arg_reader<QPainter * >() (args, heap);
+  const QWidget *arg4 = args ? gsi::arg_reader<const QWidget * >() (args, heap) : gsi::arg_maker<const QWidget * >() (0, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCDEStyle_Adaptor *)cls)->cbs_drawPrimitive_c8501_1 (arg1, arg2, arg3, arg4);
 }
@@ -1063,7 +1063,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QCDEStyle_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -1088,8 +1088,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QCDEStyle_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -1116,9 +1116,9 @@ static void _call_cbs_generatedIconPixmap_c5776_0 (const qt_gsi::GenericMethod *
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QIcon::Mode>::target_type & arg1 = args.read<const qt_gsi::Converter<QIcon::Mode>::target_type & > (heap);
-  const QPixmap &arg2 = args.read<const QPixmap & > (heap);
-  const QStyleOption *arg3 = args.read<const QStyleOption * > (heap);
+  const qt_gsi::Converter<QIcon::Mode>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QIcon::Mode>::target_type & >() (args, heap);
+  const QPixmap &arg2 = gsi::arg_reader<const QPixmap & >() (args, heap);
+  const QStyleOption *arg3 = gsi::arg_reader<const QStyleOption * >() (args, heap);
   ret.write<QPixmap > ((QPixmap)((QCDEStyle_Adaptor *)cls)->cbs_generatedIconPixmap_c5776_0 (arg1, arg2, arg3));
 }
 
@@ -1147,10 +1147,10 @@ static void _call_cbs_hitTestComplexControl_c9517_1 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QStyle::ComplexControl>::target_type & arg1 = args.read<const qt_gsi::Converter<QStyle::ComplexControl>::target_type & > (heap);
-  const QStyleOptionComplex *arg2 = args.read<const QStyleOptionComplex * > (heap);
-  const QPoint &arg3 = args.read<const QPoint & > (heap);
-  const QWidget *arg4 = args.read<const QWidget * > (heap);
+  const qt_gsi::Converter<QStyle::ComplexControl>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QStyle::ComplexControl>::target_type & >() (args, heap);
+  const QStyleOptionComplex *arg2 = gsi::arg_reader<const QStyleOptionComplex * >() (args, heap);
+  const QPoint &arg3 = gsi::arg_reader<const QPoint & >() (args, heap);
+  const QWidget *arg4 = args ? gsi::arg_reader<const QWidget * >() (args, heap) : gsi::arg_maker<const QWidget * >() (0, heap);
   ret.write<qt_gsi::Converter<QStyle::SubControl>::target_type > ((qt_gsi::Converter<QStyle::SubControl>::target_type)((QCDEStyle_Adaptor *)cls)->cbs_hitTestComplexControl_c9517_1 (arg1, arg2, arg3, arg4));
 }
 
@@ -1177,9 +1177,9 @@ static void _call_cbs_itemPixmapRect_c4360_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QRect &arg1 = args.read<const QRect & > (heap);
-  int arg2 = args.read<int > (heap);
-  const QPixmap &arg3 = args.read<const QPixmap & > (heap);
+  const QRect &arg1 = gsi::arg_reader<const QRect & >() (args, heap);
+  int arg2 = gsi::arg_reader<int >() (args, heap);
+  const QPixmap &arg3 = gsi::arg_reader<const QPixmap & >() (args, heap);
   ret.write<QRect > ((QRect)((QCDEStyle_Adaptor *)cls)->cbs_itemPixmapRect_c4360_0 (arg1, arg2, arg3));
 }
 
@@ -1210,11 +1210,11 @@ static void _call_cbs_itemTextRect_c7544_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QFontMetrics &arg1 = args.read<const QFontMetrics & > (heap);
-  const QRect &arg2 = args.read<const QRect & > (heap);
-  int arg3 = args.read<int > (heap);
-  bool arg4 = args.read<bool > (heap);
-  const QString &arg5 = args.read<const QString & > (heap);
+  const QFontMetrics &arg1 = gsi::arg_reader<const QFontMetrics & >() (args, heap);
+  const QRect &arg2 = gsi::arg_reader<const QRect & >() (args, heap);
+  int arg3 = gsi::arg_reader<int >() (args, heap);
+  bool arg4 = gsi::arg_reader<bool >() (args, heap);
+  const QString &arg5 = gsi::arg_reader<const QString & >() (args, heap);
   ret.write<QRect > ((QRect)((QCDEStyle_Adaptor *)cls)->cbs_itemTextRect_c7544_0 (arg1, arg2, arg3, arg4, arg5));
 }
 
@@ -1271,9 +1271,9 @@ static void _call_cbs_pixelMetric_c6642_2 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QStyle::PixelMetric>::target_type & arg1 = args.read<const qt_gsi::Converter<QStyle::PixelMetric>::target_type & > (heap);
-  const QStyleOption *arg2 = args.read<const QStyleOption * > (heap);
-  const QWidget *arg3 = args.read<const QWidget * > (heap);
+  const qt_gsi::Converter<QStyle::PixelMetric>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QStyle::PixelMetric>::target_type & >() (args, heap);
+  const QStyleOption *arg2 = args ? gsi::arg_reader<const QStyleOption * >() (args, heap) : gsi::arg_maker<const QStyleOption * >() (0, heap);
+  const QWidget *arg3 = args ? gsi::arg_reader<const QWidget * >() (args, heap) : gsi::arg_maker<const QWidget * >() (0, heap);
   ret.write<int > ((int)((QCDEStyle_Adaptor *)cls)->cbs_pixelMetric_c6642_2 (arg1, arg2, arg3));
 }
 
@@ -1296,7 +1296,7 @@ static void _call_cbs_polish_1418_0 (const qt_gsi::GenericMethod * /*decl*/, voi
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QPalette &arg1 = args.read<QPalette & > (heap);
+  QPalette &arg1 = gsi::arg_reader<QPalette & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCDEStyle_Adaptor *)cls)->cbs_polish_1418_0 (arg1);
 }
@@ -1320,7 +1320,7 @@ static void _call_cbs_polish_1315_0 (const qt_gsi::GenericMethod * /*decl*/, voi
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QWidget *arg1 = args.read<QWidget * > (heap);
+  QWidget *arg1 = gsi::arg_reader<QWidget * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCDEStyle_Adaptor *)cls)->cbs_polish_1315_0 (arg1);
 }
@@ -1344,7 +1344,7 @@ static void _call_cbs_polish_1843_0 (const qt_gsi::GenericMethod * /*decl*/, voi
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QApplication *arg1 = args.read<QApplication * > (heap);
+  QApplication *arg1 = gsi::arg_reader<QApplication * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCDEStyle_Adaptor *)cls)->cbs_polish_1843_0 (arg1);
 }
@@ -1406,10 +1406,10 @@ static void _call_cbs_sizeFromContents_c8477_1 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QStyle::ContentsType>::target_type & arg1 = args.read<const qt_gsi::Converter<QStyle::ContentsType>::target_type & > (heap);
-  const QStyleOption *arg2 = args.read<const QStyleOption * > (heap);
-  const QSize &arg3 = args.read<const QSize & > (heap);
-  const QWidget *arg4 = args.read<const QWidget * > (heap);
+  const qt_gsi::Converter<QStyle::ContentsType>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QStyle::ContentsType>::target_type & >() (args, heap);
+  const QStyleOption *arg2 = gsi::arg_reader<const QStyleOption * >() (args, heap);
+  const QSize &arg3 = gsi::arg_reader<const QSize & >() (args, heap);
+  const QWidget *arg4 = args ? gsi::arg_reader<const QWidget * >() (args, heap) : gsi::arg_maker<const QWidget * >() (0, heap);
   ret.write<QSize > ((QSize)((QCDEStyle_Adaptor *)cls)->cbs_sizeFromContents_c8477_1 (arg1, arg2, arg3, arg4));
 }
 
@@ -1479,9 +1479,9 @@ static void _call_cbs_standardPixmap_c6956_1 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QStyle::StandardPixmap>::target_type & arg1 = args.read<const qt_gsi::Converter<QStyle::StandardPixmap>::target_type & > (heap);
-  const QStyleOption *arg2 = args.read<const QStyleOption * > (heap);
-  const QWidget *arg3 = args.read<const QWidget * > (heap);
+  const qt_gsi::Converter<QStyle::StandardPixmap>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QStyle::StandardPixmap>::target_type & >() (args, heap);
+  const QStyleOption *arg2 = gsi::arg_reader<const QStyleOption * >() (args, heap);
+  const QWidget *arg3 = args ? gsi::arg_reader<const QWidget * >() (args, heap) : gsi::arg_maker<const QWidget * >() (0, heap);
   ret.write<QPixmap > ((QPixmap)((QCDEStyle_Adaptor *)cls)->cbs_standardPixmap_c6956_1 (arg1, arg2, arg3));
 }
 
@@ -1510,10 +1510,10 @@ static void _call_cbs_styleHint_c8615_3 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QStyle::StyleHint>::target_type & arg1 = args.read<const qt_gsi::Converter<QStyle::StyleHint>::target_type & > (heap);
-  const QStyleOption *arg2 = args.read<const QStyleOption * > (heap);
-  const QWidget *arg3 = args.read<const QWidget * > (heap);
-  QStyleHintReturn *arg4 = args.read<QStyleHintReturn * > (heap);
+  const qt_gsi::Converter<QStyle::StyleHint>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QStyle::StyleHint>::target_type & >() (args, heap);
+  const QStyleOption *arg2 = args ? gsi::arg_reader<const QStyleOption * >() (args, heap) : gsi::arg_maker<const QStyleOption * >() (0, heap);
+  const QWidget *arg3 = args ? gsi::arg_reader<const QWidget * >() (args, heap) : gsi::arg_maker<const QWidget * >() (0, heap);
+  QStyleHintReturn *arg4 = args ? gsi::arg_reader<QStyleHintReturn * >() (args, heap) : gsi::arg_maker<QStyleHintReturn * >() (0, heap);
   ret.write<int > ((int)((QCDEStyle_Adaptor *)cls)->cbs_styleHint_c8615_3 (arg1, arg2, arg3, arg4));
 }
 
@@ -1542,10 +1542,10 @@ static void _call_cbs_subControlRect_c9798_1 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QStyle::ComplexControl>::target_type & arg1 = args.read<const qt_gsi::Converter<QStyle::ComplexControl>::target_type & > (heap);
-  const QStyleOptionComplex *arg2 = args.read<const QStyleOptionComplex * > (heap);
-  const qt_gsi::Converter<QStyle::SubControl>::target_type & arg3 = args.read<const qt_gsi::Converter<QStyle::SubControl>::target_type & > (heap);
-  const QWidget *arg4 = args.read<const QWidget * > (heap);
+  const qt_gsi::Converter<QStyle::ComplexControl>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QStyle::ComplexControl>::target_type & >() (args, heap);
+  const QStyleOptionComplex *arg2 = gsi::arg_reader<const QStyleOptionComplex * >() (args, heap);
+  const qt_gsi::Converter<QStyle::SubControl>::target_type & arg3 = gsi::arg_reader<const qt_gsi::Converter<QStyle::SubControl>::target_type & >() (args, heap);
+  const QWidget *arg4 = args ? gsi::arg_reader<const QWidget * >() (args, heap) : gsi::arg_maker<const QWidget * >() (0, heap);
   ret.write<QRect > ((QRect)((QCDEStyle_Adaptor *)cls)->cbs_subControlRect_c9798_1 (arg1, arg2, arg3, arg4));
 }
 
@@ -1572,9 +1572,9 @@ static void _call_cbs_subElementRect_c6528_1 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QStyle::SubElement>::target_type & arg1 = args.read<const qt_gsi::Converter<QStyle::SubElement>::target_type & > (heap);
-  const QStyleOption *arg2 = args.read<const QStyleOption * > (heap);
-  const QWidget *arg3 = args.read<const QWidget * > (heap);
+  const qt_gsi::Converter<QStyle::SubElement>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QStyle::SubElement>::target_type & >() (args, heap);
+  const QStyleOption *arg2 = gsi::arg_reader<const QStyleOption * >() (args, heap);
+  const QWidget *arg3 = args ? gsi::arg_reader<const QWidget * >() (args, heap) : gsi::arg_maker<const QWidget * >() (0, heap);
   ret.write<QRect > ((QRect)((QCDEStyle_Adaptor *)cls)->cbs_subElementRect_c6528_1 (arg1, arg2, arg3));
 }
 
@@ -1597,7 +1597,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCDEStyle_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }
@@ -1621,7 +1621,7 @@ static void _call_cbs_unpolish_1315_0 (const qt_gsi::GenericMethod * /*decl*/, v
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QWidget *arg1 = args.read<QWidget * > (heap);
+  QWidget *arg1 = gsi::arg_reader<QWidget * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCDEStyle_Adaptor *)cls)->cbs_unpolish_1315_0 (arg1);
 }
@@ -1645,7 +1645,7 @@ static void _call_cbs_unpolish_1843_0 (const qt_gsi::GenericMethod * /*decl*/, v
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QApplication *arg1 = args.read<QApplication * > (heap);
+  QApplication *arg1 = gsi::arg_reader<QApplication * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCDEStyle_Adaptor *)cls)->cbs_unpolish_1843_0 (arg1);
 }

src/gsiqt/qt4/QtGui/gsiDeclQCalendarWidget.cc

@@ -1912,7 +1912,7 @@ static void _call_cbs_actionEvent_1823_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QActionEvent *arg1 = args.read<QActionEvent * > (heap);
+  QActionEvent *arg1 = gsi::arg_reader<QActionEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCalendarWidget_Adaptor *)cls)->cbs_actionEvent_1823_0 (arg1);
 }
@@ -1954,7 +1954,7 @@ static void _call_cbs_changeEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCalendarWidget_Adaptor *)cls)->cbs_changeEvent_1217_0 (arg1);
 }
@@ -1978,7 +1978,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCalendarWidget_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -2020,7 +2020,7 @@ static void _call_cbs_closeEvent_1719_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QCloseEvent *arg1 = args.read<QCloseEvent * > (heap);
+  QCloseEvent *arg1 = gsi::arg_reader<QCloseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCalendarWidget_Adaptor *)cls)->cbs_closeEvent_1719_0 (arg1);
 }
@@ -2044,7 +2044,7 @@ static void _call_cbs_contextMenuEvent_2363_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QContextMenuEvent *arg1 = args.read<QContextMenuEvent * > (heap);
+  QContextMenuEvent *arg1 = gsi::arg_reader<QContextMenuEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCalendarWidget_Adaptor *)cls)->cbs_contextMenuEvent_2363_0 (arg1);
 }
@@ -2132,7 +2132,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCalendarWidget_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -2196,7 +2196,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCalendarWidget_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -2220,7 +2220,7 @@ static void _call_cbs_dragEnterEvent_2109_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragEnterEvent *arg1 = args.read<QDragEnterEvent * > (heap);
+  QDragEnterEvent *arg1 = gsi::arg_reader<QDragEnterEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCalendarWidget_Adaptor *)cls)->cbs_dragEnterEvent_2109_0 (arg1);
 }
@@ -2244,7 +2244,7 @@ static void _call_cbs_dragLeaveEvent_2092_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragLeaveEvent *arg1 = args.read<QDragLeaveEvent * > (heap);
+  QDragLeaveEvent *arg1 = gsi::arg_reader<QDragLeaveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCalendarWidget_Adaptor *)cls)->cbs_dragLeaveEvent_2092_0 (arg1);
 }
@@ -2268,7 +2268,7 @@ static void _call_cbs_dragMoveEvent_2006_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragMoveEvent *arg1 = args.read<QDragMoveEvent * > (heap);
+  QDragMoveEvent *arg1 = gsi::arg_reader<QDragMoveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCalendarWidget_Adaptor *)cls)->cbs_dragMoveEvent_2006_0 (arg1);
 }
@@ -2292,7 +2292,7 @@ static void _call_cbs_dropEvent_1622_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDropEvent *arg1 = args.read<QDropEvent * > (heap);
+  QDropEvent *arg1 = gsi::arg_reader<QDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCalendarWidget_Adaptor *)cls)->cbs_dropEvent_1622_0 (arg1);
 }
@@ -2316,7 +2316,7 @@ static void _call_cbs_enabledChange_864_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCalendarWidget_Adaptor *)cls)->cbs_enabledChange_864_0 (arg1);
 }
@@ -2340,7 +2340,7 @@ static void _call_cbs_enterEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCalendarWidget_Adaptor *)cls)->cbs_enterEvent_1217_0 (arg1);
 }
@@ -2364,7 +2364,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QCalendarWidget_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -2389,8 +2389,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QCalendarWidget_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -2413,7 +2413,7 @@ static void _call_cbs_focusInEvent_1729_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCalendarWidget_Adaptor *)cls)->cbs_focusInEvent_1729_0 (arg1);
 }
@@ -2451,7 +2451,7 @@ static void _call_cbs_focusNextPrevChild_864_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   ret.write<bool > ((bool)((QCalendarWidget_Adaptor *)cls)->cbs_focusNextPrevChild_864_0 (arg1));
 }
 
@@ -2474,7 +2474,7 @@ static void _call_cbs_focusOutEvent_1729_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCalendarWidget_Adaptor *)cls)->cbs_focusOutEvent_1729_0 (arg1);
 }
@@ -2512,7 +2512,7 @@ static void _call_cbs_fontChange_1801_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QFont &arg1 = args.read<const QFont & > (heap);
+  const QFont &arg1 = gsi::arg_reader<const QFont & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCalendarWidget_Adaptor *)cls)->cbs_fontChange_1801_0 (arg1);
 }
@@ -2536,7 +2536,7 @@ static void _call_cbs_heightForWidth_c767_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   ret.write<int > ((int)((QCalendarWidget_Adaptor *)cls)->cbs_heightForWidth_c767_0 (arg1));
 }
 
@@ -2559,7 +2559,7 @@ static void _call_cbs_hideEvent_1595_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QHideEvent *arg1 = args.read<QHideEvent * > (heap);
+  QHideEvent *arg1 = gsi::arg_reader<QHideEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCalendarWidget_Adaptor *)cls)->cbs_hideEvent_1595_0 (arg1);
 }
@@ -2583,7 +2583,7 @@ static void _call_cbs_inputMethodEvent_2354_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QInputMethodEvent *arg1 = args.read<QInputMethodEvent * > (heap);
+  QInputMethodEvent *arg1 = gsi::arg_reader<QInputMethodEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCalendarWidget_Adaptor *)cls)->cbs_inputMethodEvent_2354_0 (arg1);
 }
@@ -2607,7 +2607,7 @@ static void _call_cbs_inputMethodQuery_c2420_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = args.read<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & > (heap);
+  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & >() (args, heap);
   ret.write<QVariant > ((QVariant)((QCalendarWidget_Adaptor *)cls)->cbs_inputMethodQuery_c2420_0 (arg1));
 }
 
@@ -2630,7 +2630,7 @@ static void _call_cbs_keyPressEvent_1514_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCalendarWidget_Adaptor *)cls)->cbs_keyPressEvent_1514_0 (arg1);
 }
@@ -2654,7 +2654,7 @@ static void _call_cbs_keyReleaseEvent_1514_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCalendarWidget_Adaptor *)cls)->cbs_keyReleaseEvent_1514_0 (arg1);
 }
@@ -2698,7 +2698,7 @@ static void _call_cbs_leaveEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCalendarWidget_Adaptor *)cls)->cbs_leaveEvent_1217_0 (arg1);
 }
@@ -2722,7 +2722,7 @@ static void _call_cbs_metric_c3445_0 (const qt_gsi::GenericMethod * /*decl*/, vo
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & arg1 = args.read<const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & > (heap);
+  const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & >() (args, heap);
   ret.write<int > ((int)((QCalendarWidget_Adaptor *)cls)->cbs_metric_c3445_0 (arg1));
 }
 
@@ -2764,7 +2764,7 @@ static void _call_cbs_mouseDoubleClickEvent_1738_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCalendarWidget_Adaptor *)cls)->cbs_mouseDoubleClickEvent_1738_0 (arg1);
 }
@@ -2788,7 +2788,7 @@ static void _call_cbs_mouseMoveEvent_1738_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCalendarWidget_Adaptor *)cls)->cbs_mouseMoveEvent_1738_0 (arg1);
 }
@@ -2812,7 +2812,7 @@ static void _call_cbs_mousePressEvent_1738_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCalendarWidget_Adaptor *)cls)->cbs_mousePressEvent_1738_0 (arg1);
 }
@@ -2836,7 +2836,7 @@ static void _call_cbs_mouseReleaseEvent_1738_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCalendarWidget_Adaptor *)cls)->cbs_mouseReleaseEvent_1738_0 (arg1);
 }
@@ -2860,7 +2860,7 @@ static void _call_cbs_moveEvent_1624_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMoveEvent *arg1 = args.read<QMoveEvent * > (heap);
+  QMoveEvent *arg1 = gsi::arg_reader<QMoveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCalendarWidget_Adaptor *)cls)->cbs_moveEvent_1624_0 (arg1);
 }
@@ -2888,9 +2888,9 @@ static void _call_cbs_paintCell_c4778_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QPainter *arg1 = args.read<QPainter * > (heap);
-  const QRect &arg2 = args.read<const QRect & > (heap);
-  const QDate &arg3 = args.read<const QDate & > (heap);
+  QPainter *arg1 = gsi::arg_reader<QPainter * >() (args, heap);
+  const QRect &arg2 = gsi::arg_reader<const QRect & >() (args, heap);
+  const QDate &arg3 = gsi::arg_reader<const QDate & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCalendarWidget_Adaptor *)cls)->cbs_paintCell_c4778_0 (arg1, arg2, arg3);
 }
@@ -2933,7 +2933,7 @@ static void _call_cbs_paintEvent_1725_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QPaintEvent *arg1 = args.read<QPaintEvent * > (heap);
+  QPaintEvent *arg1 = gsi::arg_reader<QPaintEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCalendarWidget_Adaptor *)cls)->cbs_paintEvent_1725_0 (arg1);
 }
@@ -2957,7 +2957,7 @@ static void _call_cbs_paletteChange_2113_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QPalette &arg1 = args.read<const QPalette & > (heap);
+  const QPalette &arg1 = gsi::arg_reader<const QPalette & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCalendarWidget_Adaptor *)cls)->cbs_paletteChange_2113_0 (arg1);
 }
@@ -3014,7 +3014,7 @@ static void _call_cbs_resizeEvent_1843_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QResizeEvent *arg1 = args.read<QResizeEvent * > (heap);
+  QResizeEvent *arg1 = gsi::arg_reader<QResizeEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCalendarWidget_Adaptor *)cls)->cbs_resizeEvent_1843_0 (arg1);
 }
@@ -3066,7 +3066,7 @@ static void _call_cbs_setVisible_864_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCalendarWidget_Adaptor *)cls)->cbs_setVisible_864_0 (arg1);
 }
@@ -3090,7 +3090,7 @@ static void _call_cbs_showEvent_1634_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QShowEvent *arg1 = args.read<QShowEvent * > (heap);
+  QShowEvent *arg1 = gsi::arg_reader<QShowEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCalendarWidget_Adaptor *)cls)->cbs_showEvent_1634_0 (arg1);
 }
@@ -3133,7 +3133,7 @@ static void _call_cbs_styleChange_1228_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QStyle &arg1 = args.read<QStyle & > (heap);
+  QStyle &arg1 = gsi::arg_reader<QStyle & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCalendarWidget_Adaptor *)cls)->cbs_styleChange_1228_0 (arg1);
 }
@@ -3157,7 +3157,7 @@ static void _call_cbs_tabletEvent_1821_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTabletEvent *arg1 = args.read<QTabletEvent * > (heap);
+  QTabletEvent *arg1 = gsi::arg_reader<QTabletEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCalendarWidget_Adaptor *)cls)->cbs_tabletEvent_1821_0 (arg1);
 }
@@ -3181,7 +3181,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCalendarWidget_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }
@@ -3254,7 +3254,7 @@ static void _call_cbs_wheelEvent_1718_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QWheelEvent *arg1 = args.read<QWheelEvent * > (heap);
+  QWheelEvent *arg1 = gsi::arg_reader<QWheelEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCalendarWidget_Adaptor *)cls)->cbs_wheelEvent_1718_0 (arg1);
 }
@@ -3278,7 +3278,7 @@ static void _call_cbs_windowActivationChange_864_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCalendarWidget_Adaptor *)cls)->cbs_windowActivationChange_864_0 (arg1);
 }

src/gsiqt/qt4/QtGui/gsiDeclQCheckBox.cc

@@ -1270,7 +1270,7 @@ static void _call_cbs_actionEvent_1823_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QActionEvent *arg1 = args.read<QActionEvent * > (heap);
+  QActionEvent *arg1 = gsi::arg_reader<QActionEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCheckBox_Adaptor *)cls)->cbs_actionEvent_1823_0 (arg1);
 }
@@ -1294,7 +1294,7 @@ static void _call_cbs_changeEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCheckBox_Adaptor *)cls)->cbs_changeEvent_1217_0 (arg1);
 }
@@ -1338,7 +1338,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCheckBox_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -1380,7 +1380,7 @@ static void _call_cbs_closeEvent_1719_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QCloseEvent *arg1 = args.read<QCloseEvent * > (heap);
+  QCloseEvent *arg1 = gsi::arg_reader<QCloseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCheckBox_Adaptor *)cls)->cbs_closeEvent_1719_0 (arg1);
 }
@@ -1404,7 +1404,7 @@ static void _call_cbs_contextMenuEvent_2363_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QContextMenuEvent *arg1 = args.read<QContextMenuEvent * > (heap);
+  QContextMenuEvent *arg1 = gsi::arg_reader<QContextMenuEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCheckBox_Adaptor *)cls)->cbs_contextMenuEvent_2363_0 (arg1);
 }
@@ -1471,7 +1471,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCheckBox_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -1535,7 +1535,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCheckBox_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -1559,7 +1559,7 @@ static void _call_cbs_dragEnterEvent_2109_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragEnterEvent *arg1 = args.read<QDragEnterEvent * > (heap);
+  QDragEnterEvent *arg1 = gsi::arg_reader<QDragEnterEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCheckBox_Adaptor *)cls)->cbs_dragEnterEvent_2109_0 (arg1);
 }
@@ -1583,7 +1583,7 @@ static void _call_cbs_dragLeaveEvent_2092_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragLeaveEvent *arg1 = args.read<QDragLeaveEvent * > (heap);
+  QDragLeaveEvent *arg1 = gsi::arg_reader<QDragLeaveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCheckBox_Adaptor *)cls)->cbs_dragLeaveEvent_2092_0 (arg1);
 }
@@ -1607,7 +1607,7 @@ static void _call_cbs_dragMoveEvent_2006_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragMoveEvent *arg1 = args.read<QDragMoveEvent * > (heap);
+  QDragMoveEvent *arg1 = gsi::arg_reader<QDragMoveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCheckBox_Adaptor *)cls)->cbs_dragMoveEvent_2006_0 (arg1);
 }
@@ -1631,7 +1631,7 @@ static void _call_cbs_dropEvent_1622_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDropEvent *arg1 = args.read<QDropEvent * > (heap);
+  QDropEvent *arg1 = gsi::arg_reader<QDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCheckBox_Adaptor *)cls)->cbs_dropEvent_1622_0 (arg1);
 }
@@ -1655,7 +1655,7 @@ static void _call_cbs_enabledChange_864_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCheckBox_Adaptor *)cls)->cbs_enabledChange_864_0 (arg1);
 }
@@ -1679,7 +1679,7 @@ static void _call_cbs_enterEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCheckBox_Adaptor *)cls)->cbs_enterEvent_1217_0 (arg1);
 }
@@ -1703,7 +1703,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QCheckBox_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -1728,8 +1728,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QCheckBox_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -1752,7 +1752,7 @@ static void _call_cbs_focusInEvent_1729_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCheckBox_Adaptor *)cls)->cbs_focusInEvent_1729_0 (arg1);
 }
@@ -1790,7 +1790,7 @@ static void _call_cbs_focusNextPrevChild_864_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   ret.write<bool > ((bool)((QCheckBox_Adaptor *)cls)->cbs_focusNextPrevChild_864_0 (arg1));
 }
 
@@ -1813,7 +1813,7 @@ static void _call_cbs_focusOutEvent_1729_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCheckBox_Adaptor *)cls)->cbs_focusOutEvent_1729_0 (arg1);
 }
@@ -1851,7 +1851,7 @@ static void _call_cbs_fontChange_1801_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QFont &arg1 = args.read<const QFont & > (heap);
+  const QFont &arg1 = gsi::arg_reader<const QFont & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCheckBox_Adaptor *)cls)->cbs_fontChange_1801_0 (arg1);
 }
@@ -1875,7 +1875,7 @@ static void _call_cbs_heightForWidth_c767_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   ret.write<int > ((int)((QCheckBox_Adaptor *)cls)->cbs_heightForWidth_c767_0 (arg1));
 }
 
@@ -1898,7 +1898,7 @@ static void _call_cbs_hideEvent_1595_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QHideEvent *arg1 = args.read<QHideEvent * > (heap);
+  QHideEvent *arg1 = gsi::arg_reader<QHideEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCheckBox_Adaptor *)cls)->cbs_hideEvent_1595_0 (arg1);
 }
@@ -1922,7 +1922,7 @@ static void _call_cbs_hitButton_c1916_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QPoint &arg1 = args.read<const QPoint & > (heap);
+  const QPoint &arg1 = gsi::arg_reader<const QPoint & >() (args, heap);
   ret.write<bool > ((bool)((QCheckBox_Adaptor *)cls)->cbs_hitButton_c1916_0 (arg1));
 }
 
@@ -1964,7 +1964,7 @@ static void _call_cbs_inputMethodEvent_2354_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QInputMethodEvent *arg1 = args.read<QInputMethodEvent * > (heap);
+  QInputMethodEvent *arg1 = gsi::arg_reader<QInputMethodEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCheckBox_Adaptor *)cls)->cbs_inputMethodEvent_2354_0 (arg1);
 }
@@ -1988,7 +1988,7 @@ static void _call_cbs_inputMethodQuery_c2420_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = args.read<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & > (heap);
+  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & >() (args, heap);
   ret.write<QVariant > ((QVariant)((QCheckBox_Adaptor *)cls)->cbs_inputMethodQuery_c2420_0 (arg1));
 }
 
@@ -2011,7 +2011,7 @@ static void _call_cbs_keyPressEvent_1514_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCheckBox_Adaptor *)cls)->cbs_keyPressEvent_1514_0 (arg1);
 }
@@ -2035,7 +2035,7 @@ static void _call_cbs_keyReleaseEvent_1514_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCheckBox_Adaptor *)cls)->cbs_keyReleaseEvent_1514_0 (arg1);
 }
@@ -2079,7 +2079,7 @@ static void _call_cbs_leaveEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCheckBox_Adaptor *)cls)->cbs_leaveEvent_1217_0 (arg1);
 }
@@ -2103,7 +2103,7 @@ static void _call_cbs_metric_c3445_0 (const qt_gsi::GenericMethod * /*decl*/, vo
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & arg1 = args.read<const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & > (heap);
+  const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & >() (args, heap);
   ret.write<int > ((int)((QCheckBox_Adaptor *)cls)->cbs_metric_c3445_0 (arg1));
 }
 
@@ -2145,7 +2145,7 @@ static void _call_cbs_mouseDoubleClickEvent_1738_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCheckBox_Adaptor *)cls)->cbs_mouseDoubleClickEvent_1738_0 (arg1);
 }
@@ -2169,7 +2169,7 @@ static void _call_cbs_mouseMoveEvent_1738_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCheckBox_Adaptor *)cls)->cbs_mouseMoveEvent_1738_0 (arg1);
 }
@@ -2193,7 +2193,7 @@ static void _call_cbs_mousePressEvent_1738_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCheckBox_Adaptor *)cls)->cbs_mousePressEvent_1738_0 (arg1);
 }
@@ -2217,7 +2217,7 @@ static void _call_cbs_mouseReleaseEvent_1738_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCheckBox_Adaptor *)cls)->cbs_mouseReleaseEvent_1738_0 (arg1);
 }
@@ -2241,7 +2241,7 @@ static void _call_cbs_moveEvent_1624_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMoveEvent *arg1 = args.read<QMoveEvent * > (heap);
+  QMoveEvent *arg1 = gsi::arg_reader<QMoveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCheckBox_Adaptor *)cls)->cbs_moveEvent_1624_0 (arg1);
 }
@@ -2304,7 +2304,7 @@ static void _call_cbs_paintEvent_1725_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QPaintEvent *arg1 = args.read<QPaintEvent * > (heap);
+  QPaintEvent *arg1 = gsi::arg_reader<QPaintEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCheckBox_Adaptor *)cls)->cbs_paintEvent_1725_0 (arg1);
 }
@@ -2328,7 +2328,7 @@ static void _call_cbs_paletteChange_2113_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QPalette &arg1 = args.read<const QPalette & > (heap);
+  const QPalette &arg1 = gsi::arg_reader<const QPalette & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCheckBox_Adaptor *)cls)->cbs_paletteChange_2113_0 (arg1);
 }
@@ -2413,7 +2413,7 @@ static void _call_cbs_resizeEvent_1843_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QResizeEvent *arg1 = args.read<QResizeEvent * > (heap);
+  QResizeEvent *arg1 = gsi::arg_reader<QResizeEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCheckBox_Adaptor *)cls)->cbs_resizeEvent_1843_0 (arg1);
 }
@@ -2451,7 +2451,7 @@ static void _call_cbs_setVisible_864_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCheckBox_Adaptor *)cls)->cbs_setVisible_864_0 (arg1);
 }
@@ -2475,7 +2475,7 @@ static void _call_cbs_showEvent_1634_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QShowEvent *arg1 = args.read<QShowEvent * > (heap);
+  QShowEvent *arg1 = gsi::arg_reader<QShowEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCheckBox_Adaptor *)cls)->cbs_showEvent_1634_0 (arg1);
 }
@@ -2536,7 +2536,7 @@ static void _call_cbs_styleChange_1228_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QStyle &arg1 = args.read<QStyle & > (heap);
+  QStyle &arg1 = gsi::arg_reader<QStyle & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCheckBox_Adaptor *)cls)->cbs_styleChange_1228_0 (arg1);
 }
@@ -2560,7 +2560,7 @@ static void _call_cbs_tabletEvent_1821_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTabletEvent *arg1 = args.read<QTabletEvent * > (heap);
+  QTabletEvent *arg1 = gsi::arg_reader<QTabletEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCheckBox_Adaptor *)cls)->cbs_tabletEvent_1821_0 (arg1);
 }
@@ -2584,7 +2584,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCheckBox_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }
@@ -2641,7 +2641,7 @@ static void _call_cbs_wheelEvent_1718_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QWheelEvent *arg1 = args.read<QWheelEvent * > (heap);
+  QWheelEvent *arg1 = gsi::arg_reader<QWheelEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCheckBox_Adaptor *)cls)->cbs_wheelEvent_1718_0 (arg1);
 }
@@ -2665,7 +2665,7 @@ static void _call_cbs_windowActivationChange_864_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCheckBox_Adaptor *)cls)->cbs_windowActivationChange_864_0 (arg1);
 }

src/gsiqt/qt4/QtGui/gsiDeclQCleanlooksStyle.cc

@@ -1213,7 +1213,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCleanlooksStyle_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -1237,7 +1237,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCleanlooksStyle_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -1279,7 +1279,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCleanlooksStyle_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -1309,10 +1309,10 @@ static void _call_cbs_drawComplexControl_c9027_0 (const qt_gsi::GenericMethod *
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QStyle::ComplexControl>::target_type & arg1 = args.read<const qt_gsi::Converter<QStyle::ComplexControl>::target_type & > (heap);
-  const QStyleOptionComplex *arg2 = args.read<const QStyleOptionComplex * > (heap);
-  QPainter *arg3 = args.read<QPainter * > (heap);
-  const QWidget *arg4 = args.read<const QWidget * > (heap);
+  const qt_gsi::Converter<QStyle::ComplexControl>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QStyle::ComplexControl>::target_type & >() (args, heap);
+  const QStyleOptionComplex *arg2 = gsi::arg_reader<const QStyleOptionComplex * >() (args, heap);
+  QPainter *arg3 = gsi::arg_reader<QPainter * >() (args, heap);
+  const QWidget *arg4 = gsi::arg_reader<const QWidget * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCleanlooksStyle_Adaptor *)cls)->cbs_drawComplexControl_c9027_0 (arg1, arg2, arg3, arg4);
 }
@@ -1342,10 +1342,10 @@ static void _call_cbs_drawControl_c8285_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QStyle::ControlElement>::target_type & arg1 = args.read<const qt_gsi::Converter<QStyle::ControlElement>::target_type & > (heap);
-  const QStyleOption *arg2 = args.read<const QStyleOption * > (heap);
-  QPainter *arg3 = args.read<QPainter * > (heap);
-  const QWidget *arg4 = args.read<const QWidget * > (heap);
+  const qt_gsi::Converter<QStyle::ControlElement>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QStyle::ControlElement>::target_type & >() (args, heap);
+  const QStyleOption *arg2 = gsi::arg_reader<const QStyleOption * >() (args, heap);
+  QPainter *arg3 = gsi::arg_reader<QPainter * >() (args, heap);
+  const QWidget *arg4 = gsi::arg_reader<const QWidget * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCleanlooksStyle_Adaptor *)cls)->cbs_drawControl_c8285_0 (arg1, arg2, arg3, arg4);
 }
@@ -1375,10 +1375,10 @@ static void _call_cbs_drawItemPixmap_c5678_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QPainter *arg1 = args.read<QPainter * > (heap);
-  const QRect &arg2 = args.read<const QRect & > (heap);
-  int arg3 = args.read<int > (heap);
-  const QPixmap &arg4 = args.read<const QPixmap & > (heap);
+  QPainter *arg1 = gsi::arg_reader<QPainter * >() (args, heap);
+  const QRect &arg2 = gsi::arg_reader<const QRect & >() (args, heap);
+  int arg3 = gsi::arg_reader<int >() (args, heap);
+  const QPixmap &arg4 = gsi::arg_reader<const QPixmap & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCleanlooksStyle_Adaptor *)cls)->cbs_drawItemPixmap_c5678_0 (arg1, arg2, arg3, arg4);
 }
@@ -1414,13 +1414,13 @@ static void _call_cbs_drawItemText_c10604_1 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QPainter *arg1 = args.read<QPainter * > (heap);
-  const QRect &arg2 = args.read<const QRect & > (heap);
-  int arg3 = args.read<int > (heap);
-  const QPalette &arg4 = args.read<const QPalette & > (heap);
-  bool arg5 = args.read<bool > (heap);
-  const QString &arg6 = args.read<const QString & > (heap);
-  const qt_gsi::Converter<QPalette::ColorRole>::target_type & arg7 = args.read<const qt_gsi::Converter<QPalette::ColorRole>::target_type & > (heap);
+  QPainter *arg1 = gsi::arg_reader<QPainter * >() (args, heap);
+  const QRect &arg2 = gsi::arg_reader<const QRect & >() (args, heap);
+  int arg3 = gsi::arg_reader<int >() (args, heap);
+  const QPalette &arg4 = gsi::arg_reader<const QPalette & >() (args, heap);
+  bool arg5 = gsi::arg_reader<bool >() (args, heap);
+  const QString &arg6 = gsi::arg_reader<const QString & >() (args, heap);
+  const qt_gsi::Converter<QPalette::ColorRole>::target_type & arg7 = args ? gsi::arg_reader<const qt_gsi::Converter<QPalette::ColorRole>::target_type & >() (args, heap) : gsi::arg_maker<const qt_gsi::Converter<QPalette::ColorRole>::target_type & >() (qt_gsi::CppToQtReadAdaptor<QPalette::ColorRole>(heap, QPalette::NoRole), heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCleanlooksStyle_Adaptor *)cls)->cbs_drawItemText_c10604_1 (arg1, arg2, arg3, arg4, arg5, arg6, arg7);
 }
@@ -1450,10 +1450,10 @@ static void _call_cbs_drawPrimitive_c8501_1 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QStyle::PrimitiveElement>::target_type & arg1 = args.read<const qt_gsi::Converter<QStyle::PrimitiveElement>::target_type & > (heap);
-  const QStyleOption *arg2 = args.read<const QStyleOption * > (heap);
-  QPainter *arg3 = args.read<QPainter * > (heap);
-  const QWidget *arg4 = args.read<const QWidget * > (heap);
+  const qt_gsi::Converter<QStyle::PrimitiveElement>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QStyle::PrimitiveElement>::target_type & >() (args, heap);
+  const QStyleOption *arg2 = gsi::arg_reader<const QStyleOption * >() (args, heap);
+  QPainter *arg3 = gsi::arg_reader<QPainter * >() (args, heap);
+  const QWidget *arg4 = args ? gsi::arg_reader<const QWidget * >() (args, heap) : gsi::arg_maker<const QWidget * >() (0, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCleanlooksStyle_Adaptor *)cls)->cbs_drawPrimitive_c8501_1 (arg1, arg2, arg3, arg4);
 }
@@ -1477,7 +1477,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QCleanlooksStyle_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -1502,8 +1502,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QCleanlooksStyle_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -1530,9 +1530,9 @@ static void _call_cbs_generatedIconPixmap_c5776_0 (const qt_gsi::GenericMethod *
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QIcon::Mode>::target_type & arg1 = args.read<const qt_gsi::Converter<QIcon::Mode>::target_type & > (heap);
-  const QPixmap &arg2 = args.read<const QPixmap & > (heap);
-  const QStyleOption *arg3 = args.read<const QStyleOption * > (heap);
+  const qt_gsi::Converter<QIcon::Mode>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QIcon::Mode>::target_type & >() (args, heap);
+  const QPixmap &arg2 = gsi::arg_reader<const QPixmap & >() (args, heap);
+  const QStyleOption *arg3 = gsi::arg_reader<const QStyleOption * >() (args, heap);
   ret.write<QPixmap > ((QPixmap)((QCleanlooksStyle_Adaptor *)cls)->cbs_generatedIconPixmap_c5776_0 (arg1, arg2, arg3));
 }
 
@@ -1561,10 +1561,10 @@ static void _call_cbs_hitTestComplexControl_c9517_1 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QStyle::ComplexControl>::target_type & arg1 = args.read<const qt_gsi::Converter<QStyle::ComplexControl>::target_type & > (heap);
-  const QStyleOptionComplex *arg2 = args.read<const QStyleOptionComplex * > (heap);
-  const QPoint &arg3 = args.read<const QPoint & > (heap);
-  const QWidget *arg4 = args.read<const QWidget * > (heap);
+  const qt_gsi::Converter<QStyle::ComplexControl>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QStyle::ComplexControl>::target_type & >() (args, heap);
+  const QStyleOptionComplex *arg2 = gsi::arg_reader<const QStyleOptionComplex * >() (args, heap);
+  const QPoint &arg3 = gsi::arg_reader<const QPoint & >() (args, heap);
+  const QWidget *arg4 = args ? gsi::arg_reader<const QWidget * >() (args, heap) : gsi::arg_maker<const QWidget * >() (0, heap);
   ret.write<qt_gsi::Converter<QStyle::SubControl>::target_type > ((qt_gsi::Converter<QStyle::SubControl>::target_type)((QCleanlooksStyle_Adaptor *)cls)->cbs_hitTestComplexControl_c9517_1 (arg1, arg2, arg3, arg4));
 }
 
@@ -1591,9 +1591,9 @@ static void _call_cbs_itemPixmapRect_c4360_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QRect &arg1 = args.read<const QRect & > (heap);
-  int arg2 = args.read<int > (heap);
-  const QPixmap &arg3 = args.read<const QPixmap & > (heap);
+  const QRect &arg1 = gsi::arg_reader<const QRect & >() (args, heap);
+  int arg2 = gsi::arg_reader<int >() (args, heap);
+  const QPixmap &arg3 = gsi::arg_reader<const QPixmap & >() (args, heap);
   ret.write<QRect > ((QRect)((QCleanlooksStyle_Adaptor *)cls)->cbs_itemPixmapRect_c4360_0 (arg1, arg2, arg3));
 }
 
@@ -1624,11 +1624,11 @@ static void _call_cbs_itemTextRect_c7544_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QFontMetrics &arg1 = args.read<const QFontMetrics & > (heap);
-  const QRect &arg2 = args.read<const QRect & > (heap);
-  int arg3 = args.read<int > (heap);
-  bool arg4 = args.read<bool > (heap);
-  const QString &arg5 = args.read<const QString & > (heap);
+  const QFontMetrics &arg1 = gsi::arg_reader<const QFontMetrics & >() (args, heap);
+  const QRect &arg2 = gsi::arg_reader<const QRect & >() (args, heap);
+  int arg3 = gsi::arg_reader<int >() (args, heap);
+  bool arg4 = gsi::arg_reader<bool >() (args, heap);
+  const QString &arg5 = gsi::arg_reader<const QString & >() (args, heap);
   ret.write<QRect > ((QRect)((QCleanlooksStyle_Adaptor *)cls)->cbs_itemTextRect_c7544_0 (arg1, arg2, arg3, arg4, arg5));
 }
 
@@ -1685,9 +1685,9 @@ static void _call_cbs_pixelMetric_c6642_2 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QStyle::PixelMetric>::target_type & arg1 = args.read<const qt_gsi::Converter<QStyle::PixelMetric>::target_type & > (heap);
-  const QStyleOption *arg2 = args.read<const QStyleOption * > (heap);
-  const QWidget *arg3 = args.read<const QWidget * > (heap);
+  const qt_gsi::Converter<QStyle::PixelMetric>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QStyle::PixelMetric>::target_type & >() (args, heap);
+  const QStyleOption *arg2 = args ? gsi::arg_reader<const QStyleOption * >() (args, heap) : gsi::arg_maker<const QStyleOption * >() (0, heap);
+  const QWidget *arg3 = args ? gsi::arg_reader<const QWidget * >() (args, heap) : gsi::arg_maker<const QWidget * >() (0, heap);
   ret.write<int > ((int)((QCleanlooksStyle_Adaptor *)cls)->cbs_pixelMetric_c6642_2 (arg1, arg2, arg3));
 }
 
@@ -1710,7 +1710,7 @@ static void _call_cbs_polish_1315_0 (const qt_gsi::GenericMethod * /*decl*/, voi
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QWidget *arg1 = args.read<QWidget * > (heap);
+  QWidget *arg1 = gsi::arg_reader<QWidget * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCleanlooksStyle_Adaptor *)cls)->cbs_polish_1315_0 (arg1);
 }
@@ -1734,7 +1734,7 @@ static void _call_cbs_polish_1843_0 (const qt_gsi::GenericMethod * /*decl*/, voi
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QApplication *arg1 = args.read<QApplication * > (heap);
+  QApplication *arg1 = gsi::arg_reader<QApplication * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCleanlooksStyle_Adaptor *)cls)->cbs_polish_1843_0 (arg1);
 }
@@ -1758,7 +1758,7 @@ static void _call_cbs_polish_1418_0 (const qt_gsi::GenericMethod * /*decl*/, voi
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QPalette &arg1 = args.read<QPalette & > (heap);
+  QPalette &arg1 = gsi::arg_reader<QPalette & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCleanlooksStyle_Adaptor *)cls)->cbs_polish_1418_0 (arg1);
 }
@@ -1820,10 +1820,10 @@ static void _call_cbs_sizeFromContents_c8477_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QStyle::ContentsType>::target_type & arg1 = args.read<const qt_gsi::Converter<QStyle::ContentsType>::target_type & > (heap);
-  const QStyleOption *arg2 = args.read<const QStyleOption * > (heap);
-  const QSize &arg3 = args.read<const QSize & > (heap);
-  const QWidget *arg4 = args.read<const QWidget * > (heap);
+  const qt_gsi::Converter<QStyle::ContentsType>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QStyle::ContentsType>::target_type & >() (args, heap);
+  const QStyleOption *arg2 = gsi::arg_reader<const QStyleOption * >() (args, heap);
+  const QSize &arg3 = gsi::arg_reader<const QSize & >() (args, heap);
+  const QWidget *arg4 = gsi::arg_reader<const QWidget * >() (args, heap);
   ret.write<QSize > ((QSize)((QCleanlooksStyle_Adaptor *)cls)->cbs_sizeFromContents_c8477_0 (arg1, arg2, arg3, arg4));
 }
 
@@ -1893,9 +1893,9 @@ static void _call_cbs_standardPixmap_c6956_1 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QStyle::StandardPixmap>::target_type & arg1 = args.read<const qt_gsi::Converter<QStyle::StandardPixmap>::target_type & > (heap);
-  const QStyleOption *arg2 = args.read<const QStyleOption * > (heap);
-  const QWidget *arg3 = args.read<const QWidget * > (heap);
+  const qt_gsi::Converter<QStyle::StandardPixmap>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QStyle::StandardPixmap>::target_type & >() (args, heap);
+  const QStyleOption *arg2 = gsi::arg_reader<const QStyleOption * >() (args, heap);
+  const QWidget *arg3 = args ? gsi::arg_reader<const QWidget * >() (args, heap) : gsi::arg_maker<const QWidget * >() (0, heap);
   ret.write<QPixmap > ((QPixmap)((QCleanlooksStyle_Adaptor *)cls)->cbs_standardPixmap_c6956_1 (arg1, arg2, arg3));
 }
 
@@ -1924,10 +1924,10 @@ static void _call_cbs_styleHint_c8615_3 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QStyle::StyleHint>::target_type & arg1 = args.read<const qt_gsi::Converter<QStyle::StyleHint>::target_type & > (heap);
-  const QStyleOption *arg2 = args.read<const QStyleOption * > (heap);
-  const QWidget *arg3 = args.read<const QWidget * > (heap);
-  QStyleHintReturn *arg4 = args.read<QStyleHintReturn * > (heap);
+  const qt_gsi::Converter<QStyle::StyleHint>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QStyle::StyleHint>::target_type & >() (args, heap);
+  const QStyleOption *arg2 = args ? gsi::arg_reader<const QStyleOption * >() (args, heap) : gsi::arg_maker<const QStyleOption * >() (0, heap);
+  const QWidget *arg3 = args ? gsi::arg_reader<const QWidget * >() (args, heap) : gsi::arg_maker<const QWidget * >() (0, heap);
+  QStyleHintReturn *arg4 = args ? gsi::arg_reader<QStyleHintReturn * >() (args, heap) : gsi::arg_maker<QStyleHintReturn * >() (0, heap);
   ret.write<int > ((int)((QCleanlooksStyle_Adaptor *)cls)->cbs_styleHint_c8615_3 (arg1, arg2, arg3, arg4));
 }
 
@@ -1956,10 +1956,10 @@ static void _call_cbs_subControlRect_c9798_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QStyle::ComplexControl>::target_type & arg1 = args.read<const qt_gsi::Converter<QStyle::ComplexControl>::target_type & > (heap);
-  const QStyleOptionComplex *arg2 = args.read<const QStyleOptionComplex * > (heap);
-  const qt_gsi::Converter<QStyle::SubControl>::target_type & arg3 = args.read<const qt_gsi::Converter<QStyle::SubControl>::target_type & > (heap);
-  const QWidget *arg4 = args.read<const QWidget * > (heap);
+  const qt_gsi::Converter<QStyle::ComplexControl>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QStyle::ComplexControl>::target_type & >() (args, heap);
+  const QStyleOptionComplex *arg2 = gsi::arg_reader<const QStyleOptionComplex * >() (args, heap);
+  const qt_gsi::Converter<QStyle::SubControl>::target_type & arg3 = gsi::arg_reader<const qt_gsi::Converter<QStyle::SubControl>::target_type & >() (args, heap);
+  const QWidget *arg4 = gsi::arg_reader<const QWidget * >() (args, heap);
   ret.write<QRect > ((QRect)((QCleanlooksStyle_Adaptor *)cls)->cbs_subControlRect_c9798_0 (arg1, arg2, arg3, arg4));
 }
 
@@ -1986,9 +1986,9 @@ static void _call_cbs_subElementRect_c6528_1 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QStyle::SubElement>::target_type & arg1 = args.read<const qt_gsi::Converter<QStyle::SubElement>::target_type & > (heap);
-  const QStyleOption *arg2 = args.read<const QStyleOption * > (heap);
-  const QWidget *arg3 = args.read<const QWidget * > (heap);
+  const qt_gsi::Converter<QStyle::SubElement>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QStyle::SubElement>::target_type & >() (args, heap);
+  const QStyleOption *arg2 = gsi::arg_reader<const QStyleOption * >() (args, heap);
+  const QWidget *arg3 = args ? gsi::arg_reader<const QWidget * >() (args, heap) : gsi::arg_maker<const QWidget * >() (0, heap);
   ret.write<QRect > ((QRect)((QCleanlooksStyle_Adaptor *)cls)->cbs_subElementRect_c6528_1 (arg1, arg2, arg3));
 }
 
@@ -2011,7 +2011,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCleanlooksStyle_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }
@@ -2035,7 +2035,7 @@ static void _call_cbs_unpolish_1315_0 (const qt_gsi::GenericMethod * /*decl*/, v
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QWidget *arg1 = args.read<QWidget * > (heap);
+  QWidget *arg1 = gsi::arg_reader<QWidget * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCleanlooksStyle_Adaptor *)cls)->cbs_unpolish_1315_0 (arg1);
 }
@@ -2059,7 +2059,7 @@ static void _call_cbs_unpolish_1843_0 (const qt_gsi::GenericMethod * /*decl*/, v
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QApplication *arg1 = args.read<QApplication * > (heap);
+  QApplication *arg1 = gsi::arg_reader<QApplication * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCleanlooksStyle_Adaptor *)cls)->cbs_unpolish_1843_0 (arg1);
 }

src/gsiqt/qt4/QtGui/gsiDeclQColorDialog.cc

@@ -1571,7 +1571,7 @@ static void _call_cbs_actionEvent_1823_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QActionEvent *arg1 = args.read<QActionEvent * > (heap);
+  QActionEvent *arg1 = gsi::arg_reader<QActionEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColorDialog_Adaptor *)cls)->cbs_actionEvent_1823_0 (arg1);
 }
@@ -1614,7 +1614,7 @@ static void _call_cbs_changeEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColorDialog_Adaptor *)cls)->cbs_changeEvent_1217_0 (arg1);
 }
@@ -1638,7 +1638,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColorDialog_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -1662,7 +1662,7 @@ static void _call_cbs_closeEvent_1719_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QCloseEvent *arg1 = args.read<QCloseEvent * > (heap);
+  QCloseEvent *arg1 = gsi::arg_reader<QCloseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColorDialog_Adaptor *)cls)->cbs_closeEvent_1719_0 (arg1);
 }
@@ -1704,7 +1704,7 @@ static void _call_cbs_contextMenuEvent_2363_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QContextMenuEvent *arg1 = args.read<QContextMenuEvent * > (heap);
+  QContextMenuEvent *arg1 = gsi::arg_reader<QContextMenuEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColorDialog_Adaptor *)cls)->cbs_contextMenuEvent_2363_0 (arg1);
 }
@@ -1789,7 +1789,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColorDialog_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -1853,7 +1853,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColorDialog_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -1877,7 +1877,7 @@ static void _call_cbs_done_767_0 (const qt_gsi::GenericMethod * /*decl*/, void *
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColorDialog_Adaptor *)cls)->cbs_done_767_0 (arg1);
 }
@@ -1901,7 +1901,7 @@ static void _call_cbs_dragEnterEvent_2109_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragEnterEvent *arg1 = args.read<QDragEnterEvent * > (heap);
+  QDragEnterEvent *arg1 = gsi::arg_reader<QDragEnterEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColorDialog_Adaptor *)cls)->cbs_dragEnterEvent_2109_0 (arg1);
 }
@@ -1925,7 +1925,7 @@ static void _call_cbs_dragLeaveEvent_2092_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragLeaveEvent *arg1 = args.read<QDragLeaveEvent * > (heap);
+  QDragLeaveEvent *arg1 = gsi::arg_reader<QDragLeaveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColorDialog_Adaptor *)cls)->cbs_dragLeaveEvent_2092_0 (arg1);
 }
@@ -1949,7 +1949,7 @@ static void _call_cbs_dragMoveEvent_2006_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragMoveEvent *arg1 = args.read<QDragMoveEvent * > (heap);
+  QDragMoveEvent *arg1 = gsi::arg_reader<QDragMoveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColorDialog_Adaptor *)cls)->cbs_dragMoveEvent_2006_0 (arg1);
 }
@@ -1973,7 +1973,7 @@ static void _call_cbs_dropEvent_1622_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDropEvent *arg1 = args.read<QDropEvent * > (heap);
+  QDropEvent *arg1 = gsi::arg_reader<QDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColorDialog_Adaptor *)cls)->cbs_dropEvent_1622_0 (arg1);
 }
@@ -1997,7 +1997,7 @@ static void _call_cbs_enabledChange_864_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColorDialog_Adaptor *)cls)->cbs_enabledChange_864_0 (arg1);
 }
@@ -2021,7 +2021,7 @@ static void _call_cbs_enterEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColorDialog_Adaptor *)cls)->cbs_enterEvent_1217_0 (arg1);
 }
@@ -2045,7 +2045,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QColorDialog_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -2070,8 +2070,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QColorDialog_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -2112,7 +2112,7 @@ static void _call_cbs_focusInEvent_1729_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColorDialog_Adaptor *)cls)->cbs_focusInEvent_1729_0 (arg1);
 }
@@ -2150,7 +2150,7 @@ static void _call_cbs_focusNextPrevChild_864_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   ret.write<bool > ((bool)((QColorDialog_Adaptor *)cls)->cbs_focusNextPrevChild_864_0 (arg1));
 }
 
@@ -2173,7 +2173,7 @@ static void _call_cbs_focusOutEvent_1729_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColorDialog_Adaptor *)cls)->cbs_focusOutEvent_1729_0 (arg1);
 }
@@ -2211,7 +2211,7 @@ static void _call_cbs_fontChange_1801_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QFont &arg1 = args.read<const QFont & > (heap);
+  const QFont &arg1 = gsi::arg_reader<const QFont & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColorDialog_Adaptor *)cls)->cbs_fontChange_1801_0 (arg1);
 }
@@ -2235,7 +2235,7 @@ static void _call_cbs_heightForWidth_c767_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   ret.write<int > ((int)((QColorDialog_Adaptor *)cls)->cbs_heightForWidth_c767_0 (arg1));
 }
 
@@ -2258,7 +2258,7 @@ static void _call_cbs_hideEvent_1595_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QHideEvent *arg1 = args.read<QHideEvent * > (heap);
+  QHideEvent *arg1 = gsi::arg_reader<QHideEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColorDialog_Adaptor *)cls)->cbs_hideEvent_1595_0 (arg1);
 }
@@ -2282,7 +2282,7 @@ static void _call_cbs_inputMethodEvent_2354_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QInputMethodEvent *arg1 = args.read<QInputMethodEvent * > (heap);
+  QInputMethodEvent *arg1 = gsi::arg_reader<QInputMethodEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColorDialog_Adaptor *)cls)->cbs_inputMethodEvent_2354_0 (arg1);
 }
@@ -2306,7 +2306,7 @@ static void _call_cbs_inputMethodQuery_c2420_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = args.read<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & > (heap);
+  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & >() (args, heap);
   ret.write<QVariant > ((QVariant)((QColorDialog_Adaptor *)cls)->cbs_inputMethodQuery_c2420_0 (arg1));
 }
 
@@ -2329,7 +2329,7 @@ static void _call_cbs_keyPressEvent_1514_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColorDialog_Adaptor *)cls)->cbs_keyPressEvent_1514_0 (arg1);
 }
@@ -2353,7 +2353,7 @@ static void _call_cbs_keyReleaseEvent_1514_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColorDialog_Adaptor *)cls)->cbs_keyReleaseEvent_1514_0 (arg1);
 }
@@ -2397,7 +2397,7 @@ static void _call_cbs_leaveEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColorDialog_Adaptor *)cls)->cbs_leaveEvent_1217_0 (arg1);
 }
@@ -2421,7 +2421,7 @@ static void _call_cbs_metric_c3445_0 (const qt_gsi::GenericMethod * /*decl*/, vo
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & arg1 = args.read<const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & > (heap);
+  const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & >() (args, heap);
   ret.write<int > ((int)((QColorDialog_Adaptor *)cls)->cbs_metric_c3445_0 (arg1));
 }
 
@@ -2463,7 +2463,7 @@ static void _call_cbs_mouseDoubleClickEvent_1738_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColorDialog_Adaptor *)cls)->cbs_mouseDoubleClickEvent_1738_0 (arg1);
 }
@@ -2487,7 +2487,7 @@ static void _call_cbs_mouseMoveEvent_1738_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColorDialog_Adaptor *)cls)->cbs_mouseMoveEvent_1738_0 (arg1);
 }
@@ -2511,7 +2511,7 @@ static void _call_cbs_mousePressEvent_1738_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColorDialog_Adaptor *)cls)->cbs_mousePressEvent_1738_0 (arg1);
 }
@@ -2535,7 +2535,7 @@ static void _call_cbs_mouseReleaseEvent_1738_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColorDialog_Adaptor *)cls)->cbs_mouseReleaseEvent_1738_0 (arg1);
 }
@@ -2559,7 +2559,7 @@ static void _call_cbs_moveEvent_1624_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMoveEvent *arg1 = args.read<QMoveEvent * > (heap);
+  QMoveEvent *arg1 = gsi::arg_reader<QMoveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColorDialog_Adaptor *)cls)->cbs_moveEvent_1624_0 (arg1);
 }
@@ -2602,7 +2602,7 @@ static void _call_cbs_paintEvent_1725_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QPaintEvent *arg1 = args.read<QPaintEvent * > (heap);
+  QPaintEvent *arg1 = gsi::arg_reader<QPaintEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColorDialog_Adaptor *)cls)->cbs_paintEvent_1725_0 (arg1);
 }
@@ -2626,7 +2626,7 @@ static void _call_cbs_paletteChange_2113_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QPalette &arg1 = args.read<const QPalette & > (heap);
+  const QPalette &arg1 = gsi::arg_reader<const QPalette & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColorDialog_Adaptor *)cls)->cbs_paletteChange_2113_0 (arg1);
 }
@@ -2717,7 +2717,7 @@ static void _call_cbs_resizeEvent_1843_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QResizeEvent *arg1 = args.read<QResizeEvent * > (heap);
+  QResizeEvent *arg1 = gsi::arg_reader<QResizeEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColorDialog_Adaptor *)cls)->cbs_resizeEvent_1843_0 (arg1);
 }
@@ -2755,7 +2755,7 @@ static void _call_cbs_setVisible_864_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColorDialog_Adaptor *)cls)->cbs_setVisible_864_0 (arg1);
 }
@@ -2779,7 +2779,7 @@ static void _call_cbs_showEvent_1634_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QShowEvent *arg1 = args.read<QShowEvent * > (heap);
+  QShowEvent *arg1 = gsi::arg_reader<QShowEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColorDialog_Adaptor *)cls)->cbs_showEvent_1634_0 (arg1);
 }
@@ -2822,7 +2822,7 @@ static void _call_cbs_styleChange_1228_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QStyle &arg1 = args.read<QStyle & > (heap);
+  QStyle &arg1 = gsi::arg_reader<QStyle & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColorDialog_Adaptor *)cls)->cbs_styleChange_1228_0 (arg1);
 }
@@ -2846,7 +2846,7 @@ static void _call_cbs_tabletEvent_1821_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTabletEvent *arg1 = args.read<QTabletEvent * > (heap);
+  QTabletEvent *arg1 = gsi::arg_reader<QTabletEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColorDialog_Adaptor *)cls)->cbs_tabletEvent_1821_0 (arg1);
 }
@@ -2870,7 +2870,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColorDialog_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }
@@ -2909,7 +2909,7 @@ static void _call_cbs_wheelEvent_1718_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QWheelEvent *arg1 = args.read<QWheelEvent * > (heap);
+  QWheelEvent *arg1 = gsi::arg_reader<QWheelEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColorDialog_Adaptor *)cls)->cbs_wheelEvent_1718_0 (arg1);
 }
@@ -2933,7 +2933,7 @@ static void _call_cbs_windowActivationChange_864_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColorDialog_Adaptor *)cls)->cbs_windowActivationChange_864_0 (arg1);
 }

src/gsiqt/qt4/QtGui/gsiDeclQColumnView.cc

@@ -2141,7 +2141,7 @@ static void _call_cbs_actionEvent_1823_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QActionEvent *arg1 = args.read<QActionEvent * > (heap);
+  QActionEvent *arg1 = gsi::arg_reader<QActionEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColumnView_Adaptor *)cls)->cbs_actionEvent_1823_0 (arg1);
 }
@@ -2183,7 +2183,7 @@ static void _call_cbs_changeEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColumnView_Adaptor *)cls)->cbs_changeEvent_1217_0 (arg1);
 }
@@ -2207,7 +2207,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColumnView_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -2251,8 +2251,8 @@ static void _call_cbs_closeEditor_4926_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QWidget *arg1 = args.read<QWidget * > (heap);
-  const qt_gsi::Converter<QAbstractItemDelegate::EndEditHint>::target_type & arg2 = args.read<const qt_gsi::Converter<QAbstractItemDelegate::EndEditHint>::target_type & > (heap);
+  QWidget *arg1 = gsi::arg_reader<QWidget * >() (args, heap);
+  const qt_gsi::Converter<QAbstractItemDelegate::EndEditHint>::target_type & arg2 = gsi::arg_reader<const qt_gsi::Converter<QAbstractItemDelegate::EndEditHint>::target_type & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColumnView_Adaptor *)cls)->cbs_closeEditor_4926_0 (arg1, arg2);
 }
@@ -2276,7 +2276,7 @@ static void _call_cbs_closeEvent_1719_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QCloseEvent *arg1 = args.read<QCloseEvent * > (heap);
+  QCloseEvent *arg1 = gsi::arg_reader<QCloseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColumnView_Adaptor *)cls)->cbs_closeEvent_1719_0 (arg1);
 }
@@ -2300,7 +2300,7 @@ static void _call_cbs_commitData_1315_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QWidget *arg1 = args.read<QWidget * > (heap);
+  QWidget *arg1 = gsi::arg_reader<QWidget * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColumnView_Adaptor *)cls)->cbs_commitData_1315_0 (arg1);
 }
@@ -2324,7 +2324,7 @@ static void _call_cbs_contextMenuEvent_2363_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QContextMenuEvent *arg1 = args.read<QContextMenuEvent * > (heap);
+  QContextMenuEvent *arg1 = gsi::arg_reader<QContextMenuEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColumnView_Adaptor *)cls)->cbs_contextMenuEvent_2363_0 (arg1);
 }
@@ -2373,7 +2373,7 @@ static void _call_cbs_createColumn_2395_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
   ret.write<QAbstractItemView * > ((QAbstractItemView *)((QColumnView_Adaptor *)cls)->cbs_createColumn_2395_0 (arg1));
 }
 
@@ -2398,8 +2398,8 @@ static void _call_cbs_currentChanged_4682_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
-  const QModelIndex &arg2 = args.read<const QModelIndex & > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
+  const QModelIndex &arg2 = gsi::arg_reader<const QModelIndex & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColumnView_Adaptor *)cls)->cbs_currentChanged_4682_0 (arg1, arg2);
 }
@@ -2441,7 +2441,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColumnView_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -2467,8 +2467,8 @@ static void _call_cbs_dataChanged_4682_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
-  const QModelIndex &arg2 = args.read<const QModelIndex & > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
+  const QModelIndex &arg2 = gsi::arg_reader<const QModelIndex & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColumnView_Adaptor *)cls)->cbs_dataChanged_4682_0 (arg1, arg2);
 }
@@ -2546,7 +2546,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColumnView_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -2623,7 +2623,7 @@ static void _call_cbs_dragEnterEvent_2109_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragEnterEvent *arg1 = args.read<QDragEnterEvent * > (heap);
+  QDragEnterEvent *arg1 = gsi::arg_reader<QDragEnterEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColumnView_Adaptor *)cls)->cbs_dragEnterEvent_2109_0 (arg1);
 }
@@ -2647,7 +2647,7 @@ static void _call_cbs_dragLeaveEvent_2092_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragLeaveEvent *arg1 = args.read<QDragLeaveEvent * > (heap);
+  QDragLeaveEvent *arg1 = gsi::arg_reader<QDragLeaveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColumnView_Adaptor *)cls)->cbs_dragLeaveEvent_2092_0 (arg1);
 }
@@ -2671,7 +2671,7 @@ static void _call_cbs_dragMoveEvent_2006_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragMoveEvent *arg1 = args.read<QDragMoveEvent * > (heap);
+  QDragMoveEvent *arg1 = gsi::arg_reader<QDragMoveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColumnView_Adaptor *)cls)->cbs_dragMoveEvent_2006_0 (arg1);
 }
@@ -2714,7 +2714,7 @@ static void _call_cbs_dropEvent_1622_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDropEvent *arg1 = args.read<QDropEvent * > (heap);
+  QDropEvent *arg1 = gsi::arg_reader<QDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColumnView_Adaptor *)cls)->cbs_dropEvent_1622_0 (arg1);
 }
@@ -2756,9 +2756,9 @@ static void _call_cbs_edit_6773_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
-  const qt_gsi::Converter<QAbstractItemView::EditTrigger>::target_type & arg2 = args.read<const qt_gsi::Converter<QAbstractItemView::EditTrigger>::target_type & > (heap);
-  QEvent *arg3 = args.read<QEvent * > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
+  const qt_gsi::Converter<QAbstractItemView::EditTrigger>::target_type & arg2 = gsi::arg_reader<const qt_gsi::Converter<QAbstractItemView::EditTrigger>::target_type & >() (args, heap);
+  QEvent *arg3 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QColumnView_Adaptor *)cls)->cbs_edit_6773_0 (arg1, arg2, arg3));
 }
 
@@ -2781,7 +2781,7 @@ static void _call_cbs_editorDestroyed_1302_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColumnView_Adaptor *)cls)->cbs_editorDestroyed_1302_0 (arg1);
 }
@@ -2805,7 +2805,7 @@ static void _call_cbs_enabledChange_864_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColumnView_Adaptor *)cls)->cbs_enabledChange_864_0 (arg1);
 }
@@ -2829,7 +2829,7 @@ static void _call_cbs_enterEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColumnView_Adaptor *)cls)->cbs_enterEvent_1217_0 (arg1);
 }
@@ -2871,7 +2871,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QColumnView_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -2896,8 +2896,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QColumnView_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -2935,7 +2935,7 @@ static void _call_cbs_focusInEvent_1729_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColumnView_Adaptor *)cls)->cbs_focusInEvent_1729_0 (arg1);
 }
@@ -2973,7 +2973,7 @@ static void _call_cbs_focusNextPrevChild_864_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   ret.write<bool > ((bool)((QColumnView_Adaptor *)cls)->cbs_focusNextPrevChild_864_0 (arg1));
 }
 
@@ -2996,7 +2996,7 @@ static void _call_cbs_focusOutEvent_1729_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColumnView_Adaptor *)cls)->cbs_focusOutEvent_1729_0 (arg1);
 }
@@ -3034,7 +3034,7 @@ static void _call_cbs_fontChange_1801_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QFont &arg1 = args.read<const QFont & > (heap);
+  const QFont &arg1 = gsi::arg_reader<const QFont & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColumnView_Adaptor *)cls)->cbs_fontChange_1801_0 (arg1);
 }
@@ -3058,7 +3058,7 @@ static void _call_cbs_heightForWidth_c767_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   ret.write<int > ((int)((QColumnView_Adaptor *)cls)->cbs_heightForWidth_c767_0 (arg1));
 }
 
@@ -3081,7 +3081,7 @@ static void _call_cbs_hideEvent_1595_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QHideEvent *arg1 = args.read<QHideEvent * > (heap);
+  QHideEvent *arg1 = gsi::arg_reader<QHideEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColumnView_Adaptor *)cls)->cbs_hideEvent_1595_0 (arg1);
 }
@@ -3124,7 +3124,7 @@ static void _call_cbs_horizontalScrollbarAction_767_0 (const qt_gsi::GenericMeth
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColumnView_Adaptor *)cls)->cbs_horizontalScrollbarAction_767_0 (arg1);
 }
@@ -3148,7 +3148,7 @@ static void _call_cbs_horizontalScrollbarValueChanged_767_0 (const qt_gsi::Gener
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColumnView_Adaptor *)cls)->cbs_horizontalScrollbarValueChanged_767_0 (arg1);
 }
@@ -3186,7 +3186,7 @@ static void _call_cbs_indexAt_c1916_0 (const qt_gsi::GenericMethod * /*decl*/, v
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QPoint &arg1 = args.read<const QPoint & > (heap);
+  const QPoint &arg1 = gsi::arg_reader<const QPoint & >() (args, heap);
   ret.write<QModelIndex > ((QModelIndex)((QColumnView_Adaptor *)cls)->cbs_indexAt_c1916_0 (arg1));
 }
 
@@ -3228,7 +3228,7 @@ static void _call_cbs_inputMethodEvent_2354_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QInputMethodEvent *arg1 = args.read<QInputMethodEvent * > (heap);
+  QInputMethodEvent *arg1 = gsi::arg_reader<QInputMethodEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColumnView_Adaptor *)cls)->cbs_inputMethodEvent_2354_0 (arg1);
 }
@@ -3252,7 +3252,7 @@ static void _call_cbs_inputMethodQuery_c2420_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = args.read<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & > (heap);
+  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & >() (args, heap);
   ret.write<QVariant > ((QVariant)((QColumnView_Adaptor *)cls)->cbs_inputMethodQuery_c2420_0 (arg1));
 }
 
@@ -3275,7 +3275,7 @@ static void _call_cbs_isIndexHidden_c2395_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
   ret.write<bool > ((bool)((QColumnView_Adaptor *)cls)->cbs_isIndexHidden_c2395_0 (arg1));
 }
 
@@ -3298,7 +3298,7 @@ static void _call_cbs_keyPressEvent_1514_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColumnView_Adaptor *)cls)->cbs_keyPressEvent_1514_0 (arg1);
 }
@@ -3322,7 +3322,7 @@ static void _call_cbs_keyReleaseEvent_1514_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColumnView_Adaptor *)cls)->cbs_keyReleaseEvent_1514_0 (arg1);
 }
@@ -3346,7 +3346,7 @@ static void _call_cbs_keyboardSearch_2025_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QString &arg1 = args.read<const QString & > (heap);
+  const QString &arg1 = gsi::arg_reader<const QString & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColumnView_Adaptor *)cls)->cbs_keyboardSearch_2025_0 (arg1);
 }
@@ -3390,7 +3390,7 @@ static void _call_cbs_leaveEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColumnView_Adaptor *)cls)->cbs_leaveEvent_1217_0 (arg1);
 }
@@ -3414,7 +3414,7 @@ static void _call_cbs_metric_c3445_0 (const qt_gsi::GenericMethod * /*decl*/, vo
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & arg1 = args.read<const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & > (heap);
+  const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & >() (args, heap);
   ret.write<int > ((int)((QColumnView_Adaptor *)cls)->cbs_metric_c3445_0 (arg1));
 }
 
@@ -3456,7 +3456,7 @@ static void _call_cbs_mouseDoubleClickEvent_1738_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColumnView_Adaptor *)cls)->cbs_mouseDoubleClickEvent_1738_0 (arg1);
 }
@@ -3480,7 +3480,7 @@ static void _call_cbs_mouseMoveEvent_1738_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColumnView_Adaptor *)cls)->cbs_mouseMoveEvent_1738_0 (arg1);
 }
@@ -3504,7 +3504,7 @@ static void _call_cbs_mousePressEvent_1738_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColumnView_Adaptor *)cls)->cbs_mousePressEvent_1738_0 (arg1);
 }
@@ -3528,7 +3528,7 @@ static void _call_cbs_mouseReleaseEvent_1738_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColumnView_Adaptor *)cls)->cbs_mouseReleaseEvent_1738_0 (arg1);
 }
@@ -3554,8 +3554,8 @@ static void _call_cbs_moveCursor_6476_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  unsigned int arg1 = args.read<unsigned int > (heap);
-  QFlags<Qt::KeyboardModifier> arg2 = args.read<QFlags<Qt::KeyboardModifier> > (heap);
+  unsigned int arg1 = gsi::arg_reader<unsigned int >() (args, heap);
+  QFlags<Qt::KeyboardModifier> arg2 = gsi::arg_reader<QFlags<Qt::KeyboardModifier> >() (args, heap);
   ret.write<QModelIndex > ((QModelIndex)((QColumnView_Adaptor *)cls)->cbs_moveCursor_6476_0 (arg1, arg2));
 }
 
@@ -3578,7 +3578,7 @@ static void _call_cbs_moveEvent_1624_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMoveEvent *arg1 = args.read<QMoveEvent * > (heap);
+  QMoveEvent *arg1 = gsi::arg_reader<QMoveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColumnView_Adaptor *)cls)->cbs_moveEvent_1624_0 (arg1);
 }
@@ -3621,7 +3621,7 @@ static void _call_cbs_paintEvent_1725_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QPaintEvent *arg1 = args.read<QPaintEvent * > (heap);
+  QPaintEvent *arg1 = gsi::arg_reader<QPaintEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColumnView_Adaptor *)cls)->cbs_paintEvent_1725_0 (arg1);
 }
@@ -3645,7 +3645,7 @@ static void _call_cbs_paletteChange_2113_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QPalette &arg1 = args.read<const QPalette & > (heap);
+  const QPalette &arg1 = gsi::arg_reader<const QPalette & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColumnView_Adaptor *)cls)->cbs_paletteChange_2113_0 (arg1);
 }
@@ -3740,7 +3740,7 @@ static void _call_cbs_resizeEvent_1843_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QResizeEvent *arg1 = args.read<QResizeEvent * > (heap);
+  QResizeEvent *arg1 = gsi::arg_reader<QResizeEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColumnView_Adaptor *)cls)->cbs_resizeEvent_1843_0 (arg1);
 }
@@ -3768,9 +3768,9 @@ static void _call_cbs_rowsAboutToBeRemoved_3713_0 (const qt_gsi::GenericMethod *
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
-  int arg2 = args.read<int > (heap);
-  int arg3 = args.read<int > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
+  int arg2 = gsi::arg_reader<int >() (args, heap);
+  int arg3 = gsi::arg_reader<int >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColumnView_Adaptor *)cls)->cbs_rowsAboutToBeRemoved_3713_0 (arg1, arg2, arg3);
 }
@@ -3798,9 +3798,9 @@ static void _call_cbs_rowsInserted_3713_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
-  int arg2 = args.read<int > (heap);
-  int arg3 = args.read<int > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
+  int arg2 = gsi::arg_reader<int >() (args, heap);
+  int arg3 = gsi::arg_reader<int >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColumnView_Adaptor *)cls)->cbs_rowsInserted_3713_0 (arg1, arg2, arg3);
 }
@@ -3841,8 +3841,8 @@ static void _call_cbs_scrollContentsBy_1426_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
-  int arg2 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
+  int arg2 = gsi::arg_reader<int >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColumnView_Adaptor *)cls)->cbs_scrollContentsBy_1426_0 (arg1, arg2);
 }
@@ -3890,8 +3890,8 @@ static void _call_cbs_scrollTo_5576_1 (const qt_gsi::GenericMethod * /*decl*/, v
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
-  const qt_gsi::Converter<QAbstractItemView::ScrollHint>::target_type & arg2 = args.read<const qt_gsi::Converter<QAbstractItemView::ScrollHint>::target_type & > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
+  const qt_gsi::Converter<QAbstractItemView::ScrollHint>::target_type & arg2 = args ? gsi::arg_reader<const qt_gsi::Converter<QAbstractItemView::ScrollHint>::target_type & >() (args, heap) : gsi::arg_maker<const qt_gsi::Converter<QAbstractItemView::ScrollHint>::target_type & >() (qt_gsi::CppToQtReadAdaptor<QAbstractItemView::ScrollHint>(heap, QAbstractItemView::EnsureVisible), heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColumnView_Adaptor *)cls)->cbs_scrollTo_5576_1 (arg1, arg2);
 }
@@ -3956,8 +3956,8 @@ static void _call_cbs_selectionChanged_5346_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QItemSelection &arg1 = args.read<const QItemSelection & > (heap);
-  const QItemSelection &arg2 = args.read<const QItemSelection & > (heap);
+  const QItemSelection &arg1 = gsi::arg_reader<const QItemSelection & >() (args, heap);
+  const QItemSelection &arg2 = gsi::arg_reader<const QItemSelection & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColumnView_Adaptor *)cls)->cbs_selectionChanged_5346_0 (arg1, arg2);
 }
@@ -3983,8 +3983,8 @@ static void _call_cbs_selectionCommand_c4199_1 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
-  const QEvent *arg2 = args.read<const QEvent * > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
+  const QEvent *arg2 = args ? gsi::arg_reader<const QEvent * >() (args, heap) : gsi::arg_maker<const QEvent * >() (0, heap);
   ret.write<QFlags<QItemSelectionModel::SelectionFlag> > ((QFlags<QItemSelectionModel::SelectionFlag>)((QColumnView_Adaptor *)cls)->cbs_selectionCommand_c4199_1 (arg1, arg2));
 }
 
@@ -4059,7 +4059,7 @@ static void _call_cbs_setModel_2419_0 (const qt_gsi::GenericMethod * /*decl*/, v
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QAbstractItemModel *arg1 = args.read<QAbstractItemModel * > (heap);
+  QAbstractItemModel *arg1 = gsi::arg_reader<QAbstractItemModel * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColumnView_Adaptor *)cls)->cbs_setModel_2419_0 (arg1);
 }
@@ -4083,7 +4083,7 @@ static void _call_cbs_setRootIndex_2395_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColumnView_Adaptor *)cls)->cbs_setRootIndex_2395_0 (arg1);
 }
@@ -4109,8 +4109,8 @@ static void _call_cbs_setSelection_6155_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QRect &arg1 = args.read<const QRect & > (heap);
-  QFlags<QItemSelectionModel::SelectionFlag> arg2 = args.read<QFlags<QItemSelectionModel::SelectionFlag> > (heap);
+  const QRect &arg1 = gsi::arg_reader<const QRect & >() (args, heap);
+  QFlags<QItemSelectionModel::SelectionFlag> arg2 = gsi::arg_reader<QFlags<QItemSelectionModel::SelectionFlag> >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColumnView_Adaptor *)cls)->cbs_setSelection_6155_0 (arg1, arg2);
 }
@@ -4134,7 +4134,7 @@ static void _call_cbs_setSelectionModel_2533_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QItemSelectionModel *arg1 = args.read<QItemSelectionModel * > (heap);
+  QItemSelectionModel *arg1 = gsi::arg_reader<QItemSelectionModel * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColumnView_Adaptor *)cls)->cbs_setSelectionModel_2533_0 (arg1);
 }
@@ -4243,7 +4243,7 @@ static void _call_cbs_setVisible_864_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColumnView_Adaptor *)cls)->cbs_setVisible_864_0 (arg1);
 }
@@ -4286,7 +4286,7 @@ static void _call_cbs_showEvent_1634_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QShowEvent *arg1 = args.read<QShowEvent * > (heap);
+  QShowEvent *arg1 = gsi::arg_reader<QShowEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColumnView_Adaptor *)cls)->cbs_showEvent_1634_0 (arg1);
 }
@@ -4329,7 +4329,7 @@ static void _call_cbs_sizeHintForColumn_c767_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   ret.write<int > ((int)((QColumnView_Adaptor *)cls)->cbs_sizeHintForColumn_c767_0 (arg1));
 }
 
@@ -4352,7 +4352,7 @@ static void _call_cbs_sizeHintForRow_c767_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   ret.write<int > ((int)((QColumnView_Adaptor *)cls)->cbs_sizeHintForRow_c767_0 (arg1));
 }
 
@@ -4390,7 +4390,7 @@ static void _call_cbs_startDrag_2456_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFlags<Qt::DropAction> arg1 = args.read<QFlags<Qt::DropAction> > (heap);
+  QFlags<Qt::DropAction> arg1 = gsi::arg_reader<QFlags<Qt::DropAction> >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColumnView_Adaptor *)cls)->cbs_startDrag_2456_0 (arg1);
 }
@@ -4443,7 +4443,7 @@ static void _call_cbs_styleChange_1228_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QStyle &arg1 = args.read<QStyle & > (heap);
+  QStyle &arg1 = gsi::arg_reader<QStyle & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColumnView_Adaptor *)cls)->cbs_styleChange_1228_0 (arg1);
 }
@@ -4467,7 +4467,7 @@ static void _call_cbs_tabletEvent_1821_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTabletEvent *arg1 = args.read<QTabletEvent * > (heap);
+  QTabletEvent *arg1 = gsi::arg_reader<QTabletEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColumnView_Adaptor *)cls)->cbs_tabletEvent_1821_0 (arg1);
 }
@@ -4491,7 +4491,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColumnView_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }
@@ -4627,7 +4627,7 @@ static void _call_cbs_verticalScrollbarAction_767_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColumnView_Adaptor *)cls)->cbs_verticalScrollbarAction_767_0 (arg1);
 }
@@ -4651,7 +4651,7 @@ static void _call_cbs_verticalScrollbarValueChanged_767_0 (const qt_gsi::Generic
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColumnView_Adaptor *)cls)->cbs_verticalScrollbarValueChanged_767_0 (arg1);
 }
@@ -4722,7 +4722,7 @@ static void _call_cbs_viewportEvent_1217_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QColumnView_Adaptor *)cls)->cbs_viewportEvent_1217_0 (arg1));
 }
 
@@ -4745,7 +4745,7 @@ static void _call_cbs_visualRect_c2395_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
   ret.write<QRect > ((QRect)((QColumnView_Adaptor *)cls)->cbs_visualRect_c2395_0 (arg1));
 }
 
@@ -4768,7 +4768,7 @@ static void _call_cbs_visualRegionForSelection_c2727_0 (const qt_gsi::GenericMet
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QItemSelection &arg1 = args.read<const QItemSelection & > (heap);
+  const QItemSelection &arg1 = gsi::arg_reader<const QItemSelection & >() (args, heap);
   ret.write<QRegion > ((QRegion)((QColumnView_Adaptor *)cls)->cbs_visualRegionForSelection_c2727_0 (arg1));
 }
 
@@ -4791,7 +4791,7 @@ static void _call_cbs_wheelEvent_1718_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QWheelEvent *arg1 = args.read<QWheelEvent * > (heap);
+  QWheelEvent *arg1 = gsi::arg_reader<QWheelEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColumnView_Adaptor *)cls)->cbs_wheelEvent_1718_0 (arg1);
 }
@@ -4815,7 +4815,7 @@ static void _call_cbs_windowActivationChange_864_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QColumnView_Adaptor *)cls)->cbs_windowActivationChange_864_0 (arg1);
 }

src/gsiqt/qt4/QtGui/gsiDeclQComboBox.cc

@@ -2446,7 +2446,7 @@ static void _call_cbs_actionEvent_1823_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QActionEvent *arg1 = args.read<QActionEvent * > (heap);
+  QActionEvent *arg1 = gsi::arg_reader<QActionEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QComboBox_Adaptor *)cls)->cbs_actionEvent_1823_0 (arg1);
 }
@@ -2506,7 +2506,7 @@ static void _call_cbs_changeEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QComboBox_Adaptor *)cls)->cbs_changeEvent_1217_0 (arg1);
 }
@@ -2530,7 +2530,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QComboBox_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -2554,7 +2554,7 @@ static void _call_cbs_closeEvent_1719_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QCloseEvent *arg1 = args.read<QCloseEvent * > (heap);
+  QCloseEvent *arg1 = gsi::arg_reader<QCloseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QComboBox_Adaptor *)cls)->cbs_closeEvent_1719_0 (arg1);
 }
@@ -2578,7 +2578,7 @@ static void _call_cbs_contextMenuEvent_2363_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QContextMenuEvent *arg1 = args.read<QContextMenuEvent * > (heap);
+  QContextMenuEvent *arg1 = gsi::arg_reader<QContextMenuEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QComboBox_Adaptor *)cls)->cbs_contextMenuEvent_2363_0 (arg1);
 }
@@ -2681,7 +2681,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QComboBox_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -2745,7 +2745,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QComboBox_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -2769,7 +2769,7 @@ static void _call_cbs_dragEnterEvent_2109_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragEnterEvent *arg1 = args.read<QDragEnterEvent * > (heap);
+  QDragEnterEvent *arg1 = gsi::arg_reader<QDragEnterEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QComboBox_Adaptor *)cls)->cbs_dragEnterEvent_2109_0 (arg1);
 }
@@ -2793,7 +2793,7 @@ static void _call_cbs_dragLeaveEvent_2092_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragLeaveEvent *arg1 = args.read<QDragLeaveEvent * > (heap);
+  QDragLeaveEvent *arg1 = gsi::arg_reader<QDragLeaveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QComboBox_Adaptor *)cls)->cbs_dragLeaveEvent_2092_0 (arg1);
 }
@@ -2817,7 +2817,7 @@ static void _call_cbs_dragMoveEvent_2006_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragMoveEvent *arg1 = args.read<QDragMoveEvent * > (heap);
+  QDragMoveEvent *arg1 = gsi::arg_reader<QDragMoveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QComboBox_Adaptor *)cls)->cbs_dragMoveEvent_2006_0 (arg1);
 }
@@ -2841,7 +2841,7 @@ static void _call_cbs_dropEvent_1622_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDropEvent *arg1 = args.read<QDropEvent * > (heap);
+  QDropEvent *arg1 = gsi::arg_reader<QDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QComboBox_Adaptor *)cls)->cbs_dropEvent_1622_0 (arg1);
 }
@@ -2883,7 +2883,7 @@ static void _call_cbs_enabledChange_864_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QComboBox_Adaptor *)cls)->cbs_enabledChange_864_0 (arg1);
 }
@@ -2907,7 +2907,7 @@ static void _call_cbs_enterEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QComboBox_Adaptor *)cls)->cbs_enterEvent_1217_0 (arg1);
 }
@@ -2931,7 +2931,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QComboBox_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -2956,8 +2956,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QComboBox_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -2980,7 +2980,7 @@ static void _call_cbs_focusInEvent_1729_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QComboBox_Adaptor *)cls)->cbs_focusInEvent_1729_0 (arg1);
 }
@@ -3018,7 +3018,7 @@ static void _call_cbs_focusNextPrevChild_864_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   ret.write<bool > ((bool)((QComboBox_Adaptor *)cls)->cbs_focusNextPrevChild_864_0 (arg1));
 }
 
@@ -3041,7 +3041,7 @@ static void _call_cbs_focusOutEvent_1729_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QComboBox_Adaptor *)cls)->cbs_focusOutEvent_1729_0 (arg1);
 }
@@ -3079,7 +3079,7 @@ static void _call_cbs_fontChange_1801_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QFont &arg1 = args.read<const QFont & > (heap);
+  const QFont &arg1 = gsi::arg_reader<const QFont & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QComboBox_Adaptor *)cls)->cbs_fontChange_1801_0 (arg1);
 }
@@ -3103,7 +3103,7 @@ static void _call_cbs_heightForWidth_c767_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   ret.write<int > ((int)((QComboBox_Adaptor *)cls)->cbs_heightForWidth_c767_0 (arg1));
 }
 
@@ -3126,7 +3126,7 @@ static void _call_cbs_hideEvent_1595_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QHideEvent *arg1 = args.read<QHideEvent * > (heap);
+  QHideEvent *arg1 = gsi::arg_reader<QHideEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QComboBox_Adaptor *)cls)->cbs_hideEvent_1595_0 (arg1);
 }
@@ -3225,7 +3225,7 @@ static void _call_cbs_inputMethodEvent_2354_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QInputMethodEvent *arg1 = args.read<QInputMethodEvent * > (heap);
+  QInputMethodEvent *arg1 = gsi::arg_reader<QInputMethodEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QComboBox_Adaptor *)cls)->cbs_inputMethodEvent_2354_0 (arg1);
 }
@@ -3249,7 +3249,7 @@ static void _call_cbs_inputMethodQuery_c2420_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = args.read<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & > (heap);
+  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & >() (args, heap);
   ret.write<QVariant > ((QVariant)((QComboBox_Adaptor *)cls)->cbs_inputMethodQuery_c2420_0 (arg1));
 }
 
@@ -3272,7 +3272,7 @@ static void _call_cbs_keyPressEvent_1514_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QComboBox_Adaptor *)cls)->cbs_keyPressEvent_1514_0 (arg1);
 }
@@ -3296,7 +3296,7 @@ static void _call_cbs_keyReleaseEvent_1514_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QComboBox_Adaptor *)cls)->cbs_keyReleaseEvent_1514_0 (arg1);
 }
@@ -3340,7 +3340,7 @@ static void _call_cbs_leaveEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QComboBox_Adaptor *)cls)->cbs_leaveEvent_1217_0 (arg1);
 }
@@ -3364,7 +3364,7 @@ static void _call_cbs_metric_c3445_0 (const qt_gsi::GenericMethod * /*decl*/, vo
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & arg1 = args.read<const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & > (heap);
+  const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & >() (args, heap);
   ret.write<int > ((int)((QComboBox_Adaptor *)cls)->cbs_metric_c3445_0 (arg1));
 }
 
@@ -3406,7 +3406,7 @@ static void _call_cbs_mouseDoubleClickEvent_1738_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QComboBox_Adaptor *)cls)->cbs_mouseDoubleClickEvent_1738_0 (arg1);
 }
@@ -3430,7 +3430,7 @@ static void _call_cbs_mouseMoveEvent_1738_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QComboBox_Adaptor *)cls)->cbs_mouseMoveEvent_1738_0 (arg1);
 }
@@ -3454,7 +3454,7 @@ static void _call_cbs_mousePressEvent_1738_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QComboBox_Adaptor *)cls)->cbs_mousePressEvent_1738_0 (arg1);
 }
@@ -3478,7 +3478,7 @@ static void _call_cbs_mouseReleaseEvent_1738_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QComboBox_Adaptor *)cls)->cbs_mouseReleaseEvent_1738_0 (arg1);
 }
@@ -3502,7 +3502,7 @@ static void _call_cbs_moveEvent_1624_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMoveEvent *arg1 = args.read<QMoveEvent * > (heap);
+  QMoveEvent *arg1 = gsi::arg_reader<QMoveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QComboBox_Adaptor *)cls)->cbs_moveEvent_1624_0 (arg1);
 }
@@ -3545,7 +3545,7 @@ static void _call_cbs_paintEvent_1725_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QPaintEvent *arg1 = args.read<QPaintEvent * > (heap);
+  QPaintEvent *arg1 = gsi::arg_reader<QPaintEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QComboBox_Adaptor *)cls)->cbs_paintEvent_1725_0 (arg1);
 }
@@ -3569,7 +3569,7 @@ static void _call_cbs_paletteChange_2113_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QPalette &arg1 = args.read<const QPalette & > (heap);
+  const QPalette &arg1 = gsi::arg_reader<const QPalette & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QComboBox_Adaptor *)cls)->cbs_paletteChange_2113_0 (arg1);
 }
@@ -3626,7 +3626,7 @@ static void _call_cbs_resizeEvent_1843_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QResizeEvent *arg1 = args.read<QResizeEvent * > (heap);
+  QResizeEvent *arg1 = gsi::arg_reader<QResizeEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QComboBox_Adaptor *)cls)->cbs_resizeEvent_1843_0 (arg1);
 }
@@ -3664,7 +3664,7 @@ static void _call_cbs_setVisible_864_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QComboBox_Adaptor *)cls)->cbs_setVisible_864_0 (arg1);
 }
@@ -3688,7 +3688,7 @@ static void _call_cbs_showEvent_1634_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QShowEvent *arg1 = args.read<QShowEvent * > (heap);
+  QShowEvent *arg1 = gsi::arg_reader<QShowEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QComboBox_Adaptor *)cls)->cbs_showEvent_1634_0 (arg1);
 }
@@ -3751,7 +3751,7 @@ static void _call_cbs_styleChange_1228_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QStyle &arg1 = args.read<QStyle & > (heap);
+  QStyle &arg1 = gsi::arg_reader<QStyle & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QComboBox_Adaptor *)cls)->cbs_styleChange_1228_0 (arg1);
 }
@@ -3775,7 +3775,7 @@ static void _call_cbs_tabletEvent_1821_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTabletEvent *arg1 = args.read<QTabletEvent * > (heap);
+  QTabletEvent *arg1 = gsi::arg_reader<QTabletEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QComboBox_Adaptor *)cls)->cbs_tabletEvent_1821_0 (arg1);
 }
@@ -3799,7 +3799,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QComboBox_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }
@@ -3838,7 +3838,7 @@ static void _call_cbs_wheelEvent_1718_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QWheelEvent *arg1 = args.read<QWheelEvent * > (heap);
+  QWheelEvent *arg1 = gsi::arg_reader<QWheelEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QComboBox_Adaptor *)cls)->cbs_wheelEvent_1718_0 (arg1);
 }
@@ -3862,7 +3862,7 @@ static void _call_cbs_windowActivationChange_864_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QComboBox_Adaptor *)cls)->cbs_windowActivationChange_864_0 (arg1);
 }

src/gsiqt/qt4/QtGui/gsiDeclQCommandLinkButton.cc

@@ -1247,7 +1247,7 @@ static void _call_cbs_actionEvent_1823_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QActionEvent *arg1 = args.read<QActionEvent * > (heap);
+  QActionEvent *arg1 = gsi::arg_reader<QActionEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCommandLinkButton_Adaptor *)cls)->cbs_actionEvent_1823_0 (arg1);
 }
@@ -1271,7 +1271,7 @@ static void _call_cbs_changeEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCommandLinkButton_Adaptor *)cls)->cbs_changeEvent_1217_0 (arg1);
 }
@@ -1315,7 +1315,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCommandLinkButton_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -1357,7 +1357,7 @@ static void _call_cbs_closeEvent_1719_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QCloseEvent *arg1 = args.read<QCloseEvent * > (heap);
+  QCloseEvent *arg1 = gsi::arg_reader<QCloseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCommandLinkButton_Adaptor *)cls)->cbs_closeEvent_1719_0 (arg1);
 }
@@ -1381,7 +1381,7 @@ static void _call_cbs_contextMenuEvent_2363_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QContextMenuEvent *arg1 = args.read<QContextMenuEvent * > (heap);
+  QContextMenuEvent *arg1 = gsi::arg_reader<QContextMenuEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCommandLinkButton_Adaptor *)cls)->cbs_contextMenuEvent_2363_0 (arg1);
 }
@@ -1448,7 +1448,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCommandLinkButton_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -1512,7 +1512,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCommandLinkButton_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -1536,7 +1536,7 @@ static void _call_cbs_dragEnterEvent_2109_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragEnterEvent *arg1 = args.read<QDragEnterEvent * > (heap);
+  QDragEnterEvent *arg1 = gsi::arg_reader<QDragEnterEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCommandLinkButton_Adaptor *)cls)->cbs_dragEnterEvent_2109_0 (arg1);
 }
@@ -1560,7 +1560,7 @@ static void _call_cbs_dragLeaveEvent_2092_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragLeaveEvent *arg1 = args.read<QDragLeaveEvent * > (heap);
+  QDragLeaveEvent *arg1 = gsi::arg_reader<QDragLeaveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCommandLinkButton_Adaptor *)cls)->cbs_dragLeaveEvent_2092_0 (arg1);
 }
@@ -1584,7 +1584,7 @@ static void _call_cbs_dragMoveEvent_2006_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragMoveEvent *arg1 = args.read<QDragMoveEvent * > (heap);
+  QDragMoveEvent *arg1 = gsi::arg_reader<QDragMoveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCommandLinkButton_Adaptor *)cls)->cbs_dragMoveEvent_2006_0 (arg1);
 }
@@ -1608,7 +1608,7 @@ static void _call_cbs_dropEvent_1622_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDropEvent *arg1 = args.read<QDropEvent * > (heap);
+  QDropEvent *arg1 = gsi::arg_reader<QDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCommandLinkButton_Adaptor *)cls)->cbs_dropEvent_1622_0 (arg1);
 }
@@ -1632,7 +1632,7 @@ static void _call_cbs_enabledChange_864_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCommandLinkButton_Adaptor *)cls)->cbs_enabledChange_864_0 (arg1);
 }
@@ -1656,7 +1656,7 @@ static void _call_cbs_enterEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCommandLinkButton_Adaptor *)cls)->cbs_enterEvent_1217_0 (arg1);
 }
@@ -1680,7 +1680,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QCommandLinkButton_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -1705,8 +1705,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QCommandLinkButton_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -1729,7 +1729,7 @@ static void _call_cbs_focusInEvent_1729_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCommandLinkButton_Adaptor *)cls)->cbs_focusInEvent_1729_0 (arg1);
 }
@@ -1767,7 +1767,7 @@ static void _call_cbs_focusNextPrevChild_864_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   ret.write<bool > ((bool)((QCommandLinkButton_Adaptor *)cls)->cbs_focusNextPrevChild_864_0 (arg1));
 }
 
@@ -1790,7 +1790,7 @@ static void _call_cbs_focusOutEvent_1729_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCommandLinkButton_Adaptor *)cls)->cbs_focusOutEvent_1729_0 (arg1);
 }
@@ -1828,7 +1828,7 @@ static void _call_cbs_fontChange_1801_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QFont &arg1 = args.read<const QFont & > (heap);
+  const QFont &arg1 = gsi::arg_reader<const QFont & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCommandLinkButton_Adaptor *)cls)->cbs_fontChange_1801_0 (arg1);
 }
@@ -1852,7 +1852,7 @@ static void _call_cbs_heightForWidth_c767_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   ret.write<int > ((int)((QCommandLinkButton_Adaptor *)cls)->cbs_heightForWidth_c767_0 (arg1));
 }
 
@@ -1875,7 +1875,7 @@ static void _call_cbs_hideEvent_1595_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QHideEvent *arg1 = args.read<QHideEvent * > (heap);
+  QHideEvent *arg1 = gsi::arg_reader<QHideEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCommandLinkButton_Adaptor *)cls)->cbs_hideEvent_1595_0 (arg1);
 }
@@ -1899,7 +1899,7 @@ static void _call_cbs_hitButton_c1916_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QPoint &arg1 = args.read<const QPoint & > (heap);
+  const QPoint &arg1 = gsi::arg_reader<const QPoint & >() (args, heap);
   ret.write<bool > ((bool)((QCommandLinkButton_Adaptor *)cls)->cbs_hitButton_c1916_0 (arg1));
 }
 
@@ -1941,7 +1941,7 @@ static void _call_cbs_inputMethodEvent_2354_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QInputMethodEvent *arg1 = args.read<QInputMethodEvent * > (heap);
+  QInputMethodEvent *arg1 = gsi::arg_reader<QInputMethodEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCommandLinkButton_Adaptor *)cls)->cbs_inputMethodEvent_2354_0 (arg1);
 }
@@ -1965,7 +1965,7 @@ static void _call_cbs_inputMethodQuery_c2420_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = args.read<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & > (heap);
+  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & >() (args, heap);
   ret.write<QVariant > ((QVariant)((QCommandLinkButton_Adaptor *)cls)->cbs_inputMethodQuery_c2420_0 (arg1));
 }
 
@@ -1988,7 +1988,7 @@ static void _call_cbs_keyPressEvent_1514_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCommandLinkButton_Adaptor *)cls)->cbs_keyPressEvent_1514_0 (arg1);
 }
@@ -2012,7 +2012,7 @@ static void _call_cbs_keyReleaseEvent_1514_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCommandLinkButton_Adaptor *)cls)->cbs_keyReleaseEvent_1514_0 (arg1);
 }
@@ -2056,7 +2056,7 @@ static void _call_cbs_leaveEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCommandLinkButton_Adaptor *)cls)->cbs_leaveEvent_1217_0 (arg1);
 }
@@ -2080,7 +2080,7 @@ static void _call_cbs_metric_c3445_0 (const qt_gsi::GenericMethod * /*decl*/, vo
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & arg1 = args.read<const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & > (heap);
+  const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & >() (args, heap);
   ret.write<int > ((int)((QCommandLinkButton_Adaptor *)cls)->cbs_metric_c3445_0 (arg1));
 }
 
@@ -2122,7 +2122,7 @@ static void _call_cbs_mouseDoubleClickEvent_1738_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCommandLinkButton_Adaptor *)cls)->cbs_mouseDoubleClickEvent_1738_0 (arg1);
 }
@@ -2146,7 +2146,7 @@ static void _call_cbs_mouseMoveEvent_1738_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCommandLinkButton_Adaptor *)cls)->cbs_mouseMoveEvent_1738_0 (arg1);
 }
@@ -2170,7 +2170,7 @@ static void _call_cbs_mousePressEvent_1738_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCommandLinkButton_Adaptor *)cls)->cbs_mousePressEvent_1738_0 (arg1);
 }
@@ -2194,7 +2194,7 @@ static void _call_cbs_mouseReleaseEvent_1738_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCommandLinkButton_Adaptor *)cls)->cbs_mouseReleaseEvent_1738_0 (arg1);
 }
@@ -2218,7 +2218,7 @@ static void _call_cbs_moveEvent_1624_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMoveEvent *arg1 = args.read<QMoveEvent * > (heap);
+  QMoveEvent *arg1 = gsi::arg_reader<QMoveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCommandLinkButton_Adaptor *)cls)->cbs_moveEvent_1624_0 (arg1);
 }
@@ -2281,7 +2281,7 @@ static void _call_cbs_paintEvent_1725_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QPaintEvent *arg1 = args.read<QPaintEvent * > (heap);
+  QPaintEvent *arg1 = gsi::arg_reader<QPaintEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCommandLinkButton_Adaptor *)cls)->cbs_paintEvent_1725_0 (arg1);
 }
@@ -2305,7 +2305,7 @@ static void _call_cbs_paletteChange_2113_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QPalette &arg1 = args.read<const QPalette & > (heap);
+  const QPalette &arg1 = gsi::arg_reader<const QPalette & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCommandLinkButton_Adaptor *)cls)->cbs_paletteChange_2113_0 (arg1);
 }
@@ -2390,7 +2390,7 @@ static void _call_cbs_resizeEvent_1843_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QResizeEvent *arg1 = args.read<QResizeEvent * > (heap);
+  QResizeEvent *arg1 = gsi::arg_reader<QResizeEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCommandLinkButton_Adaptor *)cls)->cbs_resizeEvent_1843_0 (arg1);
 }
@@ -2428,7 +2428,7 @@ static void _call_cbs_setVisible_864_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCommandLinkButton_Adaptor *)cls)->cbs_setVisible_864_0 (arg1);
 }
@@ -2452,7 +2452,7 @@ static void _call_cbs_showEvent_1634_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QShowEvent *arg1 = args.read<QShowEvent * > (heap);
+  QShowEvent *arg1 = gsi::arg_reader<QShowEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCommandLinkButton_Adaptor *)cls)->cbs_showEvent_1634_0 (arg1);
 }
@@ -2495,7 +2495,7 @@ static void _call_cbs_styleChange_1228_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QStyle &arg1 = args.read<QStyle & > (heap);
+  QStyle &arg1 = gsi::arg_reader<QStyle & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCommandLinkButton_Adaptor *)cls)->cbs_styleChange_1228_0 (arg1);
 }
@@ -2519,7 +2519,7 @@ static void _call_cbs_tabletEvent_1821_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTabletEvent *arg1 = args.read<QTabletEvent * > (heap);
+  QTabletEvent *arg1 = gsi::arg_reader<QTabletEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCommandLinkButton_Adaptor *)cls)->cbs_tabletEvent_1821_0 (arg1);
 }
@@ -2543,7 +2543,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCommandLinkButton_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }
@@ -2600,7 +2600,7 @@ static void _call_cbs_wheelEvent_1718_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QWheelEvent *arg1 = args.read<QWheelEvent * > (heap);
+  QWheelEvent *arg1 = gsi::arg_reader<QWheelEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCommandLinkButton_Adaptor *)cls)->cbs_wheelEvent_1718_0 (arg1);
 }
@@ -2624,7 +2624,7 @@ static void _call_cbs_windowActivationChange_864_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCommandLinkButton_Adaptor *)cls)->cbs_windowActivationChange_864_0 (arg1);
 }

src/gsiqt/qt4/QtGui/gsiDeclQCommonStyle.cc

@@ -1102,7 +1102,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCommonStyle_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -1126,7 +1126,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCommonStyle_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -1168,7 +1168,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCommonStyle_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -1198,10 +1198,10 @@ static void _call_cbs_drawComplexControl_c9027_1 (const qt_gsi::GenericMethod *
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QStyle::ComplexControl>::target_type & arg1 = args.read<const qt_gsi::Converter<QStyle::ComplexControl>::target_type & > (heap);
-  const QStyleOptionComplex *arg2 = args.read<const QStyleOptionComplex * > (heap);
-  QPainter *arg3 = args.read<QPainter * > (heap);
-  const QWidget *arg4 = args.read<const QWidget * > (heap);
+  const qt_gsi::Converter<QStyle::ComplexControl>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QStyle::ComplexControl>::target_type & >() (args, heap);
+  const QStyleOptionComplex *arg2 = gsi::arg_reader<const QStyleOptionComplex * >() (args, heap);
+  QPainter *arg3 = gsi::arg_reader<QPainter * >() (args, heap);
+  const QWidget *arg4 = args ? gsi::arg_reader<const QWidget * >() (args, heap) : gsi::arg_maker<const QWidget * >() (0, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCommonStyle_Adaptor *)cls)->cbs_drawComplexControl_c9027_1 (arg1, arg2, arg3, arg4);
 }
@@ -1231,10 +1231,10 @@ static void _call_cbs_drawControl_c8285_1 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QStyle::ControlElement>::target_type & arg1 = args.read<const qt_gsi::Converter<QStyle::ControlElement>::target_type & > (heap);
-  const QStyleOption *arg2 = args.read<const QStyleOption * > (heap);
-  QPainter *arg3 = args.read<QPainter * > (heap);
-  const QWidget *arg4 = args.read<const QWidget * > (heap);
+  const qt_gsi::Converter<QStyle::ControlElement>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QStyle::ControlElement>::target_type & >() (args, heap);
+  const QStyleOption *arg2 = gsi::arg_reader<const QStyleOption * >() (args, heap);
+  QPainter *arg3 = gsi::arg_reader<QPainter * >() (args, heap);
+  const QWidget *arg4 = args ? gsi::arg_reader<const QWidget * >() (args, heap) : gsi::arg_maker<const QWidget * >() (0, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCommonStyle_Adaptor *)cls)->cbs_drawControl_c8285_1 (arg1, arg2, arg3, arg4);
 }
@@ -1264,10 +1264,10 @@ static void _call_cbs_drawItemPixmap_c5678_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QPainter *arg1 = args.read<QPainter * > (heap);
-  const QRect &arg2 = args.read<const QRect & > (heap);
-  int arg3 = args.read<int > (heap);
-  const QPixmap &arg4 = args.read<const QPixmap & > (heap);
+  QPainter *arg1 = gsi::arg_reader<QPainter * >() (args, heap);
+  const QRect &arg2 = gsi::arg_reader<const QRect & >() (args, heap);
+  int arg3 = gsi::arg_reader<int >() (args, heap);
+  const QPixmap &arg4 = gsi::arg_reader<const QPixmap & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCommonStyle_Adaptor *)cls)->cbs_drawItemPixmap_c5678_0 (arg1, arg2, arg3, arg4);
 }
@@ -1303,13 +1303,13 @@ static void _call_cbs_drawItemText_c10604_1 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QPainter *arg1 = args.read<QPainter * > (heap);
-  const QRect &arg2 = args.read<const QRect & > (heap);
-  int arg3 = args.read<int > (heap);
-  const QPalette &arg4 = args.read<const QPalette & > (heap);
-  bool arg5 = args.read<bool > (heap);
-  const QString &arg6 = args.read<const QString & > (heap);
-  const qt_gsi::Converter<QPalette::ColorRole>::target_type & arg7 = args.read<const qt_gsi::Converter<QPalette::ColorRole>::target_type & > (heap);
+  QPainter *arg1 = gsi::arg_reader<QPainter * >() (args, heap);
+  const QRect &arg2 = gsi::arg_reader<const QRect & >() (args, heap);
+  int arg3 = gsi::arg_reader<int >() (args, heap);
+  const QPalette &arg4 = gsi::arg_reader<const QPalette & >() (args, heap);
+  bool arg5 = gsi::arg_reader<bool >() (args, heap);
+  const QString &arg6 = gsi::arg_reader<const QString & >() (args, heap);
+  const qt_gsi::Converter<QPalette::ColorRole>::target_type & arg7 = args ? gsi::arg_reader<const qt_gsi::Converter<QPalette::ColorRole>::target_type & >() (args, heap) : gsi::arg_maker<const qt_gsi::Converter<QPalette::ColorRole>::target_type & >() (qt_gsi::CppToQtReadAdaptor<QPalette::ColorRole>(heap, QPalette::NoRole), heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCommonStyle_Adaptor *)cls)->cbs_drawItemText_c10604_1 (arg1, arg2, arg3, arg4, arg5, arg6, arg7);
 }
@@ -1339,10 +1339,10 @@ static void _call_cbs_drawPrimitive_c8501_1 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QStyle::PrimitiveElement>::target_type & arg1 = args.read<const qt_gsi::Converter<QStyle::PrimitiveElement>::target_type & > (heap);
-  const QStyleOption *arg2 = args.read<const QStyleOption * > (heap);
-  QPainter *arg3 = args.read<QPainter * > (heap);
-  const QWidget *arg4 = args.read<const QWidget * > (heap);
+  const qt_gsi::Converter<QStyle::PrimitiveElement>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QStyle::PrimitiveElement>::target_type & >() (args, heap);
+  const QStyleOption *arg2 = gsi::arg_reader<const QStyleOption * >() (args, heap);
+  QPainter *arg3 = gsi::arg_reader<QPainter * >() (args, heap);
+  const QWidget *arg4 = args ? gsi::arg_reader<const QWidget * >() (args, heap) : gsi::arg_maker<const QWidget * >() (0, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCommonStyle_Adaptor *)cls)->cbs_drawPrimitive_c8501_1 (arg1, arg2, arg3, arg4);
 }
@@ -1366,7 +1366,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QCommonStyle_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -1391,8 +1391,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QCommonStyle_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -1419,9 +1419,9 @@ static void _call_cbs_generatedIconPixmap_c5776_0 (const qt_gsi::GenericMethod *
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QIcon::Mode>::target_type & arg1 = args.read<const qt_gsi::Converter<QIcon::Mode>::target_type & > (heap);
-  const QPixmap &arg2 = args.read<const QPixmap & > (heap);
-  const QStyleOption *arg3 = args.read<const QStyleOption * > (heap);
+  const qt_gsi::Converter<QIcon::Mode>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QIcon::Mode>::target_type & >() (args, heap);
+  const QPixmap &arg2 = gsi::arg_reader<const QPixmap & >() (args, heap);
+  const QStyleOption *arg3 = gsi::arg_reader<const QStyleOption * >() (args, heap);
   ret.write<QPixmap > ((QPixmap)((QCommonStyle_Adaptor *)cls)->cbs_generatedIconPixmap_c5776_0 (arg1, arg2, arg3));
 }
 
@@ -1450,10 +1450,10 @@ static void _call_cbs_hitTestComplexControl_c9517_1 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QStyle::ComplexControl>::target_type & arg1 = args.read<const qt_gsi::Converter<QStyle::ComplexControl>::target_type & > (heap);
-  const QStyleOptionComplex *arg2 = args.read<const QStyleOptionComplex * > (heap);
-  const QPoint &arg3 = args.read<const QPoint & > (heap);
-  const QWidget *arg4 = args.read<const QWidget * > (heap);
+  const qt_gsi::Converter<QStyle::ComplexControl>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QStyle::ComplexControl>::target_type & >() (args, heap);
+  const QStyleOptionComplex *arg2 = gsi::arg_reader<const QStyleOptionComplex * >() (args, heap);
+  const QPoint &arg3 = gsi::arg_reader<const QPoint & >() (args, heap);
+  const QWidget *arg4 = args ? gsi::arg_reader<const QWidget * >() (args, heap) : gsi::arg_maker<const QWidget * >() (0, heap);
   ret.write<qt_gsi::Converter<QStyle::SubControl>::target_type > ((qt_gsi::Converter<QStyle::SubControl>::target_type)((QCommonStyle_Adaptor *)cls)->cbs_hitTestComplexControl_c9517_1 (arg1, arg2, arg3, arg4));
 }
 
@@ -1480,9 +1480,9 @@ static void _call_cbs_itemPixmapRect_c4360_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QRect &arg1 = args.read<const QRect & > (heap);
-  int arg2 = args.read<int > (heap);
-  const QPixmap &arg3 = args.read<const QPixmap & > (heap);
+  const QRect &arg1 = gsi::arg_reader<const QRect & >() (args, heap);
+  int arg2 = gsi::arg_reader<int >() (args, heap);
+  const QPixmap &arg3 = gsi::arg_reader<const QPixmap & >() (args, heap);
   ret.write<QRect > ((QRect)((QCommonStyle_Adaptor *)cls)->cbs_itemPixmapRect_c4360_0 (arg1, arg2, arg3));
 }
 
@@ -1513,11 +1513,11 @@ static void _call_cbs_itemTextRect_c7544_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QFontMetrics &arg1 = args.read<const QFontMetrics & > (heap);
-  const QRect &arg2 = args.read<const QRect & > (heap);
-  int arg3 = args.read<int > (heap);
-  bool arg4 = args.read<bool > (heap);
-  const QString &arg5 = args.read<const QString & > (heap);
+  const QFontMetrics &arg1 = gsi::arg_reader<const QFontMetrics & >() (args, heap);
+  const QRect &arg2 = gsi::arg_reader<const QRect & >() (args, heap);
+  int arg3 = gsi::arg_reader<int >() (args, heap);
+  bool arg4 = gsi::arg_reader<bool >() (args, heap);
+  const QString &arg5 = gsi::arg_reader<const QString & >() (args, heap);
   ret.write<QRect > ((QRect)((QCommonStyle_Adaptor *)cls)->cbs_itemTextRect_c7544_0 (arg1, arg2, arg3, arg4, arg5));
 }
 
@@ -1574,9 +1574,9 @@ static void _call_cbs_pixelMetric_c6642_2 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QStyle::PixelMetric>::target_type & arg1 = args.read<const qt_gsi::Converter<QStyle::PixelMetric>::target_type & > (heap);
-  const QStyleOption *arg2 = args.read<const QStyleOption * > (heap);
-  const QWidget *arg3 = args.read<const QWidget * > (heap);
+  const qt_gsi::Converter<QStyle::PixelMetric>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QStyle::PixelMetric>::target_type & >() (args, heap);
+  const QStyleOption *arg2 = args ? gsi::arg_reader<const QStyleOption * >() (args, heap) : gsi::arg_maker<const QStyleOption * >() (0, heap);
+  const QWidget *arg3 = args ? gsi::arg_reader<const QWidget * >() (args, heap) : gsi::arg_maker<const QWidget * >() (0, heap);
   ret.write<int > ((int)((QCommonStyle_Adaptor *)cls)->cbs_pixelMetric_c6642_2 (arg1, arg2, arg3));
 }
 
@@ -1599,7 +1599,7 @@ static void _call_cbs_polish_1418_0 (const qt_gsi::GenericMethod * /*decl*/, voi
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QPalette &arg1 = args.read<QPalette & > (heap);
+  QPalette &arg1 = gsi::arg_reader<QPalette & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCommonStyle_Adaptor *)cls)->cbs_polish_1418_0 (arg1);
 }
@@ -1623,7 +1623,7 @@ static void _call_cbs_polish_1843_0 (const qt_gsi::GenericMethod * /*decl*/, voi
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QApplication *arg1 = args.read<QApplication * > (heap);
+  QApplication *arg1 = gsi::arg_reader<QApplication * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCommonStyle_Adaptor *)cls)->cbs_polish_1843_0 (arg1);
 }
@@ -1647,7 +1647,7 @@ static void _call_cbs_polish_1315_0 (const qt_gsi::GenericMethod * /*decl*/, voi
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QWidget *arg1 = args.read<QWidget * > (heap);
+  QWidget *arg1 = gsi::arg_reader<QWidget * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCommonStyle_Adaptor *)cls)->cbs_polish_1315_0 (arg1);
 }
@@ -1709,10 +1709,10 @@ static void _call_cbs_sizeFromContents_c8477_1 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QStyle::ContentsType>::target_type & arg1 = args.read<const qt_gsi::Converter<QStyle::ContentsType>::target_type & > (heap);
-  const QStyleOption *arg2 = args.read<const QStyleOption * > (heap);
-  const QSize &arg3 = args.read<const QSize & > (heap);
-  const QWidget *arg4 = args.read<const QWidget * > (heap);
+  const qt_gsi::Converter<QStyle::ContentsType>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QStyle::ContentsType>::target_type & >() (args, heap);
+  const QStyleOption *arg2 = gsi::arg_reader<const QStyleOption * >() (args, heap);
+  const QSize &arg3 = gsi::arg_reader<const QSize & >() (args, heap);
+  const QWidget *arg4 = args ? gsi::arg_reader<const QWidget * >() (args, heap) : gsi::arg_maker<const QWidget * >() (0, heap);
   ret.write<QSize > ((QSize)((QCommonStyle_Adaptor *)cls)->cbs_sizeFromContents_c8477_1 (arg1, arg2, arg3, arg4));
 }
 
@@ -1782,9 +1782,9 @@ static void _call_cbs_standardPixmap_c6956_2 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QStyle::StandardPixmap>::target_type & arg1 = args.read<const qt_gsi::Converter<QStyle::StandardPixmap>::target_type & > (heap);
-  const QStyleOption *arg2 = args.read<const QStyleOption * > (heap);
-  const QWidget *arg3 = args.read<const QWidget * > (heap);
+  const qt_gsi::Converter<QStyle::StandardPixmap>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QStyle::StandardPixmap>::target_type & >() (args, heap);
+  const QStyleOption *arg2 = args ? gsi::arg_reader<const QStyleOption * >() (args, heap) : gsi::arg_maker<const QStyleOption * >() (0, heap);
+  const QWidget *arg3 = args ? gsi::arg_reader<const QWidget * >() (args, heap) : gsi::arg_maker<const QWidget * >() (0, heap);
   ret.write<QPixmap > ((QPixmap)((QCommonStyle_Adaptor *)cls)->cbs_standardPixmap_c6956_2 (arg1, arg2, arg3));
 }
 
@@ -1813,10 +1813,10 @@ static void _call_cbs_styleHint_c8615_3 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QStyle::StyleHint>::target_type & arg1 = args.read<const qt_gsi::Converter<QStyle::StyleHint>::target_type & > (heap);
-  const QStyleOption *arg2 = args.read<const QStyleOption * > (heap);
-  const QWidget *arg3 = args.read<const QWidget * > (heap);
-  QStyleHintReturn *arg4 = args.read<QStyleHintReturn * > (heap);
+  const qt_gsi::Converter<QStyle::StyleHint>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QStyle::StyleHint>::target_type & >() (args, heap);
+  const QStyleOption *arg2 = args ? gsi::arg_reader<const QStyleOption * >() (args, heap) : gsi::arg_maker<const QStyleOption * >() (0, heap);
+  const QWidget *arg3 = args ? gsi::arg_reader<const QWidget * >() (args, heap) : gsi::arg_maker<const QWidget * >() (0, heap);
+  QStyleHintReturn *arg4 = args ? gsi::arg_reader<QStyleHintReturn * >() (args, heap) : gsi::arg_maker<QStyleHintReturn * >() (0, heap);
   ret.write<int > ((int)((QCommonStyle_Adaptor *)cls)->cbs_styleHint_c8615_3 (arg1, arg2, arg3, arg4));
 }
 
@@ -1845,10 +1845,10 @@ static void _call_cbs_subControlRect_c9798_1 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QStyle::ComplexControl>::target_type & arg1 = args.read<const qt_gsi::Converter<QStyle::ComplexControl>::target_type & > (heap);
-  const QStyleOptionComplex *arg2 = args.read<const QStyleOptionComplex * > (heap);
-  const qt_gsi::Converter<QStyle::SubControl>::target_type & arg3 = args.read<const qt_gsi::Converter<QStyle::SubControl>::target_type & > (heap);
-  const QWidget *arg4 = args.read<const QWidget * > (heap);
+  const qt_gsi::Converter<QStyle::ComplexControl>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QStyle::ComplexControl>::target_type & >() (args, heap);
+  const QStyleOptionComplex *arg2 = gsi::arg_reader<const QStyleOptionComplex * >() (args, heap);
+  const qt_gsi::Converter<QStyle::SubControl>::target_type & arg3 = gsi::arg_reader<const qt_gsi::Converter<QStyle::SubControl>::target_type & >() (args, heap);
+  const QWidget *arg4 = args ? gsi::arg_reader<const QWidget * >() (args, heap) : gsi::arg_maker<const QWidget * >() (0, heap);
   ret.write<QRect > ((QRect)((QCommonStyle_Adaptor *)cls)->cbs_subControlRect_c9798_1 (arg1, arg2, arg3, arg4));
 }
 
@@ -1875,9 +1875,9 @@ static void _call_cbs_subElementRect_c6528_1 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QStyle::SubElement>::target_type & arg1 = args.read<const qt_gsi::Converter<QStyle::SubElement>::target_type & > (heap);
-  const QStyleOption *arg2 = args.read<const QStyleOption * > (heap);
-  const QWidget *arg3 = args.read<const QWidget * > (heap);
+  const qt_gsi::Converter<QStyle::SubElement>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QStyle::SubElement>::target_type & >() (args, heap);
+  const QStyleOption *arg2 = gsi::arg_reader<const QStyleOption * >() (args, heap);
+  const QWidget *arg3 = args ? gsi::arg_reader<const QWidget * >() (args, heap) : gsi::arg_maker<const QWidget * >() (0, heap);
   ret.write<QRect > ((QRect)((QCommonStyle_Adaptor *)cls)->cbs_subElementRect_c6528_1 (arg1, arg2, arg3));
 }
 
@@ -1900,7 +1900,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCommonStyle_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }
@@ -1924,7 +1924,7 @@ static void _call_cbs_unpolish_1315_0 (const qt_gsi::GenericMethod * /*decl*/, v
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QWidget *arg1 = args.read<QWidget * > (heap);
+  QWidget *arg1 = gsi::arg_reader<QWidget * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCommonStyle_Adaptor *)cls)->cbs_unpolish_1315_0 (arg1);
 }
@@ -1948,7 +1948,7 @@ static void _call_cbs_unpolish_1843_0 (const qt_gsi::GenericMethod * /*decl*/, v
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QApplication *arg1 = args.read<QApplication * > (heap);
+  QApplication *arg1 = gsi::arg_reader<QApplication * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCommonStyle_Adaptor *)cls)->cbs_unpolish_1843_0 (arg1);
 }

src/gsiqt/qt4/QtGui/gsiDeclQCompleter.cc

@@ -1072,7 +1072,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCompleter_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -1096,7 +1096,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCompleter_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -1138,7 +1138,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCompleter_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -1162,7 +1162,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QCompleter_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -1187,8 +1187,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QCompleter_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -1247,7 +1247,7 @@ static void _call_cbs_pathFromIndex_c2395_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
   ret.write<QString > ((QString)((QCompleter_Adaptor *)cls)->cbs_pathFromIndex_c2395_0 (arg1));
 }
 
@@ -1302,7 +1302,7 @@ static void _call_cbs_splitPath_c2025_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QString &arg1 = args.read<const QString & > (heap);
+  const QString &arg1 = gsi::arg_reader<const QString & >() (args, heap);
   ret.write<QStringList > ((QStringList)((QCompleter_Adaptor *)cls)->cbs_splitPath_c2025_0 (arg1));
 }
 
@@ -1325,7 +1325,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QCompleter_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }

src/gsiqt/qt4/QtGui/gsiDeclQDataWidgetMapper.cc

@@ -857,7 +857,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDataWidgetMapper_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -899,7 +899,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDataWidgetMapper_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -941,7 +941,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDataWidgetMapper_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -965,7 +965,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QDataWidgetMapper_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -990,8 +990,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QDataWidgetMapper_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -1046,7 +1046,7 @@ static void _call_cbs_setCurrentIndex_767_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDataWidgetMapper_Adaptor *)cls)->cbs_setCurrentIndex_767_0 (arg1);
 }
@@ -1070,7 +1070,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDataWidgetMapper_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }

src/gsiqt/qt4/QtGui/gsiDeclQDateEdit.cc

@@ -1251,7 +1251,7 @@ static void _call_cbs_actionEvent_1823_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QActionEvent *arg1 = args.read<QActionEvent * > (heap);
+  QActionEvent *arg1 = gsi::arg_reader<QActionEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateEdit_Adaptor *)cls)->cbs_actionEvent_1823_0 (arg1);
 }
@@ -1275,7 +1275,7 @@ static void _call_cbs_changeEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateEdit_Adaptor *)cls)->cbs_changeEvent_1217_0 (arg1);
 }
@@ -1299,7 +1299,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateEdit_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -1343,7 +1343,7 @@ static void _call_cbs_closeEvent_1719_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QCloseEvent *arg1 = args.read<QCloseEvent * > (heap);
+  QCloseEvent *arg1 = gsi::arg_reader<QCloseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateEdit_Adaptor *)cls)->cbs_closeEvent_1719_0 (arg1);
 }
@@ -1367,7 +1367,7 @@ static void _call_cbs_contextMenuEvent_2363_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QContextMenuEvent *arg1 = args.read<QContextMenuEvent * > (heap);
+  QContextMenuEvent *arg1 = gsi::arg_reader<QContextMenuEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateEdit_Adaptor *)cls)->cbs_contextMenuEvent_2363_0 (arg1);
 }
@@ -1434,7 +1434,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateEdit_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -1494,7 +1494,7 @@ static void _call_cbs_dateTimeFromText_c2025_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QString &arg1 = args.read<const QString & > (heap);
+  const QString &arg1 = gsi::arg_reader<const QString & >() (args, heap);
   ret.write<QDateTime > ((QDateTime)((QDateEdit_Adaptor *)cls)->cbs_dateTimeFromText_c2025_0 (arg1));
 }
 
@@ -1557,7 +1557,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateEdit_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -1581,7 +1581,7 @@ static void _call_cbs_dragEnterEvent_2109_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragEnterEvent *arg1 = args.read<QDragEnterEvent * > (heap);
+  QDragEnterEvent *arg1 = gsi::arg_reader<QDragEnterEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateEdit_Adaptor *)cls)->cbs_dragEnterEvent_2109_0 (arg1);
 }
@@ -1605,7 +1605,7 @@ static void _call_cbs_dragLeaveEvent_2092_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragLeaveEvent *arg1 = args.read<QDragLeaveEvent * > (heap);
+  QDragLeaveEvent *arg1 = gsi::arg_reader<QDragLeaveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateEdit_Adaptor *)cls)->cbs_dragLeaveEvent_2092_0 (arg1);
 }
@@ -1629,7 +1629,7 @@ static void _call_cbs_dragMoveEvent_2006_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragMoveEvent *arg1 = args.read<QDragMoveEvent * > (heap);
+  QDragMoveEvent *arg1 = gsi::arg_reader<QDragMoveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateEdit_Adaptor *)cls)->cbs_dragMoveEvent_2006_0 (arg1);
 }
@@ -1653,7 +1653,7 @@ static void _call_cbs_dropEvent_1622_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDropEvent *arg1 = args.read<QDropEvent * > (heap);
+  QDropEvent *arg1 = gsi::arg_reader<QDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateEdit_Adaptor *)cls)->cbs_dropEvent_1622_0 (arg1);
 }
@@ -1691,7 +1691,7 @@ static void _call_cbs_enabledChange_864_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateEdit_Adaptor *)cls)->cbs_enabledChange_864_0 (arg1);
 }
@@ -1715,7 +1715,7 @@ static void _call_cbs_enterEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateEdit_Adaptor *)cls)->cbs_enterEvent_1217_0 (arg1);
 }
@@ -1739,7 +1739,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QDateEdit_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -1764,8 +1764,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QDateEdit_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -1788,7 +1788,7 @@ static void _call_cbs_fixup_c1330_0 (const qt_gsi::GenericMethod * /*decl*/, voi
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QString &arg1 = args.read<QString & > (heap);
+  QString &arg1 = gsi::arg_reader<QString & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateEdit_Adaptor *)cls)->cbs_fixup_c1330_0 (arg1);
 }
@@ -1812,7 +1812,7 @@ static void _call_cbs_focusInEvent_1729_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateEdit_Adaptor *)cls)->cbs_focusInEvent_1729_0 (arg1);
 }
@@ -1850,7 +1850,7 @@ static void _call_cbs_focusNextPrevChild_864_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   ret.write<bool > ((bool)((QDateEdit_Adaptor *)cls)->cbs_focusNextPrevChild_864_0 (arg1));
 }
 
@@ -1873,7 +1873,7 @@ static void _call_cbs_focusOutEvent_1729_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateEdit_Adaptor *)cls)->cbs_focusOutEvent_1729_0 (arg1);
 }
@@ -1911,7 +1911,7 @@ static void _call_cbs_fontChange_1801_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QFont &arg1 = args.read<const QFont & > (heap);
+  const QFont &arg1 = gsi::arg_reader<const QFont & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateEdit_Adaptor *)cls)->cbs_fontChange_1801_0 (arg1);
 }
@@ -1935,7 +1935,7 @@ static void _call_cbs_heightForWidth_c767_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   ret.write<int > ((int)((QDateEdit_Adaptor *)cls)->cbs_heightForWidth_c767_0 (arg1));
 }
 
@@ -1958,7 +1958,7 @@ static void _call_cbs_hideEvent_1595_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QHideEvent *arg1 = args.read<QHideEvent * > (heap);
+  QHideEvent *arg1 = gsi::arg_reader<QHideEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateEdit_Adaptor *)cls)->cbs_hideEvent_1595_0 (arg1);
 }
@@ -2001,7 +2001,7 @@ static void _call_cbs_inputMethodEvent_2354_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QInputMethodEvent *arg1 = args.read<QInputMethodEvent * > (heap);
+  QInputMethodEvent *arg1 = gsi::arg_reader<QInputMethodEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateEdit_Adaptor *)cls)->cbs_inputMethodEvent_2354_0 (arg1);
 }
@@ -2025,7 +2025,7 @@ static void _call_cbs_inputMethodQuery_c2420_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = args.read<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & > (heap);
+  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & >() (args, heap);
   ret.write<QVariant > ((QVariant)((QDateEdit_Adaptor *)cls)->cbs_inputMethodQuery_c2420_0 (arg1));
 }
 
@@ -2048,7 +2048,7 @@ static void _call_cbs_keyPressEvent_1514_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateEdit_Adaptor *)cls)->cbs_keyPressEvent_1514_0 (arg1);
 }
@@ -2072,7 +2072,7 @@ static void _call_cbs_keyReleaseEvent_1514_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateEdit_Adaptor *)cls)->cbs_keyReleaseEvent_1514_0 (arg1);
 }
@@ -2116,7 +2116,7 @@ static void _call_cbs_leaveEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateEdit_Adaptor *)cls)->cbs_leaveEvent_1217_0 (arg1);
 }
@@ -2154,7 +2154,7 @@ static void _call_cbs_metric_c3445_0 (const qt_gsi::GenericMethod * /*decl*/, vo
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & arg1 = args.read<const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & > (heap);
+  const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & >() (args, heap);
   ret.write<int > ((int)((QDateEdit_Adaptor *)cls)->cbs_metric_c3445_0 (arg1));
 }
 
@@ -2196,7 +2196,7 @@ static void _call_cbs_mouseDoubleClickEvent_1738_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateEdit_Adaptor *)cls)->cbs_mouseDoubleClickEvent_1738_0 (arg1);
 }
@@ -2220,7 +2220,7 @@ static void _call_cbs_mouseMoveEvent_1738_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateEdit_Adaptor *)cls)->cbs_mouseMoveEvent_1738_0 (arg1);
 }
@@ -2244,7 +2244,7 @@ static void _call_cbs_mousePressEvent_1738_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateEdit_Adaptor *)cls)->cbs_mousePressEvent_1738_0 (arg1);
 }
@@ -2268,7 +2268,7 @@ static void _call_cbs_mouseReleaseEvent_1738_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateEdit_Adaptor *)cls)->cbs_mouseReleaseEvent_1738_0 (arg1);
 }
@@ -2292,7 +2292,7 @@ static void _call_cbs_moveEvent_1624_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMoveEvent *arg1 = args.read<QMoveEvent * > (heap);
+  QMoveEvent *arg1 = gsi::arg_reader<QMoveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateEdit_Adaptor *)cls)->cbs_moveEvent_1624_0 (arg1);
 }
@@ -2335,7 +2335,7 @@ static void _call_cbs_paintEvent_1725_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QPaintEvent *arg1 = args.read<QPaintEvent * > (heap);
+  QPaintEvent *arg1 = gsi::arg_reader<QPaintEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateEdit_Adaptor *)cls)->cbs_paintEvent_1725_0 (arg1);
 }
@@ -2359,7 +2359,7 @@ static void _call_cbs_paletteChange_2113_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QPalette &arg1 = args.read<const QPalette & > (heap);
+  const QPalette &arg1 = gsi::arg_reader<const QPalette & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateEdit_Adaptor *)cls)->cbs_paletteChange_2113_0 (arg1);
 }
@@ -2416,7 +2416,7 @@ static void _call_cbs_resizeEvent_1843_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QResizeEvent *arg1 = args.read<QResizeEvent * > (heap);
+  QResizeEvent *arg1 = gsi::arg_reader<QResizeEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateEdit_Adaptor *)cls)->cbs_resizeEvent_1843_0 (arg1);
 }
@@ -2473,7 +2473,7 @@ static void _call_cbs_setVisible_864_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateEdit_Adaptor *)cls)->cbs_setVisible_864_0 (arg1);
 }
@@ -2497,7 +2497,7 @@ static void _call_cbs_showEvent_1634_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QShowEvent *arg1 = args.read<QShowEvent * > (heap);
+  QShowEvent *arg1 = gsi::arg_reader<QShowEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateEdit_Adaptor *)cls)->cbs_showEvent_1634_0 (arg1);
 }
@@ -2540,7 +2540,7 @@ static void _call_cbs_stepBy_767_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateEdit_Adaptor *)cls)->cbs_stepBy_767_0 (arg1);
 }
@@ -2583,7 +2583,7 @@ static void _call_cbs_styleChange_1228_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QStyle &arg1 = args.read<QStyle & > (heap);
+  QStyle &arg1 = gsi::arg_reader<QStyle & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateEdit_Adaptor *)cls)->cbs_styleChange_1228_0 (arg1);
 }
@@ -2607,7 +2607,7 @@ static void _call_cbs_tabletEvent_1821_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTabletEvent *arg1 = args.read<QTabletEvent * > (heap);
+  QTabletEvent *arg1 = gsi::arg_reader<QTabletEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateEdit_Adaptor *)cls)->cbs_tabletEvent_1821_0 (arg1);
 }
@@ -2631,7 +2631,7 @@ static void _call_cbs_textFromDateTime_c2175_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QDateTime &arg1 = args.read<const QDateTime & > (heap);
+  const QDateTime &arg1 = gsi::arg_reader<const QDateTime & >() (args, heap);
   ret.write<QString > ((QString)((QDateEdit_Adaptor *)cls)->cbs_textFromDateTime_c2175_0 (arg1));
 }
 
@@ -2672,7 +2672,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateEdit_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }
@@ -2713,8 +2713,8 @@ static void _call_cbs_validate_c2171_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QString &arg1 = args.read<QString & > (heap);
-  int &arg2 = args.read<int & > (heap);
+  QString &arg1 = gsi::arg_reader<QString & >() (args, heap);
+  int &arg2 = gsi::arg_reader<int & >() (args, heap);
   ret.write<qt_gsi::Converter<QValidator::State>::target_type > ((qt_gsi::Converter<QValidator::State>::target_type)((QDateEdit_Adaptor *)cls)->cbs_validate_c2171_0 (arg1, arg2));
 }
 
@@ -2737,7 +2737,7 @@ static void _call_cbs_wheelEvent_1718_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QWheelEvent *arg1 = args.read<QWheelEvent * > (heap);
+  QWheelEvent *arg1 = gsi::arg_reader<QWheelEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateEdit_Adaptor *)cls)->cbs_wheelEvent_1718_0 (arg1);
 }
@@ -2761,7 +2761,7 @@ static void _call_cbs_windowActivationChange_864_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateEdit_Adaptor *)cls)->cbs_windowActivationChange_864_0 (arg1);
 }

src/gsiqt/qt4/QtGui/gsiDeclQDateTimeEdit.cc

@@ -2213,7 +2213,7 @@ static void _call_cbs_actionEvent_1823_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QActionEvent *arg1 = args.read<QActionEvent * > (heap);
+  QActionEvent *arg1 = gsi::arg_reader<QActionEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateTimeEdit_Adaptor *)cls)->cbs_actionEvent_1823_0 (arg1);
 }
@@ -2237,7 +2237,7 @@ static void _call_cbs_changeEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateTimeEdit_Adaptor *)cls)->cbs_changeEvent_1217_0 (arg1);
 }
@@ -2261,7 +2261,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateTimeEdit_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -2305,7 +2305,7 @@ static void _call_cbs_closeEvent_1719_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QCloseEvent *arg1 = args.read<QCloseEvent * > (heap);
+  QCloseEvent *arg1 = gsi::arg_reader<QCloseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateTimeEdit_Adaptor *)cls)->cbs_closeEvent_1719_0 (arg1);
 }
@@ -2329,7 +2329,7 @@ static void _call_cbs_contextMenuEvent_2363_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QContextMenuEvent *arg1 = args.read<QContextMenuEvent * > (heap);
+  QContextMenuEvent *arg1 = gsi::arg_reader<QContextMenuEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateTimeEdit_Adaptor *)cls)->cbs_contextMenuEvent_2363_0 (arg1);
 }
@@ -2396,7 +2396,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateTimeEdit_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -2456,7 +2456,7 @@ static void _call_cbs_dateTimeFromText_c2025_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QString &arg1 = args.read<const QString & > (heap);
+  const QString &arg1 = gsi::arg_reader<const QString & >() (args, heap);
   ret.write<QDateTime > ((QDateTime)((QDateTimeEdit_Adaptor *)cls)->cbs_dateTimeFromText_c2025_0 (arg1));
 }
 
@@ -2519,7 +2519,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateTimeEdit_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -2543,7 +2543,7 @@ static void _call_cbs_dragEnterEvent_2109_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragEnterEvent *arg1 = args.read<QDragEnterEvent * > (heap);
+  QDragEnterEvent *arg1 = gsi::arg_reader<QDragEnterEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateTimeEdit_Adaptor *)cls)->cbs_dragEnterEvent_2109_0 (arg1);
 }
@@ -2567,7 +2567,7 @@ static void _call_cbs_dragLeaveEvent_2092_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragLeaveEvent *arg1 = args.read<QDragLeaveEvent * > (heap);
+  QDragLeaveEvent *arg1 = gsi::arg_reader<QDragLeaveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateTimeEdit_Adaptor *)cls)->cbs_dragLeaveEvent_2092_0 (arg1);
 }
@@ -2591,7 +2591,7 @@ static void _call_cbs_dragMoveEvent_2006_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragMoveEvent *arg1 = args.read<QDragMoveEvent * > (heap);
+  QDragMoveEvent *arg1 = gsi::arg_reader<QDragMoveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateTimeEdit_Adaptor *)cls)->cbs_dragMoveEvent_2006_0 (arg1);
 }
@@ -2615,7 +2615,7 @@ static void _call_cbs_dropEvent_1622_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDropEvent *arg1 = args.read<QDropEvent * > (heap);
+  QDropEvent *arg1 = gsi::arg_reader<QDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateTimeEdit_Adaptor *)cls)->cbs_dropEvent_1622_0 (arg1);
 }
@@ -2653,7 +2653,7 @@ static void _call_cbs_enabledChange_864_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateTimeEdit_Adaptor *)cls)->cbs_enabledChange_864_0 (arg1);
 }
@@ -2677,7 +2677,7 @@ static void _call_cbs_enterEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateTimeEdit_Adaptor *)cls)->cbs_enterEvent_1217_0 (arg1);
 }
@@ -2701,7 +2701,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QDateTimeEdit_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -2726,8 +2726,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QDateTimeEdit_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -2750,7 +2750,7 @@ static void _call_cbs_fixup_c1330_0 (const qt_gsi::GenericMethod * /*decl*/, voi
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QString &arg1 = args.read<QString & > (heap);
+  QString &arg1 = gsi::arg_reader<QString & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateTimeEdit_Adaptor *)cls)->cbs_fixup_c1330_0 (arg1);
 }
@@ -2774,7 +2774,7 @@ static void _call_cbs_focusInEvent_1729_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateTimeEdit_Adaptor *)cls)->cbs_focusInEvent_1729_0 (arg1);
 }
@@ -2812,7 +2812,7 @@ static void _call_cbs_focusNextPrevChild_864_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   ret.write<bool > ((bool)((QDateTimeEdit_Adaptor *)cls)->cbs_focusNextPrevChild_864_0 (arg1));
 }
 
@@ -2835,7 +2835,7 @@ static void _call_cbs_focusOutEvent_1729_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateTimeEdit_Adaptor *)cls)->cbs_focusOutEvent_1729_0 (arg1);
 }
@@ -2873,7 +2873,7 @@ static void _call_cbs_fontChange_1801_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QFont &arg1 = args.read<const QFont & > (heap);
+  const QFont &arg1 = gsi::arg_reader<const QFont & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateTimeEdit_Adaptor *)cls)->cbs_fontChange_1801_0 (arg1);
 }
@@ -2897,7 +2897,7 @@ static void _call_cbs_heightForWidth_c767_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   ret.write<int > ((int)((QDateTimeEdit_Adaptor *)cls)->cbs_heightForWidth_c767_0 (arg1));
 }
 
@@ -2920,7 +2920,7 @@ static void _call_cbs_hideEvent_1595_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QHideEvent *arg1 = args.read<QHideEvent * > (heap);
+  QHideEvent *arg1 = gsi::arg_reader<QHideEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateTimeEdit_Adaptor *)cls)->cbs_hideEvent_1595_0 (arg1);
 }
@@ -2963,7 +2963,7 @@ static void _call_cbs_inputMethodEvent_2354_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QInputMethodEvent *arg1 = args.read<QInputMethodEvent * > (heap);
+  QInputMethodEvent *arg1 = gsi::arg_reader<QInputMethodEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateTimeEdit_Adaptor *)cls)->cbs_inputMethodEvent_2354_0 (arg1);
 }
@@ -2987,7 +2987,7 @@ static void _call_cbs_inputMethodQuery_c2420_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = args.read<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & > (heap);
+  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & >() (args, heap);
   ret.write<QVariant > ((QVariant)((QDateTimeEdit_Adaptor *)cls)->cbs_inputMethodQuery_c2420_0 (arg1));
 }
 
@@ -3010,7 +3010,7 @@ static void _call_cbs_keyPressEvent_1514_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateTimeEdit_Adaptor *)cls)->cbs_keyPressEvent_1514_0 (arg1);
 }
@@ -3034,7 +3034,7 @@ static void _call_cbs_keyReleaseEvent_1514_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateTimeEdit_Adaptor *)cls)->cbs_keyReleaseEvent_1514_0 (arg1);
 }
@@ -3078,7 +3078,7 @@ static void _call_cbs_leaveEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateTimeEdit_Adaptor *)cls)->cbs_leaveEvent_1217_0 (arg1);
 }
@@ -3116,7 +3116,7 @@ static void _call_cbs_metric_c3445_0 (const qt_gsi::GenericMethod * /*decl*/, vo
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & arg1 = args.read<const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & > (heap);
+  const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & >() (args, heap);
   ret.write<int > ((int)((QDateTimeEdit_Adaptor *)cls)->cbs_metric_c3445_0 (arg1));
 }
 
@@ -3158,7 +3158,7 @@ static void _call_cbs_mouseDoubleClickEvent_1738_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateTimeEdit_Adaptor *)cls)->cbs_mouseDoubleClickEvent_1738_0 (arg1);
 }
@@ -3182,7 +3182,7 @@ static void _call_cbs_mouseMoveEvent_1738_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateTimeEdit_Adaptor *)cls)->cbs_mouseMoveEvent_1738_0 (arg1);
 }
@@ -3206,7 +3206,7 @@ static void _call_cbs_mousePressEvent_1738_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateTimeEdit_Adaptor *)cls)->cbs_mousePressEvent_1738_0 (arg1);
 }
@@ -3230,7 +3230,7 @@ static void _call_cbs_mouseReleaseEvent_1738_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateTimeEdit_Adaptor *)cls)->cbs_mouseReleaseEvent_1738_0 (arg1);
 }
@@ -3254,7 +3254,7 @@ static void _call_cbs_moveEvent_1624_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMoveEvent *arg1 = args.read<QMoveEvent * > (heap);
+  QMoveEvent *arg1 = gsi::arg_reader<QMoveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateTimeEdit_Adaptor *)cls)->cbs_moveEvent_1624_0 (arg1);
 }
@@ -3297,7 +3297,7 @@ static void _call_cbs_paintEvent_1725_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QPaintEvent *arg1 = args.read<QPaintEvent * > (heap);
+  QPaintEvent *arg1 = gsi::arg_reader<QPaintEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateTimeEdit_Adaptor *)cls)->cbs_paintEvent_1725_0 (arg1);
 }
@@ -3321,7 +3321,7 @@ static void _call_cbs_paletteChange_2113_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QPalette &arg1 = args.read<const QPalette & > (heap);
+  const QPalette &arg1 = gsi::arg_reader<const QPalette & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateTimeEdit_Adaptor *)cls)->cbs_paletteChange_2113_0 (arg1);
 }
@@ -3378,7 +3378,7 @@ static void _call_cbs_resizeEvent_1843_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QResizeEvent *arg1 = args.read<QResizeEvent * > (heap);
+  QResizeEvent *arg1 = gsi::arg_reader<QResizeEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateTimeEdit_Adaptor *)cls)->cbs_resizeEvent_1843_0 (arg1);
 }
@@ -3435,7 +3435,7 @@ static void _call_cbs_setVisible_864_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateTimeEdit_Adaptor *)cls)->cbs_setVisible_864_0 (arg1);
 }
@@ -3459,7 +3459,7 @@ static void _call_cbs_showEvent_1634_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QShowEvent *arg1 = args.read<QShowEvent * > (heap);
+  QShowEvent *arg1 = gsi::arg_reader<QShowEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateTimeEdit_Adaptor *)cls)->cbs_showEvent_1634_0 (arg1);
 }
@@ -3502,7 +3502,7 @@ static void _call_cbs_stepBy_767_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateTimeEdit_Adaptor *)cls)->cbs_stepBy_767_0 (arg1);
 }
@@ -3545,7 +3545,7 @@ static void _call_cbs_styleChange_1228_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QStyle &arg1 = args.read<QStyle & > (heap);
+  QStyle &arg1 = gsi::arg_reader<QStyle & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateTimeEdit_Adaptor *)cls)->cbs_styleChange_1228_0 (arg1);
 }
@@ -3569,7 +3569,7 @@ static void _call_cbs_tabletEvent_1821_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTabletEvent *arg1 = args.read<QTabletEvent * > (heap);
+  QTabletEvent *arg1 = gsi::arg_reader<QTabletEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateTimeEdit_Adaptor *)cls)->cbs_tabletEvent_1821_0 (arg1);
 }
@@ -3593,7 +3593,7 @@ static void _call_cbs_textFromDateTime_c2175_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QDateTime &arg1 = args.read<const QDateTime & > (heap);
+  const QDateTime &arg1 = gsi::arg_reader<const QDateTime & >() (args, heap);
   ret.write<QString > ((QString)((QDateTimeEdit_Adaptor *)cls)->cbs_textFromDateTime_c2175_0 (arg1));
 }
 
@@ -3634,7 +3634,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateTimeEdit_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }
@@ -3675,8 +3675,8 @@ static void _call_cbs_validate_c2171_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QString &arg1 = args.read<QString & > (heap);
-  int &arg2 = args.read<int & > (heap);
+  QString &arg1 = gsi::arg_reader<QString & >() (args, heap);
+  int &arg2 = gsi::arg_reader<int & >() (args, heap);
   ret.write<qt_gsi::Converter<QValidator::State>::target_type > ((qt_gsi::Converter<QValidator::State>::target_type)((QDateTimeEdit_Adaptor *)cls)->cbs_validate_c2171_0 (arg1, arg2));
 }
 
@@ -3699,7 +3699,7 @@ static void _call_cbs_wheelEvent_1718_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QWheelEvent *arg1 = args.read<QWheelEvent * > (heap);
+  QWheelEvent *arg1 = gsi::arg_reader<QWheelEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateTimeEdit_Adaptor *)cls)->cbs_wheelEvent_1718_0 (arg1);
 }
@@ -3723,7 +3723,7 @@ static void _call_cbs_windowActivationChange_864_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDateTimeEdit_Adaptor *)cls)->cbs_windowActivationChange_864_0 (arg1);
 }

src/gsiqt/qt4/QtGui/gsiDeclQDesktopWidget.cc

@@ -1312,7 +1312,7 @@ static void _call_cbs_actionEvent_1823_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QActionEvent *arg1 = args.read<QActionEvent * > (heap);
+  QActionEvent *arg1 = gsi::arg_reader<QActionEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDesktopWidget_Adaptor *)cls)->cbs_actionEvent_1823_0 (arg1);
 }
@@ -1336,7 +1336,7 @@ static void _call_cbs_changeEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDesktopWidget_Adaptor *)cls)->cbs_changeEvent_1217_0 (arg1);
 }
@@ -1360,7 +1360,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDesktopWidget_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -1384,7 +1384,7 @@ static void _call_cbs_closeEvent_1719_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QCloseEvent *arg1 = args.read<QCloseEvent * > (heap);
+  QCloseEvent *arg1 = gsi::arg_reader<QCloseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDesktopWidget_Adaptor *)cls)->cbs_closeEvent_1719_0 (arg1);
 }
@@ -1408,7 +1408,7 @@ static void _call_cbs_contextMenuEvent_2363_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QContextMenuEvent *arg1 = args.read<QContextMenuEvent * > (heap);
+  QContextMenuEvent *arg1 = gsi::arg_reader<QContextMenuEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDesktopWidget_Adaptor *)cls)->cbs_contextMenuEvent_2363_0 (arg1);
 }
@@ -1475,7 +1475,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDesktopWidget_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -1539,7 +1539,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDesktopWidget_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -1563,7 +1563,7 @@ static void _call_cbs_dragEnterEvent_2109_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragEnterEvent *arg1 = args.read<QDragEnterEvent * > (heap);
+  QDragEnterEvent *arg1 = gsi::arg_reader<QDragEnterEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDesktopWidget_Adaptor *)cls)->cbs_dragEnterEvent_2109_0 (arg1);
 }
@@ -1587,7 +1587,7 @@ static void _call_cbs_dragLeaveEvent_2092_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragLeaveEvent *arg1 = args.read<QDragLeaveEvent * > (heap);
+  QDragLeaveEvent *arg1 = gsi::arg_reader<QDragLeaveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDesktopWidget_Adaptor *)cls)->cbs_dragLeaveEvent_2092_0 (arg1);
 }
@@ -1611,7 +1611,7 @@ static void _call_cbs_dragMoveEvent_2006_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragMoveEvent *arg1 = args.read<QDragMoveEvent * > (heap);
+  QDragMoveEvent *arg1 = gsi::arg_reader<QDragMoveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDesktopWidget_Adaptor *)cls)->cbs_dragMoveEvent_2006_0 (arg1);
 }
@@ -1635,7 +1635,7 @@ static void _call_cbs_dropEvent_1622_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDropEvent *arg1 = args.read<QDropEvent * > (heap);
+  QDropEvent *arg1 = gsi::arg_reader<QDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDesktopWidget_Adaptor *)cls)->cbs_dropEvent_1622_0 (arg1);
 }
@@ -1659,7 +1659,7 @@ static void _call_cbs_enabledChange_864_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDesktopWidget_Adaptor *)cls)->cbs_enabledChange_864_0 (arg1);
 }
@@ -1683,7 +1683,7 @@ static void _call_cbs_enterEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDesktopWidget_Adaptor *)cls)->cbs_enterEvent_1217_0 (arg1);
 }
@@ -1707,7 +1707,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QDesktopWidget_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -1732,8 +1732,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QDesktopWidget_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -1756,7 +1756,7 @@ static void _call_cbs_focusInEvent_1729_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDesktopWidget_Adaptor *)cls)->cbs_focusInEvent_1729_0 (arg1);
 }
@@ -1794,7 +1794,7 @@ static void _call_cbs_focusNextPrevChild_864_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   ret.write<bool > ((bool)((QDesktopWidget_Adaptor *)cls)->cbs_focusNextPrevChild_864_0 (arg1));
 }
 
@@ -1817,7 +1817,7 @@ static void _call_cbs_focusOutEvent_1729_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDesktopWidget_Adaptor *)cls)->cbs_focusOutEvent_1729_0 (arg1);
 }
@@ -1855,7 +1855,7 @@ static void _call_cbs_fontChange_1801_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QFont &arg1 = args.read<const QFont & > (heap);
+  const QFont &arg1 = gsi::arg_reader<const QFont & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDesktopWidget_Adaptor *)cls)->cbs_fontChange_1801_0 (arg1);
 }
@@ -1879,7 +1879,7 @@ static void _call_cbs_heightForWidth_c767_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   ret.write<int > ((int)((QDesktopWidget_Adaptor *)cls)->cbs_heightForWidth_c767_0 (arg1));
 }
 
@@ -1902,7 +1902,7 @@ static void _call_cbs_hideEvent_1595_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QHideEvent *arg1 = args.read<QHideEvent * > (heap);
+  QHideEvent *arg1 = gsi::arg_reader<QHideEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDesktopWidget_Adaptor *)cls)->cbs_hideEvent_1595_0 (arg1);
 }
@@ -1926,7 +1926,7 @@ static void _call_cbs_inputMethodEvent_2354_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QInputMethodEvent *arg1 = args.read<QInputMethodEvent * > (heap);
+  QInputMethodEvent *arg1 = gsi::arg_reader<QInputMethodEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDesktopWidget_Adaptor *)cls)->cbs_inputMethodEvent_2354_0 (arg1);
 }
@@ -1950,7 +1950,7 @@ static void _call_cbs_inputMethodQuery_c2420_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = args.read<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & > (heap);
+  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & >() (args, heap);
   ret.write<QVariant > ((QVariant)((QDesktopWidget_Adaptor *)cls)->cbs_inputMethodQuery_c2420_0 (arg1));
 }
 
@@ -1973,7 +1973,7 @@ static void _call_cbs_keyPressEvent_1514_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDesktopWidget_Adaptor *)cls)->cbs_keyPressEvent_1514_0 (arg1);
 }
@@ -1997,7 +1997,7 @@ static void _call_cbs_keyReleaseEvent_1514_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDesktopWidget_Adaptor *)cls)->cbs_keyReleaseEvent_1514_0 (arg1);
 }
@@ -2041,7 +2041,7 @@ static void _call_cbs_leaveEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDesktopWidget_Adaptor *)cls)->cbs_leaveEvent_1217_0 (arg1);
 }
@@ -2065,7 +2065,7 @@ static void _call_cbs_metric_c3445_0 (const qt_gsi::GenericMethod * /*decl*/, vo
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & arg1 = args.read<const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & > (heap);
+  const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & >() (args, heap);
   ret.write<int > ((int)((QDesktopWidget_Adaptor *)cls)->cbs_metric_c3445_0 (arg1));
 }
 
@@ -2107,7 +2107,7 @@ static void _call_cbs_mouseDoubleClickEvent_1738_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDesktopWidget_Adaptor *)cls)->cbs_mouseDoubleClickEvent_1738_0 (arg1);
 }
@@ -2131,7 +2131,7 @@ static void _call_cbs_mouseMoveEvent_1738_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDesktopWidget_Adaptor *)cls)->cbs_mouseMoveEvent_1738_0 (arg1);
 }
@@ -2155,7 +2155,7 @@ static void _call_cbs_mousePressEvent_1738_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDesktopWidget_Adaptor *)cls)->cbs_mousePressEvent_1738_0 (arg1);
 }
@@ -2179,7 +2179,7 @@ static void _call_cbs_mouseReleaseEvent_1738_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDesktopWidget_Adaptor *)cls)->cbs_mouseReleaseEvent_1738_0 (arg1);
 }
@@ -2203,7 +2203,7 @@ static void _call_cbs_moveEvent_1624_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMoveEvent *arg1 = args.read<QMoveEvent * > (heap);
+  QMoveEvent *arg1 = gsi::arg_reader<QMoveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDesktopWidget_Adaptor *)cls)->cbs_moveEvent_1624_0 (arg1);
 }
@@ -2246,7 +2246,7 @@ static void _call_cbs_paintEvent_1725_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QPaintEvent *arg1 = args.read<QPaintEvent * > (heap);
+  QPaintEvent *arg1 = gsi::arg_reader<QPaintEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDesktopWidget_Adaptor *)cls)->cbs_paintEvent_1725_0 (arg1);
 }
@@ -2270,7 +2270,7 @@ static void _call_cbs_paletteChange_2113_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QPalette &arg1 = args.read<const QPalette & > (heap);
+  const QPalette &arg1 = gsi::arg_reader<const QPalette & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDesktopWidget_Adaptor *)cls)->cbs_paletteChange_2113_0 (arg1);
 }
@@ -2327,7 +2327,7 @@ static void _call_cbs_resizeEvent_1843_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QResizeEvent *arg1 = args.read<QResizeEvent * > (heap);
+  QResizeEvent *arg1 = gsi::arg_reader<QResizeEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDesktopWidget_Adaptor *)cls)->cbs_resizeEvent_1843_0 (arg1);
 }
@@ -2401,7 +2401,7 @@ static void _call_cbs_setVisible_864_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDesktopWidget_Adaptor *)cls)->cbs_setVisible_864_0 (arg1);
 }
@@ -2425,7 +2425,7 @@ static void _call_cbs_showEvent_1634_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QShowEvent *arg1 = args.read<QShowEvent * > (heap);
+  QShowEvent *arg1 = gsi::arg_reader<QShowEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDesktopWidget_Adaptor *)cls)->cbs_showEvent_1634_0 (arg1);
 }
@@ -2468,7 +2468,7 @@ static void _call_cbs_styleChange_1228_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QStyle &arg1 = args.read<QStyle & > (heap);
+  QStyle &arg1 = gsi::arg_reader<QStyle & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDesktopWidget_Adaptor *)cls)->cbs_styleChange_1228_0 (arg1);
 }
@@ -2492,7 +2492,7 @@ static void _call_cbs_tabletEvent_1821_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTabletEvent *arg1 = args.read<QTabletEvent * > (heap);
+  QTabletEvent *arg1 = gsi::arg_reader<QTabletEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDesktopWidget_Adaptor *)cls)->cbs_tabletEvent_1821_0 (arg1);
 }
@@ -2516,7 +2516,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDesktopWidget_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }
@@ -2555,7 +2555,7 @@ static void _call_cbs_wheelEvent_1718_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QWheelEvent *arg1 = args.read<QWheelEvent * > (heap);
+  QWheelEvent *arg1 = gsi::arg_reader<QWheelEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDesktopWidget_Adaptor *)cls)->cbs_wheelEvent_1718_0 (arg1);
 }
@@ -2579,7 +2579,7 @@ static void _call_cbs_windowActivationChange_864_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDesktopWidget_Adaptor *)cls)->cbs_windowActivationChange_864_0 (arg1);
 }

src/gsiqt/qt4/QtGui/gsiDeclQDial.cc

@@ -1290,7 +1290,7 @@ static void _call_cbs_actionEvent_1823_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QActionEvent *arg1 = args.read<QActionEvent * > (heap);
+  QActionEvent *arg1 = gsi::arg_reader<QActionEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDial_Adaptor *)cls)->cbs_actionEvent_1823_0 (arg1);
 }
@@ -1332,7 +1332,7 @@ static void _call_cbs_changeEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDial_Adaptor *)cls)->cbs_changeEvent_1217_0 (arg1);
 }
@@ -1356,7 +1356,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDial_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -1380,7 +1380,7 @@ static void _call_cbs_closeEvent_1719_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QCloseEvent *arg1 = args.read<QCloseEvent * > (heap);
+  QCloseEvent *arg1 = gsi::arg_reader<QCloseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDial_Adaptor *)cls)->cbs_closeEvent_1719_0 (arg1);
 }
@@ -1404,7 +1404,7 @@ static void _call_cbs_contextMenuEvent_2363_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QContextMenuEvent *arg1 = args.read<QContextMenuEvent * > (heap);
+  QContextMenuEvent *arg1 = gsi::arg_reader<QContextMenuEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDial_Adaptor *)cls)->cbs_contextMenuEvent_2363_0 (arg1);
 }
@@ -1471,7 +1471,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDial_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -1535,7 +1535,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDial_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -1559,7 +1559,7 @@ static void _call_cbs_dragEnterEvent_2109_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragEnterEvent *arg1 = args.read<QDragEnterEvent * > (heap);
+  QDragEnterEvent *arg1 = gsi::arg_reader<QDragEnterEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDial_Adaptor *)cls)->cbs_dragEnterEvent_2109_0 (arg1);
 }
@@ -1583,7 +1583,7 @@ static void _call_cbs_dragLeaveEvent_2092_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragLeaveEvent *arg1 = args.read<QDragLeaveEvent * > (heap);
+  QDragLeaveEvent *arg1 = gsi::arg_reader<QDragLeaveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDial_Adaptor *)cls)->cbs_dragLeaveEvent_2092_0 (arg1);
 }
@@ -1607,7 +1607,7 @@ static void _call_cbs_dragMoveEvent_2006_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragMoveEvent *arg1 = args.read<QDragMoveEvent * > (heap);
+  QDragMoveEvent *arg1 = gsi::arg_reader<QDragMoveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDial_Adaptor *)cls)->cbs_dragMoveEvent_2006_0 (arg1);
 }
@@ -1631,7 +1631,7 @@ static void _call_cbs_dropEvent_1622_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDropEvent *arg1 = args.read<QDropEvent * > (heap);
+  QDropEvent *arg1 = gsi::arg_reader<QDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDial_Adaptor *)cls)->cbs_dropEvent_1622_0 (arg1);
 }
@@ -1655,7 +1655,7 @@ static void _call_cbs_enabledChange_864_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDial_Adaptor *)cls)->cbs_enabledChange_864_0 (arg1);
 }
@@ -1679,7 +1679,7 @@ static void _call_cbs_enterEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDial_Adaptor *)cls)->cbs_enterEvent_1217_0 (arg1);
 }
@@ -1703,7 +1703,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QDial_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -1728,8 +1728,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QDial_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -1752,7 +1752,7 @@ static void _call_cbs_focusInEvent_1729_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDial_Adaptor *)cls)->cbs_focusInEvent_1729_0 (arg1);
 }
@@ -1790,7 +1790,7 @@ static void _call_cbs_focusNextPrevChild_864_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   ret.write<bool > ((bool)((QDial_Adaptor *)cls)->cbs_focusNextPrevChild_864_0 (arg1));
 }
 
@@ -1813,7 +1813,7 @@ static void _call_cbs_focusOutEvent_1729_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDial_Adaptor *)cls)->cbs_focusOutEvent_1729_0 (arg1);
 }
@@ -1851,7 +1851,7 @@ static void _call_cbs_fontChange_1801_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QFont &arg1 = args.read<const QFont & > (heap);
+  const QFont &arg1 = gsi::arg_reader<const QFont & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDial_Adaptor *)cls)->cbs_fontChange_1801_0 (arg1);
 }
@@ -1875,7 +1875,7 @@ static void _call_cbs_heightForWidth_c767_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   ret.write<int > ((int)((QDial_Adaptor *)cls)->cbs_heightForWidth_c767_0 (arg1));
 }
 
@@ -1898,7 +1898,7 @@ static void _call_cbs_hideEvent_1595_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QHideEvent *arg1 = args.read<QHideEvent * > (heap);
+  QHideEvent *arg1 = gsi::arg_reader<QHideEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDial_Adaptor *)cls)->cbs_hideEvent_1595_0 (arg1);
 }
@@ -1941,7 +1941,7 @@ static void _call_cbs_inputMethodEvent_2354_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QInputMethodEvent *arg1 = args.read<QInputMethodEvent * > (heap);
+  QInputMethodEvent *arg1 = gsi::arg_reader<QInputMethodEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDial_Adaptor *)cls)->cbs_inputMethodEvent_2354_0 (arg1);
 }
@@ -1965,7 +1965,7 @@ static void _call_cbs_inputMethodQuery_c2420_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = args.read<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & > (heap);
+  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & >() (args, heap);
   ret.write<QVariant > ((QVariant)((QDial_Adaptor *)cls)->cbs_inputMethodQuery_c2420_0 (arg1));
 }
 
@@ -1988,7 +1988,7 @@ static void _call_cbs_keyPressEvent_1514_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDial_Adaptor *)cls)->cbs_keyPressEvent_1514_0 (arg1);
 }
@@ -2012,7 +2012,7 @@ static void _call_cbs_keyReleaseEvent_1514_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDial_Adaptor *)cls)->cbs_keyReleaseEvent_1514_0 (arg1);
 }
@@ -2056,7 +2056,7 @@ static void _call_cbs_leaveEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDial_Adaptor *)cls)->cbs_leaveEvent_1217_0 (arg1);
 }
@@ -2080,7 +2080,7 @@ static void _call_cbs_metric_c3445_0 (const qt_gsi::GenericMethod * /*decl*/, vo
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & arg1 = args.read<const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & > (heap);
+  const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & >() (args, heap);
   ret.write<int > ((int)((QDial_Adaptor *)cls)->cbs_metric_c3445_0 (arg1));
 }
 
@@ -2122,7 +2122,7 @@ static void _call_cbs_mouseDoubleClickEvent_1738_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDial_Adaptor *)cls)->cbs_mouseDoubleClickEvent_1738_0 (arg1);
 }
@@ -2146,7 +2146,7 @@ static void _call_cbs_mouseMoveEvent_1738_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDial_Adaptor *)cls)->cbs_mouseMoveEvent_1738_0 (arg1);
 }
@@ -2170,7 +2170,7 @@ static void _call_cbs_mousePressEvent_1738_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDial_Adaptor *)cls)->cbs_mousePressEvent_1738_0 (arg1);
 }
@@ -2194,7 +2194,7 @@ static void _call_cbs_mouseReleaseEvent_1738_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDial_Adaptor *)cls)->cbs_mouseReleaseEvent_1738_0 (arg1);
 }
@@ -2218,7 +2218,7 @@ static void _call_cbs_moveEvent_1624_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMoveEvent *arg1 = args.read<QMoveEvent * > (heap);
+  QMoveEvent *arg1 = gsi::arg_reader<QMoveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDial_Adaptor *)cls)->cbs_moveEvent_1624_0 (arg1);
 }
@@ -2261,7 +2261,7 @@ static void _call_cbs_paintEvent_1725_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QPaintEvent *arg1 = args.read<QPaintEvent * > (heap);
+  QPaintEvent *arg1 = gsi::arg_reader<QPaintEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDial_Adaptor *)cls)->cbs_paintEvent_1725_0 (arg1);
 }
@@ -2285,7 +2285,7 @@ static void _call_cbs_paletteChange_2113_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QPalette &arg1 = args.read<const QPalette & > (heap);
+  const QPalette &arg1 = gsi::arg_reader<const QPalette & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDial_Adaptor *)cls)->cbs_paletteChange_2113_0 (arg1);
 }
@@ -2377,7 +2377,7 @@ static void _call_cbs_resizeEvent_1843_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QResizeEvent *arg1 = args.read<QResizeEvent * > (heap);
+  QResizeEvent *arg1 = gsi::arg_reader<QResizeEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDial_Adaptor *)cls)->cbs_resizeEvent_1843_0 (arg1);
 }
@@ -2440,7 +2440,7 @@ static void _call_cbs_setVisible_864_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDial_Adaptor *)cls)->cbs_setVisible_864_0 (arg1);
 }
@@ -2464,7 +2464,7 @@ static void _call_cbs_showEvent_1634_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QShowEvent *arg1 = args.read<QShowEvent * > (heap);
+  QShowEvent *arg1 = gsi::arg_reader<QShowEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDial_Adaptor *)cls)->cbs_showEvent_1634_0 (arg1);
 }
@@ -2507,7 +2507,7 @@ static void _call_cbs_sliderChange_3257_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  unsigned int arg1 = args.read<unsigned int > (heap);
+  unsigned int arg1 = gsi::arg_reader<unsigned int >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDial_Adaptor *)cls)->cbs_sliderChange_3257_0 (arg1);
 }
@@ -2577,7 +2577,7 @@ static void _call_cbs_styleChange_1228_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QStyle &arg1 = args.read<QStyle & > (heap);
+  QStyle &arg1 = gsi::arg_reader<QStyle & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDial_Adaptor *)cls)->cbs_styleChange_1228_0 (arg1);
 }
@@ -2601,7 +2601,7 @@ static void _call_cbs_tabletEvent_1821_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTabletEvent *arg1 = args.read<QTabletEvent * > (heap);
+  QTabletEvent *arg1 = gsi::arg_reader<QTabletEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDial_Adaptor *)cls)->cbs_tabletEvent_1821_0 (arg1);
 }
@@ -2625,7 +2625,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDial_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }
@@ -2682,7 +2682,7 @@ static void _call_cbs_wheelEvent_1718_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QWheelEvent *arg1 = args.read<QWheelEvent * > (heap);
+  QWheelEvent *arg1 = gsi::arg_reader<QWheelEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDial_Adaptor *)cls)->cbs_wheelEvent_1718_0 (arg1);
 }
@@ -2706,7 +2706,7 @@ static void _call_cbs_windowActivationChange_864_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDial_Adaptor *)cls)->cbs_windowActivationChange_864_0 (arg1);
 }

src/gsiqt/qt4/QtGui/gsiDeclQDialog.cc

@@ -1505,7 +1505,7 @@ static void _call_cbs_actionEvent_1823_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QActionEvent *arg1 = args.read<QActionEvent * > (heap);
+  QActionEvent *arg1 = gsi::arg_reader<QActionEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialog_Adaptor *)cls)->cbs_actionEvent_1823_0 (arg1);
 }
@@ -1548,7 +1548,7 @@ static void _call_cbs_changeEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialog_Adaptor *)cls)->cbs_changeEvent_1217_0 (arg1);
 }
@@ -1572,7 +1572,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialog_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -1596,7 +1596,7 @@ static void _call_cbs_closeEvent_1719_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QCloseEvent *arg1 = args.read<QCloseEvent * > (heap);
+  QCloseEvent *arg1 = gsi::arg_reader<QCloseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialog_Adaptor *)cls)->cbs_closeEvent_1719_0 (arg1);
 }
@@ -1620,7 +1620,7 @@ static void _call_cbs_contextMenuEvent_2363_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QContextMenuEvent *arg1 = args.read<QContextMenuEvent * > (heap);
+  QContextMenuEvent *arg1 = gsi::arg_reader<QContextMenuEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialog_Adaptor *)cls)->cbs_contextMenuEvent_2363_0 (arg1);
 }
@@ -1687,7 +1687,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialog_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -1751,7 +1751,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialog_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -1775,7 +1775,7 @@ static void _call_cbs_done_767_0 (const qt_gsi::GenericMethod * /*decl*/, void *
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialog_Adaptor *)cls)->cbs_done_767_0 (arg1);
 }
@@ -1799,7 +1799,7 @@ static void _call_cbs_dragEnterEvent_2109_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragEnterEvent *arg1 = args.read<QDragEnterEvent * > (heap);
+  QDragEnterEvent *arg1 = gsi::arg_reader<QDragEnterEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialog_Adaptor *)cls)->cbs_dragEnterEvent_2109_0 (arg1);
 }
@@ -1823,7 +1823,7 @@ static void _call_cbs_dragLeaveEvent_2092_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragLeaveEvent *arg1 = args.read<QDragLeaveEvent * > (heap);
+  QDragLeaveEvent *arg1 = gsi::arg_reader<QDragLeaveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialog_Adaptor *)cls)->cbs_dragLeaveEvent_2092_0 (arg1);
 }
@@ -1847,7 +1847,7 @@ static void _call_cbs_dragMoveEvent_2006_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragMoveEvent *arg1 = args.read<QDragMoveEvent * > (heap);
+  QDragMoveEvent *arg1 = gsi::arg_reader<QDragMoveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialog_Adaptor *)cls)->cbs_dragMoveEvent_2006_0 (arg1);
 }
@@ -1871,7 +1871,7 @@ static void _call_cbs_dropEvent_1622_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDropEvent *arg1 = args.read<QDropEvent * > (heap);
+  QDropEvent *arg1 = gsi::arg_reader<QDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialog_Adaptor *)cls)->cbs_dropEvent_1622_0 (arg1);
 }
@@ -1895,7 +1895,7 @@ static void _call_cbs_enabledChange_864_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialog_Adaptor *)cls)->cbs_enabledChange_864_0 (arg1);
 }
@@ -1919,7 +1919,7 @@ static void _call_cbs_enterEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialog_Adaptor *)cls)->cbs_enterEvent_1217_0 (arg1);
 }
@@ -1943,7 +1943,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QDialog_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -1968,8 +1968,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QDialog_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -2010,7 +2010,7 @@ static void _call_cbs_focusInEvent_1729_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialog_Adaptor *)cls)->cbs_focusInEvent_1729_0 (arg1);
 }
@@ -2048,7 +2048,7 @@ static void _call_cbs_focusNextPrevChild_864_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   ret.write<bool > ((bool)((QDialog_Adaptor *)cls)->cbs_focusNextPrevChild_864_0 (arg1));
 }
 
@@ -2071,7 +2071,7 @@ static void _call_cbs_focusOutEvent_1729_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialog_Adaptor *)cls)->cbs_focusOutEvent_1729_0 (arg1);
 }
@@ -2109,7 +2109,7 @@ static void _call_cbs_fontChange_1801_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QFont &arg1 = args.read<const QFont & > (heap);
+  const QFont &arg1 = gsi::arg_reader<const QFont & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialog_Adaptor *)cls)->cbs_fontChange_1801_0 (arg1);
 }
@@ -2133,7 +2133,7 @@ static void _call_cbs_heightForWidth_c767_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   ret.write<int > ((int)((QDialog_Adaptor *)cls)->cbs_heightForWidth_c767_0 (arg1));
 }
 
@@ -2156,7 +2156,7 @@ static void _call_cbs_hideEvent_1595_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QHideEvent *arg1 = args.read<QHideEvent * > (heap);
+  QHideEvent *arg1 = gsi::arg_reader<QHideEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialog_Adaptor *)cls)->cbs_hideEvent_1595_0 (arg1);
 }
@@ -2180,7 +2180,7 @@ static void _call_cbs_inputMethodEvent_2354_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QInputMethodEvent *arg1 = args.read<QInputMethodEvent * > (heap);
+  QInputMethodEvent *arg1 = gsi::arg_reader<QInputMethodEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialog_Adaptor *)cls)->cbs_inputMethodEvent_2354_0 (arg1);
 }
@@ -2204,7 +2204,7 @@ static void _call_cbs_inputMethodQuery_c2420_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = args.read<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & > (heap);
+  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & >() (args, heap);
   ret.write<QVariant > ((QVariant)((QDialog_Adaptor *)cls)->cbs_inputMethodQuery_c2420_0 (arg1));
 }
 
@@ -2227,7 +2227,7 @@ static void _call_cbs_keyPressEvent_1514_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialog_Adaptor *)cls)->cbs_keyPressEvent_1514_0 (arg1);
 }
@@ -2251,7 +2251,7 @@ static void _call_cbs_keyReleaseEvent_1514_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialog_Adaptor *)cls)->cbs_keyReleaseEvent_1514_0 (arg1);
 }
@@ -2295,7 +2295,7 @@ static void _call_cbs_leaveEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialog_Adaptor *)cls)->cbs_leaveEvent_1217_0 (arg1);
 }
@@ -2319,7 +2319,7 @@ static void _call_cbs_metric_c3445_0 (const qt_gsi::GenericMethod * /*decl*/, vo
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & arg1 = args.read<const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & > (heap);
+  const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & >() (args, heap);
   ret.write<int > ((int)((QDialog_Adaptor *)cls)->cbs_metric_c3445_0 (arg1));
 }
 
@@ -2361,7 +2361,7 @@ static void _call_cbs_mouseDoubleClickEvent_1738_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialog_Adaptor *)cls)->cbs_mouseDoubleClickEvent_1738_0 (arg1);
 }
@@ -2385,7 +2385,7 @@ static void _call_cbs_mouseMoveEvent_1738_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialog_Adaptor *)cls)->cbs_mouseMoveEvent_1738_0 (arg1);
 }
@@ -2409,7 +2409,7 @@ static void _call_cbs_mousePressEvent_1738_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialog_Adaptor *)cls)->cbs_mousePressEvent_1738_0 (arg1);
 }
@@ -2433,7 +2433,7 @@ static void _call_cbs_mouseReleaseEvent_1738_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialog_Adaptor *)cls)->cbs_mouseReleaseEvent_1738_0 (arg1);
 }
@@ -2457,7 +2457,7 @@ static void _call_cbs_moveEvent_1624_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMoveEvent *arg1 = args.read<QMoveEvent * > (heap);
+  QMoveEvent *arg1 = gsi::arg_reader<QMoveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialog_Adaptor *)cls)->cbs_moveEvent_1624_0 (arg1);
 }
@@ -2500,7 +2500,7 @@ static void _call_cbs_paintEvent_1725_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QPaintEvent *arg1 = args.read<QPaintEvent * > (heap);
+  QPaintEvent *arg1 = gsi::arg_reader<QPaintEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialog_Adaptor *)cls)->cbs_paintEvent_1725_0 (arg1);
 }
@@ -2524,7 +2524,7 @@ static void _call_cbs_paletteChange_2113_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QPalette &arg1 = args.read<const QPalette & > (heap);
+  const QPalette &arg1 = gsi::arg_reader<const QPalette & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialog_Adaptor *)cls)->cbs_paletteChange_2113_0 (arg1);
 }
@@ -2615,7 +2615,7 @@ static void _call_cbs_resizeEvent_1843_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QResizeEvent *arg1 = args.read<QResizeEvent * > (heap);
+  QResizeEvent *arg1 = gsi::arg_reader<QResizeEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialog_Adaptor *)cls)->cbs_resizeEvent_1843_0 (arg1);
 }
@@ -2653,7 +2653,7 @@ static void _call_cbs_setVisible_864_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialog_Adaptor *)cls)->cbs_setVisible_864_0 (arg1);
 }
@@ -2677,7 +2677,7 @@ static void _call_cbs_showEvent_1634_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QShowEvent *arg1 = args.read<QShowEvent * > (heap);
+  QShowEvent *arg1 = gsi::arg_reader<QShowEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialog_Adaptor *)cls)->cbs_showEvent_1634_0 (arg1);
 }
@@ -2720,7 +2720,7 @@ static void _call_cbs_styleChange_1228_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QStyle &arg1 = args.read<QStyle & > (heap);
+  QStyle &arg1 = gsi::arg_reader<QStyle & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialog_Adaptor *)cls)->cbs_styleChange_1228_0 (arg1);
 }
@@ -2744,7 +2744,7 @@ static void _call_cbs_tabletEvent_1821_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTabletEvent *arg1 = args.read<QTabletEvent * > (heap);
+  QTabletEvent *arg1 = gsi::arg_reader<QTabletEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialog_Adaptor *)cls)->cbs_tabletEvent_1821_0 (arg1);
 }
@@ -2768,7 +2768,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialog_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }
@@ -2807,7 +2807,7 @@ static void _call_cbs_wheelEvent_1718_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QWheelEvent *arg1 = args.read<QWheelEvent * > (heap);
+  QWheelEvent *arg1 = gsi::arg_reader<QWheelEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialog_Adaptor *)cls)->cbs_wheelEvent_1718_0 (arg1);
 }
@@ -2831,7 +2831,7 @@ static void _call_cbs_windowActivationChange_864_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialog_Adaptor *)cls)->cbs_windowActivationChange_864_0 (arg1);
 }

src/gsiqt/qt4/QtGui/gsiDeclQDialogButtonBox.cc

@@ -1468,7 +1468,7 @@ static void _call_cbs_actionEvent_1823_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QActionEvent *arg1 = args.read<QActionEvent * > (heap);
+  QActionEvent *arg1 = gsi::arg_reader<QActionEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialogButtonBox_Adaptor *)cls)->cbs_actionEvent_1823_0 (arg1);
 }
@@ -1492,7 +1492,7 @@ static void _call_cbs_changeEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialogButtonBox_Adaptor *)cls)->cbs_changeEvent_1217_0 (arg1);
 }
@@ -1516,7 +1516,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialogButtonBox_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -1558,7 +1558,7 @@ static void _call_cbs_closeEvent_1719_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QCloseEvent *arg1 = args.read<QCloseEvent * > (heap);
+  QCloseEvent *arg1 = gsi::arg_reader<QCloseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialogButtonBox_Adaptor *)cls)->cbs_closeEvent_1719_0 (arg1);
 }
@@ -1582,7 +1582,7 @@ static void _call_cbs_contextMenuEvent_2363_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QContextMenuEvent *arg1 = args.read<QContextMenuEvent * > (heap);
+  QContextMenuEvent *arg1 = gsi::arg_reader<QContextMenuEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialogButtonBox_Adaptor *)cls)->cbs_contextMenuEvent_2363_0 (arg1);
 }
@@ -1649,7 +1649,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialogButtonBox_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -1713,7 +1713,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialogButtonBox_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -1737,7 +1737,7 @@ static void _call_cbs_dragEnterEvent_2109_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragEnterEvent *arg1 = args.read<QDragEnterEvent * > (heap);
+  QDragEnterEvent *arg1 = gsi::arg_reader<QDragEnterEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialogButtonBox_Adaptor *)cls)->cbs_dragEnterEvent_2109_0 (arg1);
 }
@@ -1761,7 +1761,7 @@ static void _call_cbs_dragLeaveEvent_2092_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragLeaveEvent *arg1 = args.read<QDragLeaveEvent * > (heap);
+  QDragLeaveEvent *arg1 = gsi::arg_reader<QDragLeaveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialogButtonBox_Adaptor *)cls)->cbs_dragLeaveEvent_2092_0 (arg1);
 }
@@ -1785,7 +1785,7 @@ static void _call_cbs_dragMoveEvent_2006_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragMoveEvent *arg1 = args.read<QDragMoveEvent * > (heap);
+  QDragMoveEvent *arg1 = gsi::arg_reader<QDragMoveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialogButtonBox_Adaptor *)cls)->cbs_dragMoveEvent_2006_0 (arg1);
 }
@@ -1809,7 +1809,7 @@ static void _call_cbs_dropEvent_1622_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDropEvent *arg1 = args.read<QDropEvent * > (heap);
+  QDropEvent *arg1 = gsi::arg_reader<QDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialogButtonBox_Adaptor *)cls)->cbs_dropEvent_1622_0 (arg1);
 }
@@ -1833,7 +1833,7 @@ static void _call_cbs_enabledChange_864_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialogButtonBox_Adaptor *)cls)->cbs_enabledChange_864_0 (arg1);
 }
@@ -1857,7 +1857,7 @@ static void _call_cbs_enterEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialogButtonBox_Adaptor *)cls)->cbs_enterEvent_1217_0 (arg1);
 }
@@ -1881,7 +1881,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QDialogButtonBox_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -1906,8 +1906,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QDialogButtonBox_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -1930,7 +1930,7 @@ static void _call_cbs_focusInEvent_1729_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialogButtonBox_Adaptor *)cls)->cbs_focusInEvent_1729_0 (arg1);
 }
@@ -1968,7 +1968,7 @@ static void _call_cbs_focusNextPrevChild_864_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   ret.write<bool > ((bool)((QDialogButtonBox_Adaptor *)cls)->cbs_focusNextPrevChild_864_0 (arg1));
 }
 
@@ -1991,7 +1991,7 @@ static void _call_cbs_focusOutEvent_1729_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialogButtonBox_Adaptor *)cls)->cbs_focusOutEvent_1729_0 (arg1);
 }
@@ -2029,7 +2029,7 @@ static void _call_cbs_fontChange_1801_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QFont &arg1 = args.read<const QFont & > (heap);
+  const QFont &arg1 = gsi::arg_reader<const QFont & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialogButtonBox_Adaptor *)cls)->cbs_fontChange_1801_0 (arg1);
 }
@@ -2053,7 +2053,7 @@ static void _call_cbs_heightForWidth_c767_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   ret.write<int > ((int)((QDialogButtonBox_Adaptor *)cls)->cbs_heightForWidth_c767_0 (arg1));
 }
 
@@ -2090,7 +2090,7 @@ static void _call_cbs_hideEvent_1595_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QHideEvent *arg1 = args.read<QHideEvent * > (heap);
+  QHideEvent *arg1 = gsi::arg_reader<QHideEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialogButtonBox_Adaptor *)cls)->cbs_hideEvent_1595_0 (arg1);
 }
@@ -2114,7 +2114,7 @@ static void _call_cbs_inputMethodEvent_2354_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QInputMethodEvent *arg1 = args.read<QInputMethodEvent * > (heap);
+  QInputMethodEvent *arg1 = gsi::arg_reader<QInputMethodEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialogButtonBox_Adaptor *)cls)->cbs_inputMethodEvent_2354_0 (arg1);
 }
@@ -2138,7 +2138,7 @@ static void _call_cbs_inputMethodQuery_c2420_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = args.read<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & > (heap);
+  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & >() (args, heap);
   ret.write<QVariant > ((QVariant)((QDialogButtonBox_Adaptor *)cls)->cbs_inputMethodQuery_c2420_0 (arg1));
 }
 
@@ -2161,7 +2161,7 @@ static void _call_cbs_keyPressEvent_1514_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialogButtonBox_Adaptor *)cls)->cbs_keyPressEvent_1514_0 (arg1);
 }
@@ -2185,7 +2185,7 @@ static void _call_cbs_keyReleaseEvent_1514_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialogButtonBox_Adaptor *)cls)->cbs_keyReleaseEvent_1514_0 (arg1);
 }
@@ -2229,7 +2229,7 @@ static void _call_cbs_leaveEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialogButtonBox_Adaptor *)cls)->cbs_leaveEvent_1217_0 (arg1);
 }
@@ -2253,7 +2253,7 @@ static void _call_cbs_metric_c3445_0 (const qt_gsi::GenericMethod * /*decl*/, vo
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & arg1 = args.read<const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & > (heap);
+  const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & >() (args, heap);
   ret.write<int > ((int)((QDialogButtonBox_Adaptor *)cls)->cbs_metric_c3445_0 (arg1));
 }
 
@@ -2295,7 +2295,7 @@ static void _call_cbs_mouseDoubleClickEvent_1738_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialogButtonBox_Adaptor *)cls)->cbs_mouseDoubleClickEvent_1738_0 (arg1);
 }
@@ -2319,7 +2319,7 @@ static void _call_cbs_mouseMoveEvent_1738_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialogButtonBox_Adaptor *)cls)->cbs_mouseMoveEvent_1738_0 (arg1);
 }
@@ -2343,7 +2343,7 @@ static void _call_cbs_mousePressEvent_1738_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialogButtonBox_Adaptor *)cls)->cbs_mousePressEvent_1738_0 (arg1);
 }
@@ -2367,7 +2367,7 @@ static void _call_cbs_mouseReleaseEvent_1738_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialogButtonBox_Adaptor *)cls)->cbs_mouseReleaseEvent_1738_0 (arg1);
 }
@@ -2391,7 +2391,7 @@ static void _call_cbs_moveEvent_1624_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMoveEvent *arg1 = args.read<QMoveEvent * > (heap);
+  QMoveEvent *arg1 = gsi::arg_reader<QMoveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialogButtonBox_Adaptor *)cls)->cbs_moveEvent_1624_0 (arg1);
 }
@@ -2434,7 +2434,7 @@ static void _call_cbs_paintEvent_1725_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QPaintEvent *arg1 = args.read<QPaintEvent * > (heap);
+  QPaintEvent *arg1 = gsi::arg_reader<QPaintEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialogButtonBox_Adaptor *)cls)->cbs_paintEvent_1725_0 (arg1);
 }
@@ -2458,7 +2458,7 @@ static void _call_cbs_paletteChange_2113_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QPalette &arg1 = args.read<const QPalette & > (heap);
+  const QPalette &arg1 = gsi::arg_reader<const QPalette & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialogButtonBox_Adaptor *)cls)->cbs_paletteChange_2113_0 (arg1);
 }
@@ -2529,7 +2529,7 @@ static void _call_cbs_resizeEvent_1843_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QResizeEvent *arg1 = args.read<QResizeEvent * > (heap);
+  QResizeEvent *arg1 = gsi::arg_reader<QResizeEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialogButtonBox_Adaptor *)cls)->cbs_resizeEvent_1843_0 (arg1);
 }
@@ -2567,7 +2567,7 @@ static void _call_cbs_setVisible_864_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialogButtonBox_Adaptor *)cls)->cbs_setVisible_864_0 (arg1);
 }
@@ -2591,7 +2591,7 @@ static void _call_cbs_showEvent_1634_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QShowEvent *arg1 = args.read<QShowEvent * > (heap);
+  QShowEvent *arg1 = gsi::arg_reader<QShowEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialogButtonBox_Adaptor *)cls)->cbs_showEvent_1634_0 (arg1);
 }
@@ -2634,7 +2634,7 @@ static void _call_cbs_styleChange_1228_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QStyle &arg1 = args.read<QStyle & > (heap);
+  QStyle &arg1 = gsi::arg_reader<QStyle & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialogButtonBox_Adaptor *)cls)->cbs_styleChange_1228_0 (arg1);
 }
@@ -2658,7 +2658,7 @@ static void _call_cbs_tabletEvent_1821_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTabletEvent *arg1 = args.read<QTabletEvent * > (heap);
+  QTabletEvent *arg1 = gsi::arg_reader<QTabletEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialogButtonBox_Adaptor *)cls)->cbs_tabletEvent_1821_0 (arg1);
 }
@@ -2682,7 +2682,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialogButtonBox_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }
@@ -2721,7 +2721,7 @@ static void _call_cbs_wheelEvent_1718_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QWheelEvent *arg1 = args.read<QWheelEvent * > (heap);
+  QWheelEvent *arg1 = gsi::arg_reader<QWheelEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialogButtonBox_Adaptor *)cls)->cbs_wheelEvent_1718_0 (arg1);
 }
@@ -2745,7 +2745,7 @@ static void _call_cbs_windowActivationChange_864_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDialogButtonBox_Adaptor *)cls)->cbs_windowActivationChange_864_0 (arg1);
 }

src/gsiqt/qt4/QtGui/gsiDeclQDirModel.cc

@@ -1945,7 +1945,7 @@ static void _call_cbs_buddy_c2395_0 (const qt_gsi::GenericMethod * /*decl*/, voi
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
   ret.write<QModelIndex > ((QModelIndex)((QDirModel_Adaptor *)cls)->cbs_buddy_c2395_0 (arg1));
 }
 
@@ -1968,7 +1968,7 @@ static void _call_cbs_canFetchMore_c2395_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
   ret.write<bool > ((bool)((QDirModel_Adaptor *)cls)->cbs_canFetchMore_c2395_0 (arg1));
 }
 
@@ -2035,7 +2035,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDirModel_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -2059,7 +2059,7 @@ static void _call_cbs_columnCount_c2395_1 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
+  const QModelIndex &arg1 = args ? gsi::arg_reader<const QModelIndex & >() (args, heap) : gsi::arg_maker<const QModelIndex & >() (QModelIndex(), heap);
   ret.write<int > ((int)((QDirModel_Adaptor *)cls)->cbs_columnCount_c2395_1 (arg1));
 }
 
@@ -2154,7 +2154,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDirModel_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -2180,8 +2180,8 @@ static void _call_cbs_data_c3054_1 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
-  int arg2 = args.read<int > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
+  int arg2 = args ? gsi::arg_reader<int >() (args, heap) : gsi::arg_maker<int >() (Qt::DisplayRole, heap);
   ret.write<QVariant > ((QVariant)((QDirModel_Adaptor *)cls)->cbs_data_c3054_1 (arg1, arg2));
 }
 
@@ -2270,7 +2270,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDirModel_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -2302,11 +2302,11 @@ static void _call_cbs_dropMimeData_7425_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QMimeData *arg1 = args.read<const QMimeData * > (heap);
-  const qt_gsi::Converter<Qt::DropAction>::target_type & arg2 = args.read<const qt_gsi::Converter<Qt::DropAction>::target_type & > (heap);
-  int arg3 = args.read<int > (heap);
-  int arg4 = args.read<int > (heap);
-  const QModelIndex &arg5 = args.read<const QModelIndex & > (heap);
+  const QMimeData *arg1 = gsi::arg_reader<const QMimeData * >() (args, heap);
+  const qt_gsi::Converter<Qt::DropAction>::target_type & arg2 = gsi::arg_reader<const qt_gsi::Converter<Qt::DropAction>::target_type & >() (args, heap);
+  int arg3 = gsi::arg_reader<int >() (args, heap);
+  int arg4 = gsi::arg_reader<int >() (args, heap);
+  const QModelIndex &arg5 = gsi::arg_reader<const QModelIndex & >() (args, heap);
   ret.write<bool > ((bool)((QDirModel_Adaptor *)cls)->cbs_dropMimeData_7425_0 (arg1, arg2, arg3, arg4, arg5));
 }
 
@@ -2456,7 +2456,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QDirModel_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -2481,8 +2481,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QDirModel_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -2505,7 +2505,7 @@ static void _call_cbs_fetchMore_2395_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDirModel_Adaptor *)cls)->cbs_fetchMore_2395_0 (arg1);
 }
@@ -2529,7 +2529,7 @@ static void _call_cbs_flags_c2395_0 (const qt_gsi::GenericMethod * /*decl*/, voi
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
   ret.write<QFlags<Qt::ItemFlag> > ((QFlags<Qt::ItemFlag>)((QDirModel_Adaptor *)cls)->cbs_flags_c2395_0 (arg1));
 }
 
@@ -2552,7 +2552,7 @@ static void _call_cbs_hasChildren_c2395_1 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
+  const QModelIndex &arg1 = args ? gsi::arg_reader<const QModelIndex & >() (args, heap) : gsi::arg_maker<const QModelIndex & >() (QModelIndex(), heap);
   ret.write<bool > ((bool)((QDirModel_Adaptor *)cls)->cbs_hasChildren_c2395_1 (arg1));
 }
 
@@ -2579,9 +2579,9 @@ static void _call_cbs_headerData_c3231_1 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
-  const qt_gsi::Converter<Qt::Orientation>::target_type & arg2 = args.read<const qt_gsi::Converter<Qt::Orientation>::target_type & > (heap);
-  int arg3 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
+  const qt_gsi::Converter<Qt::Orientation>::target_type & arg2 = gsi::arg_reader<const qt_gsi::Converter<Qt::Orientation>::target_type & >() (args, heap);
+  int arg3 = args ? gsi::arg_reader<int >() (args, heap) : gsi::arg_maker<int >() (Qt::DisplayRole, heap);
   ret.write<QVariant > ((QVariant)((QDirModel_Adaptor *)cls)->cbs_headerData_c3231_1 (arg1, arg2, arg3));
 }
 
@@ -2632,9 +2632,9 @@ static void _call_cbs_index_c3713_1 (const qt_gsi::GenericMethod * /*decl*/, voi
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
-  int arg2 = args.read<int > (heap);
-  const QModelIndex &arg3 = args.read<const QModelIndex & > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
+  int arg2 = gsi::arg_reader<int >() (args, heap);
+  const QModelIndex &arg3 = args ? gsi::arg_reader<const QModelIndex & >() (args, heap) : gsi::arg_maker<const QModelIndex & >() (QModelIndex(), heap);
   ret.write<QModelIndex > ((QModelIndex)((QDirModel_Adaptor *)cls)->cbs_index_c3713_1 (arg1, arg2, arg3));
 }
 
@@ -2661,9 +2661,9 @@ static void _call_cbs_insertColumns_3713_1 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
-  int arg2 = args.read<int > (heap);
-  const QModelIndex &arg3 = args.read<const QModelIndex & > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
+  int arg2 = gsi::arg_reader<int >() (args, heap);
+  const QModelIndex &arg3 = args ? gsi::arg_reader<const QModelIndex & >() (args, heap) : gsi::arg_maker<const QModelIndex & >() (QModelIndex(), heap);
   ret.write<bool > ((bool)((QDirModel_Adaptor *)cls)->cbs_insertColumns_3713_1 (arg1, arg2, arg3));
 }
 
@@ -2690,9 +2690,9 @@ static void _call_cbs_insertRows_3713_1 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
-  int arg2 = args.read<int > (heap);
-  const QModelIndex &arg3 = args.read<const QModelIndex & > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
+  int arg2 = gsi::arg_reader<int >() (args, heap);
+  const QModelIndex &arg3 = args ? gsi::arg_reader<const QModelIndex & >() (args, heap) : gsi::arg_maker<const QModelIndex & >() (QModelIndex(), heap);
   ret.write<bool > ((bool)((QDirModel_Adaptor *)cls)->cbs_insertRows_3713_1 (arg1, arg2, arg3));
 }
 
@@ -2715,7 +2715,7 @@ static void _call_cbs_itemData_c2395_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
   ret.write<QMap<int, QVariant> > ((QMap<int, QVariant>)((QDirModel_Adaptor *)cls)->cbs_itemData_c2395_0 (arg1));
 }
 
@@ -2774,11 +2774,11 @@ static void _call_cbs_match_c7932_2 (const qt_gsi::GenericMethod * /*decl*/, voi
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
-  int arg2 = args.read<int > (heap);
-  const QVariant &arg3 = args.read<const QVariant & > (heap);
-  int arg4 = args.read<int > (heap);
-  QFlags<Qt::MatchFlag> arg5 = args.read<QFlags<Qt::MatchFlag> > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
+  int arg2 = gsi::arg_reader<int >() (args, heap);
+  const QVariant &arg3 = gsi::arg_reader<const QVariant & >() (args, heap);
+  int arg4 = args ? gsi::arg_reader<int >() (args, heap) : gsi::arg_maker<int >() (1, heap);
+  QFlags<Qt::MatchFlag> arg5 = args ? gsi::arg_reader<QFlags<Qt::MatchFlag> >() (args, heap) : gsi::arg_maker<QFlags<Qt::MatchFlag> >() (Qt::MatchFlags(Qt::MatchStartsWith|Qt::MatchWrap), heap);
   ret.write<QList<QModelIndex> > ((QList<QModelIndex>)((QDirModel_Adaptor *)cls)->cbs_match_c7932_2 (arg1, arg2, arg3, arg4, arg5));
 }
 
@@ -2801,7 +2801,7 @@ static void _call_cbs_mimeData_c3010_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QList<QModelIndex> &arg1 = args.read<const QList<QModelIndex> & > (heap);
+  const QList<QModelIndex> &arg1 = gsi::arg_reader<const QList<QModelIndex> & >() (args, heap);
   ret.write<QMimeData * > ((QMimeData *)((QDirModel_Adaptor *)cls)->cbs_mimeData_c3010_0 (arg1));
 }
 
@@ -2843,7 +2843,7 @@ static void _call_cbs_parent_c2395_0 (const qt_gsi::GenericMethod * /*decl*/, vo
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
   ret.write<QModelIndex > ((QModelIndex)((QDirModel_Adaptor *)cls)->cbs_parent_c2395_0 (arg1));
 }
 
@@ -2902,9 +2902,9 @@ static void _call_cbs_removeColumns_3713_1 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
-  int arg2 = args.read<int > (heap);
-  const QModelIndex &arg3 = args.read<const QModelIndex & > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
+  int arg2 = gsi::arg_reader<int >() (args, heap);
+  const QModelIndex &arg3 = args ? gsi::arg_reader<const QModelIndex & >() (args, heap) : gsi::arg_maker<const QModelIndex & >() (QModelIndex(), heap);
   ret.write<bool > ((bool)((QDirModel_Adaptor *)cls)->cbs_removeColumns_3713_1 (arg1, arg2, arg3));
 }
 
@@ -2931,9 +2931,9 @@ static void _call_cbs_removeRows_3713_1 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
-  int arg2 = args.read<int > (heap);
-  const QModelIndex &arg3 = args.read<const QModelIndex & > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
+  int arg2 = gsi::arg_reader<int >() (args, heap);
+  const QModelIndex &arg3 = args ? gsi::arg_reader<const QModelIndex & >() (args, heap) : gsi::arg_maker<const QModelIndex & >() (QModelIndex(), heap);
   ret.write<bool > ((bool)((QDirModel_Adaptor *)cls)->cbs_removeRows_3713_1 (arg1, arg2, arg3));
 }
 
@@ -2991,7 +2991,7 @@ static void _call_cbs_rowCount_c2395_1 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
+  const QModelIndex &arg1 = args ? gsi::arg_reader<const QModelIndex & >() (args, heap) : gsi::arg_maker<const QModelIndex & >() (QModelIndex(), heap);
   ret.write<int > ((int)((QDirModel_Adaptor *)cls)->cbs_rowCount_c2395_1 (arg1));
 }
 
@@ -3032,9 +3032,9 @@ static void _call_cbs_setData_5065_1 (const qt_gsi::GenericMethod * /*decl*/, vo
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
-  const QVariant &arg2 = args.read<const QVariant & > (heap);
-  int arg3 = args.read<int > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
+  const QVariant &arg2 = gsi::arg_reader<const QVariant & >() (args, heap);
+  int arg3 = args ? gsi::arg_reader<int >() (args, heap) : gsi::arg_maker<int >() (Qt::EditRole, heap);
   ret.write<bool > ((bool)((QDirModel_Adaptor *)cls)->cbs_setData_5065_1 (arg1, arg2, arg3));
 }
 
@@ -3063,10 +3063,10 @@ static void _call_cbs_setHeaderData_5242_1 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
-  const qt_gsi::Converter<Qt::Orientation>::target_type & arg2 = args.read<const qt_gsi::Converter<Qt::Orientation>::target_type & > (heap);
-  const QVariant &arg3 = args.read<const QVariant & > (heap);
-  int arg4 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
+  const qt_gsi::Converter<Qt::Orientation>::target_type & arg2 = gsi::arg_reader<const qt_gsi::Converter<Qt::Orientation>::target_type & >() (args, heap);
+  const QVariant &arg3 = gsi::arg_reader<const QVariant & >() (args, heap);
+  int arg4 = args ? gsi::arg_reader<int >() (args, heap) : gsi::arg_maker<int >() (Qt::EditRole, heap);
   ret.write<bool > ((bool)((QDirModel_Adaptor *)cls)->cbs_setHeaderData_5242_1 (arg1, arg2, arg3, arg4));
 }
 
@@ -3091,8 +3091,8 @@ static void _call_cbs_setItemData_5414_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
-  const QMap<int, QVariant> &arg2 = args.read<const QMap<int, QVariant> & > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
+  const QMap<int, QVariant> &arg2 = gsi::arg_reader<const QMap<int, QVariant> & >() (args, heap);
   ret.write<bool > ((bool)((QDirModel_Adaptor *)cls)->cbs_setItemData_5414_0 (arg1, arg2));
 }
 
@@ -3136,8 +3136,8 @@ static void _call_cbs_sort_2340_1 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
-  const qt_gsi::Converter<Qt::SortOrder>::target_type & arg2 = args.read<const qt_gsi::Converter<Qt::SortOrder>::target_type & > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
+  const qt_gsi::Converter<Qt::SortOrder>::target_type & arg2 = args ? gsi::arg_reader<const qt_gsi::Converter<Qt::SortOrder>::target_type & >() (args, heap) : gsi::arg_maker<const qt_gsi::Converter<Qt::SortOrder>::target_type & >() (qt_gsi::CppToQtReadAdaptor<Qt::SortOrder>(heap, Qt::AscendingOrder), heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDirModel_Adaptor *)cls)->cbs_sort_2340_1 (arg1, arg2);
 }
@@ -3161,7 +3161,7 @@ static void _call_cbs_span_c2395_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
   ret.write<QSize > ((QSize)((QDirModel_Adaptor *)cls)->cbs_span_c2395_0 (arg1));
 }
 
@@ -3222,7 +3222,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDirModel_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }

src/gsiqt/qt4/QtGui/gsiDeclQDockWidget.cc

@@ -1370,7 +1370,7 @@ static void _call_cbs_actionEvent_1823_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QActionEvent *arg1 = args.read<QActionEvent * > (heap);
+  QActionEvent *arg1 = gsi::arg_reader<QActionEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDockWidget_Adaptor *)cls)->cbs_actionEvent_1823_0 (arg1);
 }
@@ -1412,7 +1412,7 @@ static void _call_cbs_changeEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDockWidget_Adaptor *)cls)->cbs_changeEvent_1217_0 (arg1);
 }
@@ -1436,7 +1436,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDockWidget_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -1460,7 +1460,7 @@ static void _call_cbs_closeEvent_1719_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QCloseEvent *arg1 = args.read<QCloseEvent * > (heap);
+  QCloseEvent *arg1 = gsi::arg_reader<QCloseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDockWidget_Adaptor *)cls)->cbs_closeEvent_1719_0 (arg1);
 }
@@ -1484,7 +1484,7 @@ static void _call_cbs_contextMenuEvent_2363_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QContextMenuEvent *arg1 = args.read<QContextMenuEvent * > (heap);
+  QContextMenuEvent *arg1 = gsi::arg_reader<QContextMenuEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDockWidget_Adaptor *)cls)->cbs_contextMenuEvent_2363_0 (arg1);
 }
@@ -1551,7 +1551,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDockWidget_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -1615,7 +1615,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDockWidget_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -1657,7 +1657,7 @@ static void _call_cbs_dragEnterEvent_2109_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragEnterEvent *arg1 = args.read<QDragEnterEvent * > (heap);
+  QDragEnterEvent *arg1 = gsi::arg_reader<QDragEnterEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDockWidget_Adaptor *)cls)->cbs_dragEnterEvent_2109_0 (arg1);
 }
@@ -1681,7 +1681,7 @@ static void _call_cbs_dragLeaveEvent_2092_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragLeaveEvent *arg1 = args.read<QDragLeaveEvent * > (heap);
+  QDragLeaveEvent *arg1 = gsi::arg_reader<QDragLeaveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDockWidget_Adaptor *)cls)->cbs_dragLeaveEvent_2092_0 (arg1);
 }
@@ -1705,7 +1705,7 @@ static void _call_cbs_dragMoveEvent_2006_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragMoveEvent *arg1 = args.read<QDragMoveEvent * > (heap);
+  QDragMoveEvent *arg1 = gsi::arg_reader<QDragMoveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDockWidget_Adaptor *)cls)->cbs_dragMoveEvent_2006_0 (arg1);
 }
@@ -1729,7 +1729,7 @@ static void _call_cbs_dropEvent_1622_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDropEvent *arg1 = args.read<QDropEvent * > (heap);
+  QDropEvent *arg1 = gsi::arg_reader<QDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDockWidget_Adaptor *)cls)->cbs_dropEvent_1622_0 (arg1);
 }
@@ -1753,7 +1753,7 @@ static void _call_cbs_enabledChange_864_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDockWidget_Adaptor *)cls)->cbs_enabledChange_864_0 (arg1);
 }
@@ -1777,7 +1777,7 @@ static void _call_cbs_enterEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDockWidget_Adaptor *)cls)->cbs_enterEvent_1217_0 (arg1);
 }
@@ -1801,7 +1801,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QDockWidget_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -1826,8 +1826,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QDockWidget_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -1868,7 +1868,7 @@ static void _call_cbs_focusInEvent_1729_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDockWidget_Adaptor *)cls)->cbs_focusInEvent_1729_0 (arg1);
 }
@@ -1906,7 +1906,7 @@ static void _call_cbs_focusNextPrevChild_864_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   ret.write<bool > ((bool)((QDockWidget_Adaptor *)cls)->cbs_focusNextPrevChild_864_0 (arg1));
 }
 
@@ -1929,7 +1929,7 @@ static void _call_cbs_focusOutEvent_1729_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDockWidget_Adaptor *)cls)->cbs_focusOutEvent_1729_0 (arg1);
 }
@@ -1967,7 +1967,7 @@ static void _call_cbs_fontChange_1801_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QFont &arg1 = args.read<const QFont & > (heap);
+  const QFont &arg1 = gsi::arg_reader<const QFont & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDockWidget_Adaptor *)cls)->cbs_fontChange_1801_0 (arg1);
 }
@@ -1991,7 +1991,7 @@ static void _call_cbs_heightForWidth_c767_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   ret.write<int > ((int)((QDockWidget_Adaptor *)cls)->cbs_heightForWidth_c767_0 (arg1));
 }
 
@@ -2014,7 +2014,7 @@ static void _call_cbs_hideEvent_1595_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QHideEvent *arg1 = args.read<QHideEvent * > (heap);
+  QHideEvent *arg1 = gsi::arg_reader<QHideEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDockWidget_Adaptor *)cls)->cbs_hideEvent_1595_0 (arg1);
 }
@@ -2057,7 +2057,7 @@ static void _call_cbs_inputMethodEvent_2354_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QInputMethodEvent *arg1 = args.read<QInputMethodEvent * > (heap);
+  QInputMethodEvent *arg1 = gsi::arg_reader<QInputMethodEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDockWidget_Adaptor *)cls)->cbs_inputMethodEvent_2354_0 (arg1);
 }
@@ -2081,7 +2081,7 @@ static void _call_cbs_inputMethodQuery_c2420_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = args.read<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & > (heap);
+  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & >() (args, heap);
   ret.write<QVariant > ((QVariant)((QDockWidget_Adaptor *)cls)->cbs_inputMethodQuery_c2420_0 (arg1));
 }
 
@@ -2104,7 +2104,7 @@ static void _call_cbs_keyPressEvent_1514_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDockWidget_Adaptor *)cls)->cbs_keyPressEvent_1514_0 (arg1);
 }
@@ -2128,7 +2128,7 @@ static void _call_cbs_keyReleaseEvent_1514_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDockWidget_Adaptor *)cls)->cbs_keyReleaseEvent_1514_0 (arg1);
 }
@@ -2172,7 +2172,7 @@ static void _call_cbs_leaveEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDockWidget_Adaptor *)cls)->cbs_leaveEvent_1217_0 (arg1);
 }
@@ -2196,7 +2196,7 @@ static void _call_cbs_metric_c3445_0 (const qt_gsi::GenericMethod * /*decl*/, vo
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & arg1 = args.read<const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & > (heap);
+  const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & >() (args, heap);
   ret.write<int > ((int)((QDockWidget_Adaptor *)cls)->cbs_metric_c3445_0 (arg1));
 }
 
@@ -2238,7 +2238,7 @@ static void _call_cbs_mouseDoubleClickEvent_1738_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDockWidget_Adaptor *)cls)->cbs_mouseDoubleClickEvent_1738_0 (arg1);
 }
@@ -2262,7 +2262,7 @@ static void _call_cbs_mouseMoveEvent_1738_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDockWidget_Adaptor *)cls)->cbs_mouseMoveEvent_1738_0 (arg1);
 }
@@ -2286,7 +2286,7 @@ static void _call_cbs_mousePressEvent_1738_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDockWidget_Adaptor *)cls)->cbs_mousePressEvent_1738_0 (arg1);
 }
@@ -2310,7 +2310,7 @@ static void _call_cbs_mouseReleaseEvent_1738_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDockWidget_Adaptor *)cls)->cbs_mouseReleaseEvent_1738_0 (arg1);
 }
@@ -2334,7 +2334,7 @@ static void _call_cbs_moveEvent_1624_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMoveEvent *arg1 = args.read<QMoveEvent * > (heap);
+  QMoveEvent *arg1 = gsi::arg_reader<QMoveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDockWidget_Adaptor *)cls)->cbs_moveEvent_1624_0 (arg1);
 }
@@ -2377,7 +2377,7 @@ static void _call_cbs_paintEvent_1725_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QPaintEvent *arg1 = args.read<QPaintEvent * > (heap);
+  QPaintEvent *arg1 = gsi::arg_reader<QPaintEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDockWidget_Adaptor *)cls)->cbs_paintEvent_1725_0 (arg1);
 }
@@ -2401,7 +2401,7 @@ static void _call_cbs_paletteChange_2113_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QPalette &arg1 = args.read<const QPalette & > (heap);
+  const QPalette &arg1 = gsi::arg_reader<const QPalette & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDockWidget_Adaptor *)cls)->cbs_paletteChange_2113_0 (arg1);
 }
@@ -2458,7 +2458,7 @@ static void _call_cbs_resizeEvent_1843_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QResizeEvent *arg1 = args.read<QResizeEvent * > (heap);
+  QResizeEvent *arg1 = gsi::arg_reader<QResizeEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDockWidget_Adaptor *)cls)->cbs_resizeEvent_1843_0 (arg1);
 }
@@ -2496,7 +2496,7 @@ static void _call_cbs_setVisible_864_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDockWidget_Adaptor *)cls)->cbs_setVisible_864_0 (arg1);
 }
@@ -2520,7 +2520,7 @@ static void _call_cbs_showEvent_1634_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QShowEvent *arg1 = args.read<QShowEvent * > (heap);
+  QShowEvent *arg1 = gsi::arg_reader<QShowEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDockWidget_Adaptor *)cls)->cbs_showEvent_1634_0 (arg1);
 }
@@ -2563,7 +2563,7 @@ static void _call_cbs_styleChange_1228_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QStyle &arg1 = args.read<QStyle & > (heap);
+  QStyle &arg1 = gsi::arg_reader<QStyle & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDockWidget_Adaptor *)cls)->cbs_styleChange_1228_0 (arg1);
 }
@@ -2587,7 +2587,7 @@ static void _call_cbs_tabletEvent_1821_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTabletEvent *arg1 = args.read<QTabletEvent * > (heap);
+  QTabletEvent *arg1 = gsi::arg_reader<QTabletEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDockWidget_Adaptor *)cls)->cbs_tabletEvent_1821_0 (arg1);
 }
@@ -2611,7 +2611,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDockWidget_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }
@@ -2686,7 +2686,7 @@ static void _call_cbs_wheelEvent_1718_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QWheelEvent *arg1 = args.read<QWheelEvent * > (heap);
+  QWheelEvent *arg1 = gsi::arg_reader<QWheelEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDockWidget_Adaptor *)cls)->cbs_wheelEvent_1718_0 (arg1);
 }
@@ -2710,7 +2710,7 @@ static void _call_cbs_windowActivationChange_864_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDockWidget_Adaptor *)cls)->cbs_windowActivationChange_864_0 (arg1);
 }

src/gsiqt/qt4/QtGui/gsiDeclQDoubleSpinBox.cc

@@ -1590,7 +1590,7 @@ static void _call_cbs_actionEvent_1823_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QActionEvent *arg1 = args.read<QActionEvent * > (heap);
+  QActionEvent *arg1 = gsi::arg_reader<QActionEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDoubleSpinBox_Adaptor *)cls)->cbs_actionEvent_1823_0 (arg1);
 }
@@ -1614,7 +1614,7 @@ static void _call_cbs_changeEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDoubleSpinBox_Adaptor *)cls)->cbs_changeEvent_1217_0 (arg1);
 }
@@ -1638,7 +1638,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDoubleSpinBox_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -1682,7 +1682,7 @@ static void _call_cbs_closeEvent_1719_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QCloseEvent *arg1 = args.read<QCloseEvent * > (heap);
+  QCloseEvent *arg1 = gsi::arg_reader<QCloseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDoubleSpinBox_Adaptor *)cls)->cbs_closeEvent_1719_0 (arg1);
 }
@@ -1706,7 +1706,7 @@ static void _call_cbs_contextMenuEvent_2363_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QContextMenuEvent *arg1 = args.read<QContextMenuEvent * > (heap);
+  QContextMenuEvent *arg1 = gsi::arg_reader<QContextMenuEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDoubleSpinBox_Adaptor *)cls)->cbs_contextMenuEvent_2363_0 (arg1);
 }
@@ -1773,7 +1773,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDoubleSpinBox_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -1837,7 +1837,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDoubleSpinBox_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -1861,7 +1861,7 @@ static void _call_cbs_dragEnterEvent_2109_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragEnterEvent *arg1 = args.read<QDragEnterEvent * > (heap);
+  QDragEnterEvent *arg1 = gsi::arg_reader<QDragEnterEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDoubleSpinBox_Adaptor *)cls)->cbs_dragEnterEvent_2109_0 (arg1);
 }
@@ -1885,7 +1885,7 @@ static void _call_cbs_dragLeaveEvent_2092_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragLeaveEvent *arg1 = args.read<QDragLeaveEvent * > (heap);
+  QDragLeaveEvent *arg1 = gsi::arg_reader<QDragLeaveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDoubleSpinBox_Adaptor *)cls)->cbs_dragLeaveEvent_2092_0 (arg1);
 }
@@ -1909,7 +1909,7 @@ static void _call_cbs_dragMoveEvent_2006_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragMoveEvent *arg1 = args.read<QDragMoveEvent * > (heap);
+  QDragMoveEvent *arg1 = gsi::arg_reader<QDragMoveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDoubleSpinBox_Adaptor *)cls)->cbs_dragMoveEvent_2006_0 (arg1);
 }
@@ -1933,7 +1933,7 @@ static void _call_cbs_dropEvent_1622_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDropEvent *arg1 = args.read<QDropEvent * > (heap);
+  QDropEvent *arg1 = gsi::arg_reader<QDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDoubleSpinBox_Adaptor *)cls)->cbs_dropEvent_1622_0 (arg1);
 }
@@ -1971,7 +1971,7 @@ static void _call_cbs_enabledChange_864_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDoubleSpinBox_Adaptor *)cls)->cbs_enabledChange_864_0 (arg1);
 }
@@ -1995,7 +1995,7 @@ static void _call_cbs_enterEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDoubleSpinBox_Adaptor *)cls)->cbs_enterEvent_1217_0 (arg1);
 }
@@ -2019,7 +2019,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QDoubleSpinBox_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -2044,8 +2044,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QDoubleSpinBox_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -2068,7 +2068,7 @@ static void _call_cbs_fixup_c1330_0 (const qt_gsi::GenericMethod * /*decl*/, voi
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QString &arg1 = args.read<QString & > (heap);
+  QString &arg1 = gsi::arg_reader<QString & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDoubleSpinBox_Adaptor *)cls)->cbs_fixup_c1330_0 (arg1);
 }
@@ -2092,7 +2092,7 @@ static void _call_cbs_focusInEvent_1729_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDoubleSpinBox_Adaptor *)cls)->cbs_focusInEvent_1729_0 (arg1);
 }
@@ -2130,7 +2130,7 @@ static void _call_cbs_focusNextPrevChild_864_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   ret.write<bool > ((bool)((QDoubleSpinBox_Adaptor *)cls)->cbs_focusNextPrevChild_864_0 (arg1));
 }
 
@@ -2153,7 +2153,7 @@ static void _call_cbs_focusOutEvent_1729_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDoubleSpinBox_Adaptor *)cls)->cbs_focusOutEvent_1729_0 (arg1);
 }
@@ -2191,7 +2191,7 @@ static void _call_cbs_fontChange_1801_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QFont &arg1 = args.read<const QFont & > (heap);
+  const QFont &arg1 = gsi::arg_reader<const QFont & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDoubleSpinBox_Adaptor *)cls)->cbs_fontChange_1801_0 (arg1);
 }
@@ -2215,7 +2215,7 @@ static void _call_cbs_heightForWidth_c767_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   ret.write<int > ((int)((QDoubleSpinBox_Adaptor *)cls)->cbs_heightForWidth_c767_0 (arg1));
 }
 
@@ -2238,7 +2238,7 @@ static void _call_cbs_hideEvent_1595_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QHideEvent *arg1 = args.read<QHideEvent * > (heap);
+  QHideEvent *arg1 = gsi::arg_reader<QHideEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDoubleSpinBox_Adaptor *)cls)->cbs_hideEvent_1595_0 (arg1);
 }
@@ -2281,7 +2281,7 @@ static void _call_cbs_inputMethodEvent_2354_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QInputMethodEvent *arg1 = args.read<QInputMethodEvent * > (heap);
+  QInputMethodEvent *arg1 = gsi::arg_reader<QInputMethodEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDoubleSpinBox_Adaptor *)cls)->cbs_inputMethodEvent_2354_0 (arg1);
 }
@@ -2305,7 +2305,7 @@ static void _call_cbs_inputMethodQuery_c2420_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = args.read<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & > (heap);
+  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & >() (args, heap);
   ret.write<QVariant > ((QVariant)((QDoubleSpinBox_Adaptor *)cls)->cbs_inputMethodQuery_c2420_0 (arg1));
 }
 
@@ -2328,7 +2328,7 @@ static void _call_cbs_keyPressEvent_1514_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDoubleSpinBox_Adaptor *)cls)->cbs_keyPressEvent_1514_0 (arg1);
 }
@@ -2352,7 +2352,7 @@ static void _call_cbs_keyReleaseEvent_1514_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDoubleSpinBox_Adaptor *)cls)->cbs_keyReleaseEvent_1514_0 (arg1);
 }
@@ -2396,7 +2396,7 @@ static void _call_cbs_leaveEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDoubleSpinBox_Adaptor *)cls)->cbs_leaveEvent_1217_0 (arg1);
 }
@@ -2434,7 +2434,7 @@ static void _call_cbs_metric_c3445_0 (const qt_gsi::GenericMethod * /*decl*/, vo
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & arg1 = args.read<const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & > (heap);
+  const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & >() (args, heap);
   ret.write<int > ((int)((QDoubleSpinBox_Adaptor *)cls)->cbs_metric_c3445_0 (arg1));
 }
 
@@ -2476,7 +2476,7 @@ static void _call_cbs_mouseDoubleClickEvent_1738_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDoubleSpinBox_Adaptor *)cls)->cbs_mouseDoubleClickEvent_1738_0 (arg1);
 }
@@ -2500,7 +2500,7 @@ static void _call_cbs_mouseMoveEvent_1738_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDoubleSpinBox_Adaptor *)cls)->cbs_mouseMoveEvent_1738_0 (arg1);
 }
@@ -2524,7 +2524,7 @@ static void _call_cbs_mousePressEvent_1738_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDoubleSpinBox_Adaptor *)cls)->cbs_mousePressEvent_1738_0 (arg1);
 }
@@ -2548,7 +2548,7 @@ static void _call_cbs_mouseReleaseEvent_1738_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDoubleSpinBox_Adaptor *)cls)->cbs_mouseReleaseEvent_1738_0 (arg1);
 }
@@ -2572,7 +2572,7 @@ static void _call_cbs_moveEvent_1624_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMoveEvent *arg1 = args.read<QMoveEvent * > (heap);
+  QMoveEvent *arg1 = gsi::arg_reader<QMoveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDoubleSpinBox_Adaptor *)cls)->cbs_moveEvent_1624_0 (arg1);
 }
@@ -2615,7 +2615,7 @@ static void _call_cbs_paintEvent_1725_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QPaintEvent *arg1 = args.read<QPaintEvent * > (heap);
+  QPaintEvent *arg1 = gsi::arg_reader<QPaintEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDoubleSpinBox_Adaptor *)cls)->cbs_paintEvent_1725_0 (arg1);
 }
@@ -2639,7 +2639,7 @@ static void _call_cbs_paletteChange_2113_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QPalette &arg1 = args.read<const QPalette & > (heap);
+  const QPalette &arg1 = gsi::arg_reader<const QPalette & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDoubleSpinBox_Adaptor *)cls)->cbs_paletteChange_2113_0 (arg1);
 }
@@ -2696,7 +2696,7 @@ static void _call_cbs_resizeEvent_1843_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QResizeEvent *arg1 = args.read<QResizeEvent * > (heap);
+  QResizeEvent *arg1 = gsi::arg_reader<QResizeEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDoubleSpinBox_Adaptor *)cls)->cbs_resizeEvent_1843_0 (arg1);
 }
@@ -2753,7 +2753,7 @@ static void _call_cbs_setVisible_864_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDoubleSpinBox_Adaptor *)cls)->cbs_setVisible_864_0 (arg1);
 }
@@ -2777,7 +2777,7 @@ static void _call_cbs_showEvent_1634_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QShowEvent *arg1 = args.read<QShowEvent * > (heap);
+  QShowEvent *arg1 = gsi::arg_reader<QShowEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDoubleSpinBox_Adaptor *)cls)->cbs_showEvent_1634_0 (arg1);
 }
@@ -2820,7 +2820,7 @@ static void _call_cbs_stepBy_767_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDoubleSpinBox_Adaptor *)cls)->cbs_stepBy_767_0 (arg1);
 }
@@ -2863,7 +2863,7 @@ static void _call_cbs_styleChange_1228_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QStyle &arg1 = args.read<QStyle & > (heap);
+  QStyle &arg1 = gsi::arg_reader<QStyle & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDoubleSpinBox_Adaptor *)cls)->cbs_styleChange_1228_0 (arg1);
 }
@@ -2887,7 +2887,7 @@ static void _call_cbs_tabletEvent_1821_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTabletEvent *arg1 = args.read<QTabletEvent * > (heap);
+  QTabletEvent *arg1 = gsi::arg_reader<QTabletEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDoubleSpinBox_Adaptor *)cls)->cbs_tabletEvent_1821_0 (arg1);
 }
@@ -2911,7 +2911,7 @@ static void _call_cbs_textFromValue_c1071_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  double arg1 = args.read<double > (heap);
+  double arg1 = gsi::arg_reader<double >() (args, heap);
   ret.write<QString > ((QString)((QDoubleSpinBox_Adaptor *)cls)->cbs_textFromValue_c1071_0 (arg1));
 }
 
@@ -2934,7 +2934,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDoubleSpinBox_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }
@@ -2975,8 +2975,8 @@ static void _call_cbs_validate_c2171_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QString &arg1 = args.read<QString & > (heap);
-  int &arg2 = args.read<int & > (heap);
+  QString &arg1 = gsi::arg_reader<QString & >() (args, heap);
+  int &arg2 = gsi::arg_reader<int & >() (args, heap);
   ret.write<qt_gsi::Converter<QValidator::State>::target_type > ((qt_gsi::Converter<QValidator::State>::target_type)((QDoubleSpinBox_Adaptor *)cls)->cbs_validate_c2171_0 (arg1, arg2));
 }
 
@@ -3035,7 +3035,7 @@ static void _call_cbs_valueFromText_c2025_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QString &arg1 = args.read<const QString & > (heap);
+  const QString &arg1 = gsi::arg_reader<const QString & >() (args, heap);
   ret.write<double > ((double)((QDoubleSpinBox_Adaptor *)cls)->cbs_valueFromText_c2025_0 (arg1));
 }
 
@@ -3058,7 +3058,7 @@ static void _call_cbs_wheelEvent_1718_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QWheelEvent *arg1 = args.read<QWheelEvent * > (heap);
+  QWheelEvent *arg1 = gsi::arg_reader<QWheelEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDoubleSpinBox_Adaptor *)cls)->cbs_wheelEvent_1718_0 (arg1);
 }
@@ -3082,7 +3082,7 @@ static void _call_cbs_windowActivationChange_864_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDoubleSpinBox_Adaptor *)cls)->cbs_windowActivationChange_864_0 (arg1);
 }

src/gsiqt/qt4/QtGui/gsiDeclQDoubleValidator.cc

@@ -611,7 +611,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDoubleValidator_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -635,7 +635,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDoubleValidator_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -677,7 +677,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDoubleValidator_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -701,7 +701,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QDoubleValidator_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -726,8 +726,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QDoubleValidator_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -750,7 +750,7 @@ static void _call_cbs_fixup_c1330_0 (const qt_gsi::GenericMethod * /*decl*/, voi
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QString &arg1 = args.read<QString & > (heap);
+  QString &arg1 = gsi::arg_reader<QString & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDoubleValidator_Adaptor *)cls)->cbs_fixup_c1330_0 (arg1);
 }
@@ -810,9 +810,9 @@ static void _call_cbs_setRange_2693_1 (const qt_gsi::GenericMethod * /*decl*/, v
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  double arg1 = args.read<double > (heap);
-  double arg2 = args.read<double > (heap);
-  int arg3 = args.read<int > (heap);
+  double arg1 = gsi::arg_reader<double >() (args, heap);
+  double arg2 = gsi::arg_reader<double >() (args, heap);
+  int arg3 = args ? gsi::arg_reader<int >() (args, heap) : gsi::arg_maker<int >() (0, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDoubleValidator_Adaptor *)cls)->cbs_setRange_2693_1 (arg1, arg2, arg3);
 }
@@ -836,7 +836,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDoubleValidator_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }
@@ -862,8 +862,8 @@ static void _call_cbs_validate_c2171_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QString &arg1 = args.read<QString & > (heap);
-  int &arg2 = args.read<int & > (heap);
+  QString &arg1 = gsi::arg_reader<QString & >() (args, heap);
+  int &arg2 = gsi::arg_reader<int & >() (args, heap);
   ret.write<qt_gsi::Converter<QValidator::State>::target_type > ((qt_gsi::Converter<QValidator::State>::target_type)((QDoubleValidator_Adaptor *)cls)->cbs_validate_c2171_0 (arg1, arg2));
 }
 

src/gsiqt/qt4/QtGui/gsiDeclQDrag.cc

@@ -597,7 +597,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDrag_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -621,7 +621,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDrag_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -663,7 +663,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDrag_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -687,7 +687,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QDrag_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -712,8 +712,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QDrag_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -786,7 +786,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QDrag_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }

src/gsiqt/qt4/QtGui/gsiDeclQDragEnterEvent.cc

@@ -165,7 +165,7 @@ static void _call_cbs_encodedData_c1731_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   ret.write<QByteArray > ((QByteArray)((QDragEnterEvent_Adaptor *)cls)->cbs_encodedData_c1731_0 (arg1));
 }
 
@@ -188,7 +188,7 @@ static void _call_cbs_format_c767_1 (const qt_gsi::GenericMethod * /*decl*/, voi
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = args ? gsi::arg_reader<int >() (args, heap) : gsi::arg_maker<int >() (0, heap);
   ret.write<const char * > ((const char *)((QDragEnterEvent_Adaptor *)cls)->cbs_format_c767_1 (arg1));
 }
 
@@ -211,7 +211,7 @@ static void _call_cbs_provides_c1731_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   ret.write<bool > ((bool)((QDragEnterEvent_Adaptor *)cls)->cbs_provides_c1731_0 (arg1));
 }
 

src/gsiqt/qt4/QtGui/gsiDeclQDragMoveEvent.cc

@@ -266,7 +266,7 @@ static void _call_cbs_encodedData_c1731_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   ret.write<QByteArray > ((QByteArray)((QDragMoveEvent_Adaptor *)cls)->cbs_encodedData_c1731_0 (arg1));
 }
 
@@ -289,7 +289,7 @@ static void _call_cbs_format_c767_1 (const qt_gsi::GenericMethod * /*decl*/, voi
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = args ? gsi::arg_reader<int >() (args, heap) : gsi::arg_maker<int >() (0, heap);
   ret.write<const char * > ((const char *)((QDragMoveEvent_Adaptor *)cls)->cbs_format_c767_1 (arg1));
 }
 
@@ -312,7 +312,7 @@ static void _call_cbs_provides_c1731_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   ret.write<bool > ((bool)((QDragMoveEvent_Adaptor *)cls)->cbs_provides_c1731_0 (arg1));
 }
 

src/gsiqt/qt4/QtGui/gsiDeclQDropEvent.cc

@@ -454,7 +454,7 @@ static void _call_cbs_encodedData_c1731_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   ret.write<QByteArray > ((QByteArray)((QDropEvent_Adaptor *)cls)->cbs_encodedData_c1731_0 (arg1));
 }
 
@@ -477,7 +477,7 @@ static void _call_cbs_format_c767_1 (const qt_gsi::GenericMethod * /*decl*/, voi
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = args ? gsi::arg_reader<int >() (args, heap) : gsi::arg_maker<int >() (0, heap);
   ret.write<const char * > ((const char *)((QDropEvent_Adaptor *)cls)->cbs_format_c767_1 (arg1));
 }
 
@@ -500,7 +500,7 @@ static void _call_cbs_provides_c1731_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   ret.write<bool > ((bool)((QDropEvent_Adaptor *)cls)->cbs_provides_c1731_0 (arg1));
 }
 

src/gsiqt/qt4/QtGui/gsiDeclQErrorMessage.cc

@@ -1226,7 +1226,7 @@ static void _call_cbs_actionEvent_1823_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QActionEvent *arg1 = args.read<QActionEvent * > (heap);
+  QActionEvent *arg1 = gsi::arg_reader<QActionEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QErrorMessage_Adaptor *)cls)->cbs_actionEvent_1823_0 (arg1);
 }
@@ -1269,7 +1269,7 @@ static void _call_cbs_changeEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QErrorMessage_Adaptor *)cls)->cbs_changeEvent_1217_0 (arg1);
 }
@@ -1293,7 +1293,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QErrorMessage_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -1317,7 +1317,7 @@ static void _call_cbs_closeEvent_1719_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QCloseEvent *arg1 = args.read<QCloseEvent * > (heap);
+  QCloseEvent *arg1 = gsi::arg_reader<QCloseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QErrorMessage_Adaptor *)cls)->cbs_closeEvent_1719_0 (arg1);
 }
@@ -1341,7 +1341,7 @@ static void _call_cbs_contextMenuEvent_2363_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QContextMenuEvent *arg1 = args.read<QContextMenuEvent * > (heap);
+  QContextMenuEvent *arg1 = gsi::arg_reader<QContextMenuEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QErrorMessage_Adaptor *)cls)->cbs_contextMenuEvent_2363_0 (arg1);
 }
@@ -1408,7 +1408,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QErrorMessage_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -1472,7 +1472,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QErrorMessage_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -1496,7 +1496,7 @@ static void _call_cbs_done_767_0 (const qt_gsi::GenericMethod * /*decl*/, void *
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QErrorMessage_Adaptor *)cls)->cbs_done_767_0 (arg1);
 }
@@ -1520,7 +1520,7 @@ static void _call_cbs_dragEnterEvent_2109_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragEnterEvent *arg1 = args.read<QDragEnterEvent * > (heap);
+  QDragEnterEvent *arg1 = gsi::arg_reader<QDragEnterEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QErrorMessage_Adaptor *)cls)->cbs_dragEnterEvent_2109_0 (arg1);
 }
@@ -1544,7 +1544,7 @@ static void _call_cbs_dragLeaveEvent_2092_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragLeaveEvent *arg1 = args.read<QDragLeaveEvent * > (heap);
+  QDragLeaveEvent *arg1 = gsi::arg_reader<QDragLeaveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QErrorMessage_Adaptor *)cls)->cbs_dragLeaveEvent_2092_0 (arg1);
 }
@@ -1568,7 +1568,7 @@ static void _call_cbs_dragMoveEvent_2006_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragMoveEvent *arg1 = args.read<QDragMoveEvent * > (heap);
+  QDragMoveEvent *arg1 = gsi::arg_reader<QDragMoveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QErrorMessage_Adaptor *)cls)->cbs_dragMoveEvent_2006_0 (arg1);
 }
@@ -1592,7 +1592,7 @@ static void _call_cbs_dropEvent_1622_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDropEvent *arg1 = args.read<QDropEvent * > (heap);
+  QDropEvent *arg1 = gsi::arg_reader<QDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QErrorMessage_Adaptor *)cls)->cbs_dropEvent_1622_0 (arg1);
 }
@@ -1616,7 +1616,7 @@ static void _call_cbs_enabledChange_864_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QErrorMessage_Adaptor *)cls)->cbs_enabledChange_864_0 (arg1);
 }
@@ -1640,7 +1640,7 @@ static void _call_cbs_enterEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QErrorMessage_Adaptor *)cls)->cbs_enterEvent_1217_0 (arg1);
 }
@@ -1664,7 +1664,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QErrorMessage_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -1689,8 +1689,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QErrorMessage_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -1731,7 +1731,7 @@ static void _call_cbs_focusInEvent_1729_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QErrorMessage_Adaptor *)cls)->cbs_focusInEvent_1729_0 (arg1);
 }
@@ -1769,7 +1769,7 @@ static void _call_cbs_focusNextPrevChild_864_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   ret.write<bool > ((bool)((QErrorMessage_Adaptor *)cls)->cbs_focusNextPrevChild_864_0 (arg1));
 }
 
@@ -1792,7 +1792,7 @@ static void _call_cbs_focusOutEvent_1729_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QErrorMessage_Adaptor *)cls)->cbs_focusOutEvent_1729_0 (arg1);
 }
@@ -1830,7 +1830,7 @@ static void _call_cbs_fontChange_1801_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QFont &arg1 = args.read<const QFont & > (heap);
+  const QFont &arg1 = gsi::arg_reader<const QFont & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QErrorMessage_Adaptor *)cls)->cbs_fontChange_1801_0 (arg1);
 }
@@ -1854,7 +1854,7 @@ static void _call_cbs_heightForWidth_c767_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   ret.write<int > ((int)((QErrorMessage_Adaptor *)cls)->cbs_heightForWidth_c767_0 (arg1));
 }
 
@@ -1877,7 +1877,7 @@ static void _call_cbs_hideEvent_1595_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QHideEvent *arg1 = args.read<QHideEvent * > (heap);
+  QHideEvent *arg1 = gsi::arg_reader<QHideEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QErrorMessage_Adaptor *)cls)->cbs_hideEvent_1595_0 (arg1);
 }
@@ -1901,7 +1901,7 @@ static void _call_cbs_inputMethodEvent_2354_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QInputMethodEvent *arg1 = args.read<QInputMethodEvent * > (heap);
+  QInputMethodEvent *arg1 = gsi::arg_reader<QInputMethodEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QErrorMessage_Adaptor *)cls)->cbs_inputMethodEvent_2354_0 (arg1);
 }
@@ -1925,7 +1925,7 @@ static void _call_cbs_inputMethodQuery_c2420_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = args.read<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & > (heap);
+  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & >() (args, heap);
   ret.write<QVariant > ((QVariant)((QErrorMessage_Adaptor *)cls)->cbs_inputMethodQuery_c2420_0 (arg1));
 }
 
@@ -1948,7 +1948,7 @@ static void _call_cbs_keyPressEvent_1514_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QErrorMessage_Adaptor *)cls)->cbs_keyPressEvent_1514_0 (arg1);
 }
@@ -1972,7 +1972,7 @@ static void _call_cbs_keyReleaseEvent_1514_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QErrorMessage_Adaptor *)cls)->cbs_keyReleaseEvent_1514_0 (arg1);
 }
@@ -2016,7 +2016,7 @@ static void _call_cbs_leaveEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QErrorMessage_Adaptor *)cls)->cbs_leaveEvent_1217_0 (arg1);
 }
@@ -2040,7 +2040,7 @@ static void _call_cbs_metric_c3445_0 (const qt_gsi::GenericMethod * /*decl*/, vo
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & arg1 = args.read<const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & > (heap);
+  const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & >() (args, heap);
   ret.write<int > ((int)((QErrorMessage_Adaptor *)cls)->cbs_metric_c3445_0 (arg1));
 }
 
@@ -2082,7 +2082,7 @@ static void _call_cbs_mouseDoubleClickEvent_1738_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QErrorMessage_Adaptor *)cls)->cbs_mouseDoubleClickEvent_1738_0 (arg1);
 }
@@ -2106,7 +2106,7 @@ static void _call_cbs_mouseMoveEvent_1738_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QErrorMessage_Adaptor *)cls)->cbs_mouseMoveEvent_1738_0 (arg1);
 }
@@ -2130,7 +2130,7 @@ static void _call_cbs_mousePressEvent_1738_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QErrorMessage_Adaptor *)cls)->cbs_mousePressEvent_1738_0 (arg1);
 }
@@ -2154,7 +2154,7 @@ static void _call_cbs_mouseReleaseEvent_1738_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QErrorMessage_Adaptor *)cls)->cbs_mouseReleaseEvent_1738_0 (arg1);
 }
@@ -2178,7 +2178,7 @@ static void _call_cbs_moveEvent_1624_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMoveEvent *arg1 = args.read<QMoveEvent * > (heap);
+  QMoveEvent *arg1 = gsi::arg_reader<QMoveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QErrorMessage_Adaptor *)cls)->cbs_moveEvent_1624_0 (arg1);
 }
@@ -2221,7 +2221,7 @@ static void _call_cbs_paintEvent_1725_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QPaintEvent *arg1 = args.read<QPaintEvent * > (heap);
+  QPaintEvent *arg1 = gsi::arg_reader<QPaintEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QErrorMessage_Adaptor *)cls)->cbs_paintEvent_1725_0 (arg1);
 }
@@ -2245,7 +2245,7 @@ static void _call_cbs_paletteChange_2113_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QPalette &arg1 = args.read<const QPalette & > (heap);
+  const QPalette &arg1 = gsi::arg_reader<const QPalette & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QErrorMessage_Adaptor *)cls)->cbs_paletteChange_2113_0 (arg1);
 }
@@ -2336,7 +2336,7 @@ static void _call_cbs_resizeEvent_1843_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QResizeEvent *arg1 = args.read<QResizeEvent * > (heap);
+  QResizeEvent *arg1 = gsi::arg_reader<QResizeEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QErrorMessage_Adaptor *)cls)->cbs_resizeEvent_1843_0 (arg1);
 }
@@ -2374,7 +2374,7 @@ static void _call_cbs_setVisible_864_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QErrorMessage_Adaptor *)cls)->cbs_setVisible_864_0 (arg1);
 }
@@ -2398,7 +2398,7 @@ static void _call_cbs_showEvent_1634_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QShowEvent *arg1 = args.read<QShowEvent * > (heap);
+  QShowEvent *arg1 = gsi::arg_reader<QShowEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QErrorMessage_Adaptor *)cls)->cbs_showEvent_1634_0 (arg1);
 }
@@ -2441,7 +2441,7 @@ static void _call_cbs_styleChange_1228_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QStyle &arg1 = args.read<QStyle & > (heap);
+  QStyle &arg1 = gsi::arg_reader<QStyle & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QErrorMessage_Adaptor *)cls)->cbs_styleChange_1228_0 (arg1);
 }
@@ -2465,7 +2465,7 @@ static void _call_cbs_tabletEvent_1821_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTabletEvent *arg1 = args.read<QTabletEvent * > (heap);
+  QTabletEvent *arg1 = gsi::arg_reader<QTabletEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QErrorMessage_Adaptor *)cls)->cbs_tabletEvent_1821_0 (arg1);
 }
@@ -2489,7 +2489,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QErrorMessage_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }
@@ -2528,7 +2528,7 @@ static void _call_cbs_wheelEvent_1718_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QWheelEvent *arg1 = args.read<QWheelEvent * > (heap);
+  QWheelEvent *arg1 = gsi::arg_reader<QWheelEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QErrorMessage_Adaptor *)cls)->cbs_wheelEvent_1718_0 (arg1);
 }
@@ -2552,7 +2552,7 @@ static void _call_cbs_windowActivationChange_864_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QErrorMessage_Adaptor *)cls)->cbs_windowActivationChange_864_0 (arg1);
 }

src/gsiqt/qt4/QtGui/gsiDeclQFileDialog.cc

@@ -2419,7 +2419,7 @@ static void _call_cbs_actionEvent_1823_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QActionEvent *arg1 = args.read<QActionEvent * > (heap);
+  QActionEvent *arg1 = gsi::arg_reader<QActionEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFileDialog_Adaptor *)cls)->cbs_actionEvent_1823_0 (arg1);
 }
@@ -2462,7 +2462,7 @@ static void _call_cbs_changeEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFileDialog_Adaptor *)cls)->cbs_changeEvent_1217_0 (arg1);
 }
@@ -2486,7 +2486,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFileDialog_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -2510,7 +2510,7 @@ static void _call_cbs_closeEvent_1719_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QCloseEvent *arg1 = args.read<QCloseEvent * > (heap);
+  QCloseEvent *arg1 = gsi::arg_reader<QCloseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFileDialog_Adaptor *)cls)->cbs_closeEvent_1719_0 (arg1);
 }
@@ -2534,7 +2534,7 @@ static void _call_cbs_contextMenuEvent_2363_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QContextMenuEvent *arg1 = args.read<QContextMenuEvent * > (heap);
+  QContextMenuEvent *arg1 = gsi::arg_reader<QContextMenuEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFileDialog_Adaptor *)cls)->cbs_contextMenuEvent_2363_0 (arg1);
 }
@@ -2619,7 +2619,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFileDialog_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -2701,7 +2701,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFileDialog_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -2725,7 +2725,7 @@ static void _call_cbs_done_767_0 (const qt_gsi::GenericMethod * /*decl*/, void *
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFileDialog_Adaptor *)cls)->cbs_done_767_0 (arg1);
 }
@@ -2749,7 +2749,7 @@ static void _call_cbs_dragEnterEvent_2109_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragEnterEvent *arg1 = args.read<QDragEnterEvent * > (heap);
+  QDragEnterEvent *arg1 = gsi::arg_reader<QDragEnterEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFileDialog_Adaptor *)cls)->cbs_dragEnterEvent_2109_0 (arg1);
 }
@@ -2773,7 +2773,7 @@ static void _call_cbs_dragLeaveEvent_2092_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragLeaveEvent *arg1 = args.read<QDragLeaveEvent * > (heap);
+  QDragLeaveEvent *arg1 = gsi::arg_reader<QDragLeaveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFileDialog_Adaptor *)cls)->cbs_dragLeaveEvent_2092_0 (arg1);
 }
@@ -2797,7 +2797,7 @@ static void _call_cbs_dragMoveEvent_2006_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragMoveEvent *arg1 = args.read<QDragMoveEvent * > (heap);
+  QDragMoveEvent *arg1 = gsi::arg_reader<QDragMoveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFileDialog_Adaptor *)cls)->cbs_dragMoveEvent_2006_0 (arg1);
 }
@@ -2821,7 +2821,7 @@ static void _call_cbs_dropEvent_1622_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDropEvent *arg1 = args.read<QDropEvent * > (heap);
+  QDropEvent *arg1 = gsi::arg_reader<QDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFileDialog_Adaptor *)cls)->cbs_dropEvent_1622_0 (arg1);
 }
@@ -2845,7 +2845,7 @@ static void _call_cbs_enabledChange_864_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFileDialog_Adaptor *)cls)->cbs_enabledChange_864_0 (arg1);
 }
@@ -2869,7 +2869,7 @@ static void _call_cbs_enterEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFileDialog_Adaptor *)cls)->cbs_enterEvent_1217_0 (arg1);
 }
@@ -2893,7 +2893,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QFileDialog_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -2918,8 +2918,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QFileDialog_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -3014,7 +3014,7 @@ static void _call_cbs_focusInEvent_1729_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFileDialog_Adaptor *)cls)->cbs_focusInEvent_1729_0 (arg1);
 }
@@ -3052,7 +3052,7 @@ static void _call_cbs_focusNextPrevChild_864_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   ret.write<bool > ((bool)((QFileDialog_Adaptor *)cls)->cbs_focusNextPrevChild_864_0 (arg1));
 }
 
@@ -3075,7 +3075,7 @@ static void _call_cbs_focusOutEvent_1729_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFileDialog_Adaptor *)cls)->cbs_focusOutEvent_1729_0 (arg1);
 }
@@ -3113,7 +3113,7 @@ static void _call_cbs_fontChange_1801_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QFont &arg1 = args.read<const QFont & > (heap);
+  const QFont &arg1 = gsi::arg_reader<const QFont & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFileDialog_Adaptor *)cls)->cbs_fontChange_1801_0 (arg1);
 }
@@ -3137,7 +3137,7 @@ static void _call_cbs_heightForWidth_c767_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   ret.write<int > ((int)((QFileDialog_Adaptor *)cls)->cbs_heightForWidth_c767_0 (arg1));
 }
 
@@ -3160,7 +3160,7 @@ static void _call_cbs_hideEvent_1595_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QHideEvent *arg1 = args.read<QHideEvent * > (heap);
+  QHideEvent *arg1 = gsi::arg_reader<QHideEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFileDialog_Adaptor *)cls)->cbs_hideEvent_1595_0 (arg1);
 }
@@ -3184,7 +3184,7 @@ static void _call_cbs_inputMethodEvent_2354_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QInputMethodEvent *arg1 = args.read<QInputMethodEvent * > (heap);
+  QInputMethodEvent *arg1 = gsi::arg_reader<QInputMethodEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFileDialog_Adaptor *)cls)->cbs_inputMethodEvent_2354_0 (arg1);
 }
@@ -3208,7 +3208,7 @@ static void _call_cbs_inputMethodQuery_c2420_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = args.read<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & > (heap);
+  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & >() (args, heap);
   ret.write<QVariant > ((QVariant)((QFileDialog_Adaptor *)cls)->cbs_inputMethodQuery_c2420_0 (arg1));
 }
 
@@ -3231,7 +3231,7 @@ static void _call_cbs_keyPressEvent_1514_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFileDialog_Adaptor *)cls)->cbs_keyPressEvent_1514_0 (arg1);
 }
@@ -3255,7 +3255,7 @@ static void _call_cbs_keyReleaseEvent_1514_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFileDialog_Adaptor *)cls)->cbs_keyReleaseEvent_1514_0 (arg1);
 }
@@ -3299,7 +3299,7 @@ static void _call_cbs_leaveEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFileDialog_Adaptor *)cls)->cbs_leaveEvent_1217_0 (arg1);
 }
@@ -3323,7 +3323,7 @@ static void _call_cbs_metric_c3445_0 (const qt_gsi::GenericMethod * /*decl*/, vo
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & arg1 = args.read<const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & > (heap);
+  const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & >() (args, heap);
   ret.write<int > ((int)((QFileDialog_Adaptor *)cls)->cbs_metric_c3445_0 (arg1));
 }
 
@@ -3365,7 +3365,7 @@ static void _call_cbs_mouseDoubleClickEvent_1738_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFileDialog_Adaptor *)cls)->cbs_mouseDoubleClickEvent_1738_0 (arg1);
 }
@@ -3389,7 +3389,7 @@ static void _call_cbs_mouseMoveEvent_1738_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFileDialog_Adaptor *)cls)->cbs_mouseMoveEvent_1738_0 (arg1);
 }
@@ -3413,7 +3413,7 @@ static void _call_cbs_mousePressEvent_1738_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFileDialog_Adaptor *)cls)->cbs_mousePressEvent_1738_0 (arg1);
 }
@@ -3437,7 +3437,7 @@ static void _call_cbs_mouseReleaseEvent_1738_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFileDialog_Adaptor *)cls)->cbs_mouseReleaseEvent_1738_0 (arg1);
 }
@@ -3461,7 +3461,7 @@ static void _call_cbs_moveEvent_1624_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMoveEvent *arg1 = args.read<QMoveEvent * > (heap);
+  QMoveEvent *arg1 = gsi::arg_reader<QMoveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFileDialog_Adaptor *)cls)->cbs_moveEvent_1624_0 (arg1);
 }
@@ -3504,7 +3504,7 @@ static void _call_cbs_paintEvent_1725_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QPaintEvent *arg1 = args.read<QPaintEvent * > (heap);
+  QPaintEvent *arg1 = gsi::arg_reader<QPaintEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFileDialog_Adaptor *)cls)->cbs_paintEvent_1725_0 (arg1);
 }
@@ -3528,7 +3528,7 @@ static void _call_cbs_paletteChange_2113_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QPalette &arg1 = args.read<const QPalette & > (heap);
+  const QPalette &arg1 = gsi::arg_reader<const QPalette & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFileDialog_Adaptor *)cls)->cbs_paletteChange_2113_0 (arg1);
 }
@@ -3619,7 +3619,7 @@ static void _call_cbs_resizeEvent_1843_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QResizeEvent *arg1 = args.read<QResizeEvent * > (heap);
+  QResizeEvent *arg1 = gsi::arg_reader<QResizeEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFileDialog_Adaptor *)cls)->cbs_resizeEvent_1843_0 (arg1);
 }
@@ -3657,7 +3657,7 @@ static void _call_cbs_setVisible_864_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFileDialog_Adaptor *)cls)->cbs_setVisible_864_0 (arg1);
 }
@@ -3681,7 +3681,7 @@ static void _call_cbs_showEvent_1634_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QShowEvent *arg1 = args.read<QShowEvent * > (heap);
+  QShowEvent *arg1 = gsi::arg_reader<QShowEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFileDialog_Adaptor *)cls)->cbs_showEvent_1634_0 (arg1);
 }
@@ -3724,7 +3724,7 @@ static void _call_cbs_styleChange_1228_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QStyle &arg1 = args.read<QStyle & > (heap);
+  QStyle &arg1 = gsi::arg_reader<QStyle & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFileDialog_Adaptor *)cls)->cbs_styleChange_1228_0 (arg1);
 }
@@ -3748,7 +3748,7 @@ static void _call_cbs_tabletEvent_1821_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTabletEvent *arg1 = args.read<QTabletEvent * > (heap);
+  QTabletEvent *arg1 = gsi::arg_reader<QTabletEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFileDialog_Adaptor *)cls)->cbs_tabletEvent_1821_0 (arg1);
 }
@@ -3772,7 +3772,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFileDialog_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }
@@ -3811,7 +3811,7 @@ static void _call_cbs_wheelEvent_1718_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QWheelEvent *arg1 = args.read<QWheelEvent * > (heap);
+  QWheelEvent *arg1 = gsi::arg_reader<QWheelEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFileDialog_Adaptor *)cls)->cbs_wheelEvent_1718_0 (arg1);
 }
@@ -3835,7 +3835,7 @@ static void _call_cbs_windowActivationChange_864_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFileDialog_Adaptor *)cls)->cbs_windowActivationChange_864_0 (arg1);
 }

src/gsiqt/qt4/QtGui/gsiDeclQFileIconProvider.cc

@@ -205,7 +205,7 @@ static void _call_cbs_icon_c3064_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QFileIconProvider::IconType>::target_type & arg1 = args.read<const qt_gsi::Converter<QFileIconProvider::IconType>::target_type & > (heap);
+  const qt_gsi::Converter<QFileIconProvider::IconType>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QFileIconProvider::IconType>::target_type & >() (args, heap);
   ret.write<QIcon > ((QIcon)((QFileIconProvider_Adaptor *)cls)->cbs_icon_c3064_0 (arg1));
 }
 
@@ -228,7 +228,7 @@ static void _call_cbs_icon_c2174_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QFileInfo &arg1 = args.read<const QFileInfo & > (heap);
+  const QFileInfo &arg1 = gsi::arg_reader<const QFileInfo & >() (args, heap);
   ret.write<QIcon > ((QIcon)((QFileIconProvider_Adaptor *)cls)->cbs_icon_c2174_0 (arg1));
 }
 
@@ -251,7 +251,7 @@ static void _call_cbs_type_c2174_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QFileInfo &arg1 = args.read<const QFileInfo & > (heap);
+  const QFileInfo &arg1 = gsi::arg_reader<const QFileInfo & >() (args, heap);
   ret.write<QString > ((QString)((QFileIconProvider_Adaptor *)cls)->cbs_type_c2174_0 (arg1));
 }
 

src/gsiqt/qt4/QtGui/gsiDeclQFileSystemModel.cc

@@ -2041,7 +2041,7 @@ static void _call_cbs_buddy_c2395_0 (const qt_gsi::GenericMethod * /*decl*/, voi
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
   ret.write<QModelIndex > ((QModelIndex)((QFileSystemModel_Adaptor *)cls)->cbs_buddy_c2395_0 (arg1));
 }
 
@@ -2064,7 +2064,7 @@ static void _call_cbs_canFetchMore_c2395_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
   ret.write<bool > ((bool)((QFileSystemModel_Adaptor *)cls)->cbs_canFetchMore_c2395_0 (arg1));
 }
 
@@ -2131,7 +2131,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFileSystemModel_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -2155,7 +2155,7 @@ static void _call_cbs_columnCount_c2395_1 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
+  const QModelIndex &arg1 = args ? gsi::arg_reader<const QModelIndex & >() (args, heap) : gsi::arg_maker<const QModelIndex & >() (QModelIndex(), heap);
   ret.write<int > ((int)((QFileSystemModel_Adaptor *)cls)->cbs_columnCount_c2395_1 (arg1));
 }
 
@@ -2250,7 +2250,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFileSystemModel_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -2276,8 +2276,8 @@ static void _call_cbs_data_c3054_1 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
-  int arg2 = args.read<int > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
+  int arg2 = args ? gsi::arg_reader<int >() (args, heap) : gsi::arg_maker<int >() (Qt::DisplayRole, heap);
   ret.write<QVariant > ((QVariant)((QFileSystemModel_Adaptor *)cls)->cbs_data_c3054_1 (arg1, arg2));
 }
 
@@ -2366,7 +2366,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFileSystemModel_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -2398,11 +2398,11 @@ static void _call_cbs_dropMimeData_7425_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QMimeData *arg1 = args.read<const QMimeData * > (heap);
-  const qt_gsi::Converter<Qt::DropAction>::target_type & arg2 = args.read<const qt_gsi::Converter<Qt::DropAction>::target_type & > (heap);
-  int arg3 = args.read<int > (heap);
-  int arg4 = args.read<int > (heap);
-  const QModelIndex &arg5 = args.read<const QModelIndex & > (heap);
+  const QMimeData *arg1 = gsi::arg_reader<const QMimeData * >() (args, heap);
+  const qt_gsi::Converter<Qt::DropAction>::target_type & arg2 = gsi::arg_reader<const qt_gsi::Converter<Qt::DropAction>::target_type & >() (args, heap);
+  int arg3 = gsi::arg_reader<int >() (args, heap);
+  int arg4 = gsi::arg_reader<int >() (args, heap);
+  const QModelIndex &arg5 = gsi::arg_reader<const QModelIndex & >() (args, heap);
   ret.write<bool > ((bool)((QFileSystemModel_Adaptor *)cls)->cbs_dropMimeData_7425_0 (arg1, arg2, arg3, arg4, arg5));
 }
 
@@ -2552,7 +2552,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QFileSystemModel_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -2577,8 +2577,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QFileSystemModel_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -2601,7 +2601,7 @@ static void _call_cbs_fetchMore_2395_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFileSystemModel_Adaptor *)cls)->cbs_fetchMore_2395_0 (arg1);
 }
@@ -2649,7 +2649,7 @@ static void _call_cbs_flags_c2395_0 (const qt_gsi::GenericMethod * /*decl*/, voi
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
   ret.write<QFlags<Qt::ItemFlag> > ((QFlags<Qt::ItemFlag>)((QFileSystemModel_Adaptor *)cls)->cbs_flags_c2395_0 (arg1));
 }
 
@@ -2672,7 +2672,7 @@ static void _call_cbs_hasChildren_c2395_1 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
+  const QModelIndex &arg1 = args ? gsi::arg_reader<const QModelIndex & >() (args, heap) : gsi::arg_maker<const QModelIndex & >() (QModelIndex(), heap);
   ret.write<bool > ((bool)((QFileSystemModel_Adaptor *)cls)->cbs_hasChildren_c2395_1 (arg1));
 }
 
@@ -2699,9 +2699,9 @@ static void _call_cbs_headerData_c3231_1 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
-  const qt_gsi::Converter<Qt::Orientation>::target_type & arg2 = args.read<const qt_gsi::Converter<Qt::Orientation>::target_type & > (heap);
-  int arg3 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
+  const qt_gsi::Converter<Qt::Orientation>::target_type & arg2 = gsi::arg_reader<const qt_gsi::Converter<Qt::Orientation>::target_type & >() (args, heap);
+  int arg3 = args ? gsi::arg_reader<int >() (args, heap) : gsi::arg_maker<int >() (Qt::DisplayRole, heap);
   ret.write<QVariant > ((QVariant)((QFileSystemModel_Adaptor *)cls)->cbs_headerData_c3231_1 (arg1, arg2, arg3));
 }
 
@@ -2752,9 +2752,9 @@ static void _call_cbs_index_c3713_1 (const qt_gsi::GenericMethod * /*decl*/, voi
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
-  int arg2 = args.read<int > (heap);
-  const QModelIndex &arg3 = args.read<const QModelIndex & > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
+  int arg2 = gsi::arg_reader<int >() (args, heap);
+  const QModelIndex &arg3 = args ? gsi::arg_reader<const QModelIndex & >() (args, heap) : gsi::arg_maker<const QModelIndex & >() (QModelIndex(), heap);
   ret.write<QModelIndex > ((QModelIndex)((QFileSystemModel_Adaptor *)cls)->cbs_index_c3713_1 (arg1, arg2, arg3));
 }
 
@@ -2781,9 +2781,9 @@ static void _call_cbs_insertColumns_3713_1 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
-  int arg2 = args.read<int > (heap);
-  const QModelIndex &arg3 = args.read<const QModelIndex & > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
+  int arg2 = gsi::arg_reader<int >() (args, heap);
+  const QModelIndex &arg3 = args ? gsi::arg_reader<const QModelIndex & >() (args, heap) : gsi::arg_maker<const QModelIndex & >() (QModelIndex(), heap);
   ret.write<bool > ((bool)((QFileSystemModel_Adaptor *)cls)->cbs_insertColumns_3713_1 (arg1, arg2, arg3));
 }
 
@@ -2810,9 +2810,9 @@ static void _call_cbs_insertRows_3713_1 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
-  int arg2 = args.read<int > (heap);
-  const QModelIndex &arg3 = args.read<const QModelIndex & > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
+  int arg2 = gsi::arg_reader<int >() (args, heap);
+  const QModelIndex &arg3 = args ? gsi::arg_reader<const QModelIndex & >() (args, heap) : gsi::arg_maker<const QModelIndex & >() (QModelIndex(), heap);
   ret.write<bool > ((bool)((QFileSystemModel_Adaptor *)cls)->cbs_insertRows_3713_1 (arg1, arg2, arg3));
 }
 
@@ -2835,7 +2835,7 @@ static void _call_cbs_itemData_c2395_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
   ret.write<QMap<int, QVariant> > ((QMap<int, QVariant>)((QFileSystemModel_Adaptor *)cls)->cbs_itemData_c2395_0 (arg1));
 }
 
@@ -2894,11 +2894,11 @@ static void _call_cbs_match_c7932_2 (const qt_gsi::GenericMethod * /*decl*/, voi
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
-  int arg2 = args.read<int > (heap);
-  const QVariant &arg3 = args.read<const QVariant & > (heap);
-  int arg4 = args.read<int > (heap);
-  QFlags<Qt::MatchFlag> arg5 = args.read<QFlags<Qt::MatchFlag> > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
+  int arg2 = gsi::arg_reader<int >() (args, heap);
+  const QVariant &arg3 = gsi::arg_reader<const QVariant & >() (args, heap);
+  int arg4 = args ? gsi::arg_reader<int >() (args, heap) : gsi::arg_maker<int >() (1, heap);
+  QFlags<Qt::MatchFlag> arg5 = args ? gsi::arg_reader<QFlags<Qt::MatchFlag> >() (args, heap) : gsi::arg_maker<QFlags<Qt::MatchFlag> >() (Qt::MatchFlags(Qt::MatchStartsWith|Qt::MatchWrap), heap);
   ret.write<QList<QModelIndex> > ((QList<QModelIndex>)((QFileSystemModel_Adaptor *)cls)->cbs_match_c7932_2 (arg1, arg2, arg3, arg4, arg5));
 }
 
@@ -2921,7 +2921,7 @@ static void _call_cbs_mimeData_c3010_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QList<QModelIndex> &arg1 = args.read<const QList<QModelIndex> & > (heap);
+  const QList<QModelIndex> &arg1 = gsi::arg_reader<const QList<QModelIndex> & >() (args, heap);
   ret.write<QMimeData * > ((QMimeData *)((QFileSystemModel_Adaptor *)cls)->cbs_mimeData_c3010_0 (arg1));
 }
 
@@ -2963,7 +2963,7 @@ static void _call_cbs_parent_c2395_0 (const qt_gsi::GenericMethod * /*decl*/, vo
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
   ret.write<QModelIndex > ((QModelIndex)((QFileSystemModel_Adaptor *)cls)->cbs_parent_c2395_0 (arg1));
 }
 
@@ -3022,9 +3022,9 @@ static void _call_cbs_removeColumns_3713_1 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
-  int arg2 = args.read<int > (heap);
-  const QModelIndex &arg3 = args.read<const QModelIndex & > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
+  int arg2 = gsi::arg_reader<int >() (args, heap);
+  const QModelIndex &arg3 = args ? gsi::arg_reader<const QModelIndex & >() (args, heap) : gsi::arg_maker<const QModelIndex & >() (QModelIndex(), heap);
   ret.write<bool > ((bool)((QFileSystemModel_Adaptor *)cls)->cbs_removeColumns_3713_1 (arg1, arg2, arg3));
 }
 
@@ -3051,9 +3051,9 @@ static void _call_cbs_removeRows_3713_1 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
-  int arg2 = args.read<int > (heap);
-  const QModelIndex &arg3 = args.read<const QModelIndex & > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
+  int arg2 = gsi::arg_reader<int >() (args, heap);
+  const QModelIndex &arg3 = args ? gsi::arg_reader<const QModelIndex & >() (args, heap) : gsi::arg_maker<const QModelIndex & >() (QModelIndex(), heap);
   ret.write<bool > ((bool)((QFileSystemModel_Adaptor *)cls)->cbs_removeRows_3713_1 (arg1, arg2, arg3));
 }
 
@@ -3129,7 +3129,7 @@ static void _call_cbs_rowCount_c2395_1 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
+  const QModelIndex &arg1 = args ? gsi::arg_reader<const QModelIndex & >() (args, heap) : gsi::arg_maker<const QModelIndex & >() (QModelIndex(), heap);
   ret.write<int > ((int)((QFileSystemModel_Adaptor *)cls)->cbs_rowCount_c2395_1 (arg1));
 }
 
@@ -3170,9 +3170,9 @@ static void _call_cbs_setData_5065_1 (const qt_gsi::GenericMethod * /*decl*/, vo
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
-  const QVariant &arg2 = args.read<const QVariant & > (heap);
-  int arg3 = args.read<int > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
+  const QVariant &arg2 = gsi::arg_reader<const QVariant & >() (args, heap);
+  int arg3 = args ? gsi::arg_reader<int >() (args, heap) : gsi::arg_maker<int >() (Qt::EditRole, heap);
   ret.write<bool > ((bool)((QFileSystemModel_Adaptor *)cls)->cbs_setData_5065_1 (arg1, arg2, arg3));
 }
 
@@ -3201,10 +3201,10 @@ static void _call_cbs_setHeaderData_5242_1 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
-  const qt_gsi::Converter<Qt::Orientation>::target_type & arg2 = args.read<const qt_gsi::Converter<Qt::Orientation>::target_type & > (heap);
-  const QVariant &arg3 = args.read<const QVariant & > (heap);
-  int arg4 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
+  const qt_gsi::Converter<Qt::Orientation>::target_type & arg2 = gsi::arg_reader<const qt_gsi::Converter<Qt::Orientation>::target_type & >() (args, heap);
+  const QVariant &arg3 = gsi::arg_reader<const QVariant & >() (args, heap);
+  int arg4 = args ? gsi::arg_reader<int >() (args, heap) : gsi::arg_maker<int >() (Qt::EditRole, heap);
   ret.write<bool > ((bool)((QFileSystemModel_Adaptor *)cls)->cbs_setHeaderData_5242_1 (arg1, arg2, arg3, arg4));
 }
 
@@ -3229,8 +3229,8 @@ static void _call_cbs_setItemData_5414_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
-  const QMap<int, QVariant> &arg2 = args.read<const QMap<int, QVariant> & > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
+  const QMap<int, QVariant> &arg2 = gsi::arg_reader<const QMap<int, QVariant> & >() (args, heap);
   ret.write<bool > ((bool)((QFileSystemModel_Adaptor *)cls)->cbs_setItemData_5414_0 (arg1, arg2));
 }
 
@@ -3274,8 +3274,8 @@ static void _call_cbs_sort_2340_1 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
-  const qt_gsi::Converter<Qt::SortOrder>::target_type & arg2 = args.read<const qt_gsi::Converter<Qt::SortOrder>::target_type & > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
+  const qt_gsi::Converter<Qt::SortOrder>::target_type & arg2 = args ? gsi::arg_reader<const qt_gsi::Converter<Qt::SortOrder>::target_type & >() (args, heap) : gsi::arg_maker<const qt_gsi::Converter<Qt::SortOrder>::target_type & >() (qt_gsi::CppToQtReadAdaptor<Qt::SortOrder>(heap, Qt::AscendingOrder), heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFileSystemModel_Adaptor *)cls)->cbs_sort_2340_1 (arg1, arg2);
 }
@@ -3299,7 +3299,7 @@ static void _call_cbs_span_c2395_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QModelIndex &arg1 = args.read<const QModelIndex & > (heap);
+  const QModelIndex &arg1 = gsi::arg_reader<const QModelIndex & >() (args, heap);
   ret.write<QSize > ((QSize)((QFileSystemModel_Adaptor *)cls)->cbs_span_c2395_0 (arg1));
 }
 
@@ -3360,7 +3360,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFileSystemModel_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }

src/gsiqt/qt4/QtGui/gsiDeclQFocusFrame.cc

@@ -1100,7 +1100,7 @@ static void _call_cbs_actionEvent_1823_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QActionEvent *arg1 = args.read<QActionEvent * > (heap);
+  QActionEvent *arg1 = gsi::arg_reader<QActionEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFocusFrame_Adaptor *)cls)->cbs_actionEvent_1823_0 (arg1);
 }
@@ -1124,7 +1124,7 @@ static void _call_cbs_changeEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFocusFrame_Adaptor *)cls)->cbs_changeEvent_1217_0 (arg1);
 }
@@ -1148,7 +1148,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFocusFrame_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -1172,7 +1172,7 @@ static void _call_cbs_closeEvent_1719_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QCloseEvent *arg1 = args.read<QCloseEvent * > (heap);
+  QCloseEvent *arg1 = gsi::arg_reader<QCloseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFocusFrame_Adaptor *)cls)->cbs_closeEvent_1719_0 (arg1);
 }
@@ -1196,7 +1196,7 @@ static void _call_cbs_contextMenuEvent_2363_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QContextMenuEvent *arg1 = args.read<QContextMenuEvent * > (heap);
+  QContextMenuEvent *arg1 = gsi::arg_reader<QContextMenuEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFocusFrame_Adaptor *)cls)->cbs_contextMenuEvent_2363_0 (arg1);
 }
@@ -1263,7 +1263,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFocusFrame_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -1327,7 +1327,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFocusFrame_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -1351,7 +1351,7 @@ static void _call_cbs_dragEnterEvent_2109_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragEnterEvent *arg1 = args.read<QDragEnterEvent * > (heap);
+  QDragEnterEvent *arg1 = gsi::arg_reader<QDragEnterEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFocusFrame_Adaptor *)cls)->cbs_dragEnterEvent_2109_0 (arg1);
 }
@@ -1375,7 +1375,7 @@ static void _call_cbs_dragLeaveEvent_2092_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragLeaveEvent *arg1 = args.read<QDragLeaveEvent * > (heap);
+  QDragLeaveEvent *arg1 = gsi::arg_reader<QDragLeaveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFocusFrame_Adaptor *)cls)->cbs_dragLeaveEvent_2092_0 (arg1);
 }
@@ -1399,7 +1399,7 @@ static void _call_cbs_dragMoveEvent_2006_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragMoveEvent *arg1 = args.read<QDragMoveEvent * > (heap);
+  QDragMoveEvent *arg1 = gsi::arg_reader<QDragMoveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFocusFrame_Adaptor *)cls)->cbs_dragMoveEvent_2006_0 (arg1);
 }
@@ -1423,7 +1423,7 @@ static void _call_cbs_dropEvent_1622_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDropEvent *arg1 = args.read<QDropEvent * > (heap);
+  QDropEvent *arg1 = gsi::arg_reader<QDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFocusFrame_Adaptor *)cls)->cbs_dropEvent_1622_0 (arg1);
 }
@@ -1447,7 +1447,7 @@ static void _call_cbs_enabledChange_864_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFocusFrame_Adaptor *)cls)->cbs_enabledChange_864_0 (arg1);
 }
@@ -1471,7 +1471,7 @@ static void _call_cbs_enterEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFocusFrame_Adaptor *)cls)->cbs_enterEvent_1217_0 (arg1);
 }
@@ -1495,7 +1495,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QFocusFrame_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -1520,8 +1520,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QFocusFrame_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -1544,7 +1544,7 @@ static void _call_cbs_focusInEvent_1729_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFocusFrame_Adaptor *)cls)->cbs_focusInEvent_1729_0 (arg1);
 }
@@ -1582,7 +1582,7 @@ static void _call_cbs_focusNextPrevChild_864_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   ret.write<bool > ((bool)((QFocusFrame_Adaptor *)cls)->cbs_focusNextPrevChild_864_0 (arg1));
 }
 
@@ -1605,7 +1605,7 @@ static void _call_cbs_focusOutEvent_1729_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFocusFrame_Adaptor *)cls)->cbs_focusOutEvent_1729_0 (arg1);
 }
@@ -1643,7 +1643,7 @@ static void _call_cbs_fontChange_1801_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QFont &arg1 = args.read<const QFont & > (heap);
+  const QFont &arg1 = gsi::arg_reader<const QFont & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFocusFrame_Adaptor *)cls)->cbs_fontChange_1801_0 (arg1);
 }
@@ -1667,7 +1667,7 @@ static void _call_cbs_heightForWidth_c767_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   ret.write<int > ((int)((QFocusFrame_Adaptor *)cls)->cbs_heightForWidth_c767_0 (arg1));
 }
 
@@ -1690,7 +1690,7 @@ static void _call_cbs_hideEvent_1595_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QHideEvent *arg1 = args.read<QHideEvent * > (heap);
+  QHideEvent *arg1 = gsi::arg_reader<QHideEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFocusFrame_Adaptor *)cls)->cbs_hideEvent_1595_0 (arg1);
 }
@@ -1733,7 +1733,7 @@ static void _call_cbs_inputMethodEvent_2354_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QInputMethodEvent *arg1 = args.read<QInputMethodEvent * > (heap);
+  QInputMethodEvent *arg1 = gsi::arg_reader<QInputMethodEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFocusFrame_Adaptor *)cls)->cbs_inputMethodEvent_2354_0 (arg1);
 }
@@ -1757,7 +1757,7 @@ static void _call_cbs_inputMethodQuery_c2420_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = args.read<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & > (heap);
+  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & >() (args, heap);
   ret.write<QVariant > ((QVariant)((QFocusFrame_Adaptor *)cls)->cbs_inputMethodQuery_c2420_0 (arg1));
 }
 
@@ -1780,7 +1780,7 @@ static void _call_cbs_keyPressEvent_1514_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFocusFrame_Adaptor *)cls)->cbs_keyPressEvent_1514_0 (arg1);
 }
@@ -1804,7 +1804,7 @@ static void _call_cbs_keyReleaseEvent_1514_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFocusFrame_Adaptor *)cls)->cbs_keyReleaseEvent_1514_0 (arg1);
 }
@@ -1848,7 +1848,7 @@ static void _call_cbs_leaveEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFocusFrame_Adaptor *)cls)->cbs_leaveEvent_1217_0 (arg1);
 }
@@ -1872,7 +1872,7 @@ static void _call_cbs_metric_c3445_0 (const qt_gsi::GenericMethod * /*decl*/, vo
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & arg1 = args.read<const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & > (heap);
+  const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & >() (args, heap);
   ret.write<int > ((int)((QFocusFrame_Adaptor *)cls)->cbs_metric_c3445_0 (arg1));
 }
 
@@ -1914,7 +1914,7 @@ static void _call_cbs_mouseDoubleClickEvent_1738_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFocusFrame_Adaptor *)cls)->cbs_mouseDoubleClickEvent_1738_0 (arg1);
 }
@@ -1938,7 +1938,7 @@ static void _call_cbs_mouseMoveEvent_1738_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFocusFrame_Adaptor *)cls)->cbs_mouseMoveEvent_1738_0 (arg1);
 }
@@ -1962,7 +1962,7 @@ static void _call_cbs_mousePressEvent_1738_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFocusFrame_Adaptor *)cls)->cbs_mousePressEvent_1738_0 (arg1);
 }
@@ -1986,7 +1986,7 @@ static void _call_cbs_mouseReleaseEvent_1738_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFocusFrame_Adaptor *)cls)->cbs_mouseReleaseEvent_1738_0 (arg1);
 }
@@ -2010,7 +2010,7 @@ static void _call_cbs_moveEvent_1624_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMoveEvent *arg1 = args.read<QMoveEvent * > (heap);
+  QMoveEvent *arg1 = gsi::arg_reader<QMoveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFocusFrame_Adaptor *)cls)->cbs_moveEvent_1624_0 (arg1);
 }
@@ -2053,7 +2053,7 @@ static void _call_cbs_paintEvent_1725_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QPaintEvent *arg1 = args.read<QPaintEvent * > (heap);
+  QPaintEvent *arg1 = gsi::arg_reader<QPaintEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFocusFrame_Adaptor *)cls)->cbs_paintEvent_1725_0 (arg1);
 }
@@ -2077,7 +2077,7 @@ static void _call_cbs_paletteChange_2113_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QPalette &arg1 = args.read<const QPalette & > (heap);
+  const QPalette &arg1 = gsi::arg_reader<const QPalette & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFocusFrame_Adaptor *)cls)->cbs_paletteChange_2113_0 (arg1);
 }
@@ -2134,7 +2134,7 @@ static void _call_cbs_resizeEvent_1843_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QResizeEvent *arg1 = args.read<QResizeEvent * > (heap);
+  QResizeEvent *arg1 = gsi::arg_reader<QResizeEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFocusFrame_Adaptor *)cls)->cbs_resizeEvent_1843_0 (arg1);
 }
@@ -2172,7 +2172,7 @@ static void _call_cbs_setVisible_864_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFocusFrame_Adaptor *)cls)->cbs_setVisible_864_0 (arg1);
 }
@@ -2196,7 +2196,7 @@ static void _call_cbs_showEvent_1634_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QShowEvent *arg1 = args.read<QShowEvent * > (heap);
+  QShowEvent *arg1 = gsi::arg_reader<QShowEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFocusFrame_Adaptor *)cls)->cbs_showEvent_1634_0 (arg1);
 }
@@ -2239,7 +2239,7 @@ static void _call_cbs_styleChange_1228_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QStyle &arg1 = args.read<QStyle & > (heap);
+  QStyle &arg1 = gsi::arg_reader<QStyle & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFocusFrame_Adaptor *)cls)->cbs_styleChange_1228_0 (arg1);
 }
@@ -2263,7 +2263,7 @@ static void _call_cbs_tabletEvent_1821_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTabletEvent *arg1 = args.read<QTabletEvent * > (heap);
+  QTabletEvent *arg1 = gsi::arg_reader<QTabletEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFocusFrame_Adaptor *)cls)->cbs_tabletEvent_1821_0 (arg1);
 }
@@ -2287,7 +2287,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFocusFrame_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }
@@ -2326,7 +2326,7 @@ static void _call_cbs_wheelEvent_1718_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QWheelEvent *arg1 = args.read<QWheelEvent * > (heap);
+  QWheelEvent *arg1 = gsi::arg_reader<QWheelEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFocusFrame_Adaptor *)cls)->cbs_wheelEvent_1718_0 (arg1);
 }
@@ -2350,7 +2350,7 @@ static void _call_cbs_windowActivationChange_864_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFocusFrame_Adaptor *)cls)->cbs_windowActivationChange_864_0 (arg1);
 }

src/gsiqt/qt4/QtGui/gsiDeclQFontComboBox.cc

@@ -1285,7 +1285,7 @@ static void _call_cbs_actionEvent_1823_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QActionEvent *arg1 = args.read<QActionEvent * > (heap);
+  QActionEvent *arg1 = gsi::arg_reader<QActionEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontComboBox_Adaptor *)cls)->cbs_actionEvent_1823_0 (arg1);
 }
@@ -1345,7 +1345,7 @@ static void _call_cbs_changeEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontComboBox_Adaptor *)cls)->cbs_changeEvent_1217_0 (arg1);
 }
@@ -1369,7 +1369,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontComboBox_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -1393,7 +1393,7 @@ static void _call_cbs_closeEvent_1719_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QCloseEvent *arg1 = args.read<QCloseEvent * > (heap);
+  QCloseEvent *arg1 = gsi::arg_reader<QCloseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontComboBox_Adaptor *)cls)->cbs_closeEvent_1719_0 (arg1);
 }
@@ -1417,7 +1417,7 @@ static void _call_cbs_contextMenuEvent_2363_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QContextMenuEvent *arg1 = args.read<QContextMenuEvent * > (heap);
+  QContextMenuEvent *arg1 = gsi::arg_reader<QContextMenuEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontComboBox_Adaptor *)cls)->cbs_contextMenuEvent_2363_0 (arg1);
 }
@@ -1538,7 +1538,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontComboBox_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -1602,7 +1602,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontComboBox_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -1626,7 +1626,7 @@ static void _call_cbs_dragEnterEvent_2109_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragEnterEvent *arg1 = args.read<QDragEnterEvent * > (heap);
+  QDragEnterEvent *arg1 = gsi::arg_reader<QDragEnterEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontComboBox_Adaptor *)cls)->cbs_dragEnterEvent_2109_0 (arg1);
 }
@@ -1650,7 +1650,7 @@ static void _call_cbs_dragLeaveEvent_2092_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragLeaveEvent *arg1 = args.read<QDragLeaveEvent * > (heap);
+  QDragLeaveEvent *arg1 = gsi::arg_reader<QDragLeaveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontComboBox_Adaptor *)cls)->cbs_dragLeaveEvent_2092_0 (arg1);
 }
@@ -1674,7 +1674,7 @@ static void _call_cbs_dragMoveEvent_2006_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragMoveEvent *arg1 = args.read<QDragMoveEvent * > (heap);
+  QDragMoveEvent *arg1 = gsi::arg_reader<QDragMoveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontComboBox_Adaptor *)cls)->cbs_dragMoveEvent_2006_0 (arg1);
 }
@@ -1698,7 +1698,7 @@ static void _call_cbs_dropEvent_1622_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDropEvent *arg1 = args.read<QDropEvent * > (heap);
+  QDropEvent *arg1 = gsi::arg_reader<QDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontComboBox_Adaptor *)cls)->cbs_dropEvent_1622_0 (arg1);
 }
@@ -1740,7 +1740,7 @@ static void _call_cbs_enabledChange_864_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontComboBox_Adaptor *)cls)->cbs_enabledChange_864_0 (arg1);
 }
@@ -1764,7 +1764,7 @@ static void _call_cbs_enterEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontComboBox_Adaptor *)cls)->cbs_enterEvent_1217_0 (arg1);
 }
@@ -1788,7 +1788,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QFontComboBox_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -1813,8 +1813,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QFontComboBox_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -1837,7 +1837,7 @@ static void _call_cbs_focusInEvent_1729_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontComboBox_Adaptor *)cls)->cbs_focusInEvent_1729_0 (arg1);
 }
@@ -1875,7 +1875,7 @@ static void _call_cbs_focusNextPrevChild_864_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   ret.write<bool > ((bool)((QFontComboBox_Adaptor *)cls)->cbs_focusNextPrevChild_864_0 (arg1));
 }
 
@@ -1898,7 +1898,7 @@ static void _call_cbs_focusOutEvent_1729_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontComboBox_Adaptor *)cls)->cbs_focusOutEvent_1729_0 (arg1);
 }
@@ -1936,7 +1936,7 @@ static void _call_cbs_fontChange_1801_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QFont &arg1 = args.read<const QFont & > (heap);
+  const QFont &arg1 = gsi::arg_reader<const QFont & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontComboBox_Adaptor *)cls)->cbs_fontChange_1801_0 (arg1);
 }
@@ -1960,7 +1960,7 @@ static void _call_cbs_heightForWidth_c767_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   ret.write<int > ((int)((QFontComboBox_Adaptor *)cls)->cbs_heightForWidth_c767_0 (arg1));
 }
 
@@ -1983,7 +1983,7 @@ static void _call_cbs_hideEvent_1595_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QHideEvent *arg1 = args.read<QHideEvent * > (heap);
+  QHideEvent *arg1 = gsi::arg_reader<QHideEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontComboBox_Adaptor *)cls)->cbs_hideEvent_1595_0 (arg1);
 }
@@ -2082,7 +2082,7 @@ static void _call_cbs_inputMethodEvent_2354_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QInputMethodEvent *arg1 = args.read<QInputMethodEvent * > (heap);
+  QInputMethodEvent *arg1 = gsi::arg_reader<QInputMethodEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontComboBox_Adaptor *)cls)->cbs_inputMethodEvent_2354_0 (arg1);
 }
@@ -2106,7 +2106,7 @@ static void _call_cbs_inputMethodQuery_c2420_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = args.read<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & > (heap);
+  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & >() (args, heap);
   ret.write<QVariant > ((QVariant)((QFontComboBox_Adaptor *)cls)->cbs_inputMethodQuery_c2420_0 (arg1));
 }
 
@@ -2129,7 +2129,7 @@ static void _call_cbs_keyPressEvent_1514_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontComboBox_Adaptor *)cls)->cbs_keyPressEvent_1514_0 (arg1);
 }
@@ -2153,7 +2153,7 @@ static void _call_cbs_keyReleaseEvent_1514_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontComboBox_Adaptor *)cls)->cbs_keyReleaseEvent_1514_0 (arg1);
 }
@@ -2197,7 +2197,7 @@ static void _call_cbs_leaveEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontComboBox_Adaptor *)cls)->cbs_leaveEvent_1217_0 (arg1);
 }
@@ -2221,7 +2221,7 @@ static void _call_cbs_metric_c3445_0 (const qt_gsi::GenericMethod * /*decl*/, vo
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & arg1 = args.read<const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & > (heap);
+  const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & >() (args, heap);
   ret.write<int > ((int)((QFontComboBox_Adaptor *)cls)->cbs_metric_c3445_0 (arg1));
 }
 
@@ -2263,7 +2263,7 @@ static void _call_cbs_mouseDoubleClickEvent_1738_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontComboBox_Adaptor *)cls)->cbs_mouseDoubleClickEvent_1738_0 (arg1);
 }
@@ -2287,7 +2287,7 @@ static void _call_cbs_mouseMoveEvent_1738_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontComboBox_Adaptor *)cls)->cbs_mouseMoveEvent_1738_0 (arg1);
 }
@@ -2311,7 +2311,7 @@ static void _call_cbs_mousePressEvent_1738_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontComboBox_Adaptor *)cls)->cbs_mousePressEvent_1738_0 (arg1);
 }
@@ -2335,7 +2335,7 @@ static void _call_cbs_mouseReleaseEvent_1738_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontComboBox_Adaptor *)cls)->cbs_mouseReleaseEvent_1738_0 (arg1);
 }
@@ -2359,7 +2359,7 @@ static void _call_cbs_moveEvent_1624_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMoveEvent *arg1 = args.read<QMoveEvent * > (heap);
+  QMoveEvent *arg1 = gsi::arg_reader<QMoveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontComboBox_Adaptor *)cls)->cbs_moveEvent_1624_0 (arg1);
 }
@@ -2402,7 +2402,7 @@ static void _call_cbs_paintEvent_1725_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QPaintEvent *arg1 = args.read<QPaintEvent * > (heap);
+  QPaintEvent *arg1 = gsi::arg_reader<QPaintEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontComboBox_Adaptor *)cls)->cbs_paintEvent_1725_0 (arg1);
 }
@@ -2426,7 +2426,7 @@ static void _call_cbs_paletteChange_2113_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QPalette &arg1 = args.read<const QPalette & > (heap);
+  const QPalette &arg1 = gsi::arg_reader<const QPalette & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontComboBox_Adaptor *)cls)->cbs_paletteChange_2113_0 (arg1);
 }
@@ -2483,7 +2483,7 @@ static void _call_cbs_resizeEvent_1843_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QResizeEvent *arg1 = args.read<QResizeEvent * > (heap);
+  QResizeEvent *arg1 = gsi::arg_reader<QResizeEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontComboBox_Adaptor *)cls)->cbs_resizeEvent_1843_0 (arg1);
 }
@@ -2521,7 +2521,7 @@ static void _call_cbs_setVisible_864_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontComboBox_Adaptor *)cls)->cbs_setVisible_864_0 (arg1);
 }
@@ -2545,7 +2545,7 @@ static void _call_cbs_showEvent_1634_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QShowEvent *arg1 = args.read<QShowEvent * > (heap);
+  QShowEvent *arg1 = gsi::arg_reader<QShowEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontComboBox_Adaptor *)cls)->cbs_showEvent_1634_0 (arg1);
 }
@@ -2608,7 +2608,7 @@ static void _call_cbs_styleChange_1228_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QStyle &arg1 = args.read<QStyle & > (heap);
+  QStyle &arg1 = gsi::arg_reader<QStyle & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontComboBox_Adaptor *)cls)->cbs_styleChange_1228_0 (arg1);
 }
@@ -2632,7 +2632,7 @@ static void _call_cbs_tabletEvent_1821_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTabletEvent *arg1 = args.read<QTabletEvent * > (heap);
+  QTabletEvent *arg1 = gsi::arg_reader<QTabletEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontComboBox_Adaptor *)cls)->cbs_tabletEvent_1821_0 (arg1);
 }
@@ -2656,7 +2656,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontComboBox_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }
@@ -2695,7 +2695,7 @@ static void _call_cbs_wheelEvent_1718_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QWheelEvent *arg1 = args.read<QWheelEvent * > (heap);
+  QWheelEvent *arg1 = gsi::arg_reader<QWheelEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontComboBox_Adaptor *)cls)->cbs_wheelEvent_1718_0 (arg1);
 }
@@ -2719,7 +2719,7 @@ static void _call_cbs_windowActivationChange_864_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontComboBox_Adaptor *)cls)->cbs_windowActivationChange_864_0 (arg1);
 }

src/gsiqt/qt4/QtGui/gsiDeclQFontDialog.cc

@@ -1502,7 +1502,7 @@ static void _call_cbs_actionEvent_1823_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QActionEvent *arg1 = args.read<QActionEvent * > (heap);
+  QActionEvent *arg1 = gsi::arg_reader<QActionEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontDialog_Adaptor *)cls)->cbs_actionEvent_1823_0 (arg1);
 }
@@ -1545,7 +1545,7 @@ static void _call_cbs_changeEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontDialog_Adaptor *)cls)->cbs_changeEvent_1217_0 (arg1);
 }
@@ -1569,7 +1569,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontDialog_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -1593,7 +1593,7 @@ static void _call_cbs_closeEvent_1719_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QCloseEvent *arg1 = args.read<QCloseEvent * > (heap);
+  QCloseEvent *arg1 = gsi::arg_reader<QCloseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontDialog_Adaptor *)cls)->cbs_closeEvent_1719_0 (arg1);
 }
@@ -1617,7 +1617,7 @@ static void _call_cbs_contextMenuEvent_2363_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QContextMenuEvent *arg1 = args.read<QContextMenuEvent * > (heap);
+  QContextMenuEvent *arg1 = gsi::arg_reader<QContextMenuEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontDialog_Adaptor *)cls)->cbs_contextMenuEvent_2363_0 (arg1);
 }
@@ -1702,7 +1702,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontDialog_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -1766,7 +1766,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontDialog_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -1790,7 +1790,7 @@ static void _call_cbs_done_767_0 (const qt_gsi::GenericMethod * /*decl*/, void *
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontDialog_Adaptor *)cls)->cbs_done_767_0 (arg1);
 }
@@ -1814,7 +1814,7 @@ static void _call_cbs_dragEnterEvent_2109_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragEnterEvent *arg1 = args.read<QDragEnterEvent * > (heap);
+  QDragEnterEvent *arg1 = gsi::arg_reader<QDragEnterEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontDialog_Adaptor *)cls)->cbs_dragEnterEvent_2109_0 (arg1);
 }
@@ -1838,7 +1838,7 @@ static void _call_cbs_dragLeaveEvent_2092_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragLeaveEvent *arg1 = args.read<QDragLeaveEvent * > (heap);
+  QDragLeaveEvent *arg1 = gsi::arg_reader<QDragLeaveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontDialog_Adaptor *)cls)->cbs_dragLeaveEvent_2092_0 (arg1);
 }
@@ -1862,7 +1862,7 @@ static void _call_cbs_dragMoveEvent_2006_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragMoveEvent *arg1 = args.read<QDragMoveEvent * > (heap);
+  QDragMoveEvent *arg1 = gsi::arg_reader<QDragMoveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontDialog_Adaptor *)cls)->cbs_dragMoveEvent_2006_0 (arg1);
 }
@@ -1886,7 +1886,7 @@ static void _call_cbs_dropEvent_1622_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDropEvent *arg1 = args.read<QDropEvent * > (heap);
+  QDropEvent *arg1 = gsi::arg_reader<QDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontDialog_Adaptor *)cls)->cbs_dropEvent_1622_0 (arg1);
 }
@@ -1910,7 +1910,7 @@ static void _call_cbs_enabledChange_864_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontDialog_Adaptor *)cls)->cbs_enabledChange_864_0 (arg1);
 }
@@ -1934,7 +1934,7 @@ static void _call_cbs_enterEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontDialog_Adaptor *)cls)->cbs_enterEvent_1217_0 (arg1);
 }
@@ -1958,7 +1958,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QFontDialog_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -1999,7 +1999,7 @@ static void _call_cbs_focusInEvent_1729_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontDialog_Adaptor *)cls)->cbs_focusInEvent_1729_0 (arg1);
 }
@@ -2037,7 +2037,7 @@ static void _call_cbs_focusNextPrevChild_864_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   ret.write<bool > ((bool)((QFontDialog_Adaptor *)cls)->cbs_focusNextPrevChild_864_0 (arg1));
 }
 
@@ -2060,7 +2060,7 @@ static void _call_cbs_focusOutEvent_1729_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontDialog_Adaptor *)cls)->cbs_focusOutEvent_1729_0 (arg1);
 }
@@ -2098,7 +2098,7 @@ static void _call_cbs_fontChange_1801_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QFont &arg1 = args.read<const QFont & > (heap);
+  const QFont &arg1 = gsi::arg_reader<const QFont & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontDialog_Adaptor *)cls)->cbs_fontChange_1801_0 (arg1);
 }
@@ -2140,7 +2140,7 @@ static void _call_cbs_heightForWidth_c767_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   ret.write<int > ((int)((QFontDialog_Adaptor *)cls)->cbs_heightForWidth_c767_0 (arg1));
 }
 
@@ -2163,7 +2163,7 @@ static void _call_cbs_hideEvent_1595_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QHideEvent *arg1 = args.read<QHideEvent * > (heap);
+  QHideEvent *arg1 = gsi::arg_reader<QHideEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontDialog_Adaptor *)cls)->cbs_hideEvent_1595_0 (arg1);
 }
@@ -2187,7 +2187,7 @@ static void _call_cbs_inputMethodEvent_2354_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QInputMethodEvent *arg1 = args.read<QInputMethodEvent * > (heap);
+  QInputMethodEvent *arg1 = gsi::arg_reader<QInputMethodEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontDialog_Adaptor *)cls)->cbs_inputMethodEvent_2354_0 (arg1);
 }
@@ -2211,7 +2211,7 @@ static void _call_cbs_inputMethodQuery_c2420_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = args.read<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & > (heap);
+  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & >() (args, heap);
   ret.write<QVariant > ((QVariant)((QFontDialog_Adaptor *)cls)->cbs_inputMethodQuery_c2420_0 (arg1));
 }
 
@@ -2234,7 +2234,7 @@ static void _call_cbs_keyPressEvent_1514_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontDialog_Adaptor *)cls)->cbs_keyPressEvent_1514_0 (arg1);
 }
@@ -2258,7 +2258,7 @@ static void _call_cbs_keyReleaseEvent_1514_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontDialog_Adaptor *)cls)->cbs_keyReleaseEvent_1514_0 (arg1);
 }
@@ -2302,7 +2302,7 @@ static void _call_cbs_leaveEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontDialog_Adaptor *)cls)->cbs_leaveEvent_1217_0 (arg1);
 }
@@ -2326,7 +2326,7 @@ static void _call_cbs_metric_c3445_0 (const qt_gsi::GenericMethod * /*decl*/, vo
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & arg1 = args.read<const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & > (heap);
+  const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & >() (args, heap);
   ret.write<int > ((int)((QFontDialog_Adaptor *)cls)->cbs_metric_c3445_0 (arg1));
 }
 
@@ -2368,7 +2368,7 @@ static void _call_cbs_mouseDoubleClickEvent_1738_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontDialog_Adaptor *)cls)->cbs_mouseDoubleClickEvent_1738_0 (arg1);
 }
@@ -2392,7 +2392,7 @@ static void _call_cbs_mouseMoveEvent_1738_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontDialog_Adaptor *)cls)->cbs_mouseMoveEvent_1738_0 (arg1);
 }
@@ -2416,7 +2416,7 @@ static void _call_cbs_mousePressEvent_1738_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontDialog_Adaptor *)cls)->cbs_mousePressEvent_1738_0 (arg1);
 }
@@ -2440,7 +2440,7 @@ static void _call_cbs_mouseReleaseEvent_1738_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontDialog_Adaptor *)cls)->cbs_mouseReleaseEvent_1738_0 (arg1);
 }
@@ -2464,7 +2464,7 @@ static void _call_cbs_moveEvent_1624_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMoveEvent *arg1 = args.read<QMoveEvent * > (heap);
+  QMoveEvent *arg1 = gsi::arg_reader<QMoveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontDialog_Adaptor *)cls)->cbs_moveEvent_1624_0 (arg1);
 }
@@ -2507,7 +2507,7 @@ static void _call_cbs_paintEvent_1725_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QPaintEvent *arg1 = args.read<QPaintEvent * > (heap);
+  QPaintEvent *arg1 = gsi::arg_reader<QPaintEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontDialog_Adaptor *)cls)->cbs_paintEvent_1725_0 (arg1);
 }
@@ -2531,7 +2531,7 @@ static void _call_cbs_paletteChange_2113_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QPalette &arg1 = args.read<const QPalette & > (heap);
+  const QPalette &arg1 = gsi::arg_reader<const QPalette & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontDialog_Adaptor *)cls)->cbs_paletteChange_2113_0 (arg1);
 }
@@ -2622,7 +2622,7 @@ static void _call_cbs_resizeEvent_1843_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QResizeEvent *arg1 = args.read<QResizeEvent * > (heap);
+  QResizeEvent *arg1 = gsi::arg_reader<QResizeEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontDialog_Adaptor *)cls)->cbs_resizeEvent_1843_0 (arg1);
 }
@@ -2660,7 +2660,7 @@ static void _call_cbs_setVisible_864_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontDialog_Adaptor *)cls)->cbs_setVisible_864_0 (arg1);
 }
@@ -2684,7 +2684,7 @@ static void _call_cbs_showEvent_1634_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QShowEvent *arg1 = args.read<QShowEvent * > (heap);
+  QShowEvent *arg1 = gsi::arg_reader<QShowEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontDialog_Adaptor *)cls)->cbs_showEvent_1634_0 (arg1);
 }
@@ -2727,7 +2727,7 @@ static void _call_cbs_styleChange_1228_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QStyle &arg1 = args.read<QStyle & > (heap);
+  QStyle &arg1 = gsi::arg_reader<QStyle & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontDialog_Adaptor *)cls)->cbs_styleChange_1228_0 (arg1);
 }
@@ -2751,7 +2751,7 @@ static void _call_cbs_tabletEvent_1821_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTabletEvent *arg1 = args.read<QTabletEvent * > (heap);
+  QTabletEvent *arg1 = gsi::arg_reader<QTabletEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontDialog_Adaptor *)cls)->cbs_tabletEvent_1821_0 (arg1);
 }
@@ -2775,7 +2775,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontDialog_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }
@@ -2814,7 +2814,7 @@ static void _call_cbs_wheelEvent_1718_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QWheelEvent *arg1 = args.read<QWheelEvent * > (heap);
+  QWheelEvent *arg1 = gsi::arg_reader<QWheelEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontDialog_Adaptor *)cls)->cbs_wheelEvent_1718_0 (arg1);
 }
@@ -2838,7 +2838,7 @@ static void _call_cbs_windowActivationChange_864_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFontDialog_Adaptor *)cls)->cbs_windowActivationChange_864_0 (arg1);
 }

src/gsiqt/qt4/QtGui/gsiDeclQFormLayout.cc

@@ -1701,7 +1701,8 @@ static void _call_cbs_addItem_1740_0 (const qt_gsi::GenericMethod * /*decl*/, vo
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QLayoutItem *arg1 = args.read<QLayoutItem * > (heap);
+  QLayoutItem *arg1 = gsi::arg_reader<QLayoutItem * >() (args, heap);
+  qt_gsi::qt_keep (arg1);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFormLayout_Adaptor *)cls)->cbs_addItem_1740_0 (arg1);
 }
@@ -1743,7 +1744,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFormLayout_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -1786,7 +1787,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFormLayout_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -1828,7 +1829,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFormLayout_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -1852,7 +1853,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QFormLayout_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -1877,8 +1878,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QFormLayout_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -1958,7 +1959,7 @@ static void _call_cbs_heightForWidth_c767_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   ret.write<int > ((int)((QFormLayout_Adaptor *)cls)->cbs_heightForWidth_c767_0 (arg1));
 }
 
@@ -1981,7 +1982,7 @@ static void _call_cbs_indexOf_c1315_0 (const qt_gsi::GenericMethod * /*decl*/, v
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QWidget *arg1 = args.read<QWidget * > (heap);
+  QWidget *arg1 = gsi::arg_reader<QWidget * >() (args, heap);
   ret.write<int > ((int)((QFormLayout_Adaptor *)cls)->cbs_indexOf_c1315_0 (arg1));
 }
 
@@ -2043,7 +2044,7 @@ static void _call_cbs_itemAt_c767_0 (const qt_gsi::GenericMethod * /*decl*/, voi
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   ret.write<QLayoutItem * > ((QLayoutItem *)((QFormLayout_Adaptor *)cls)->cbs_itemAt_c767_0 (arg1));
 }
 
@@ -2104,7 +2105,7 @@ static void _call_cbs_minimumHeightForWidth_c767_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   ret.write<int > ((int)((QFormLayout_Adaptor *)cls)->cbs_minimumHeightForWidth_c767_0 (arg1));
 }
 
@@ -2178,7 +2179,7 @@ static void _call_cbs_setGeometry_1792_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QRect &arg1 = args.read<const QRect & > (heap);
+  const QRect &arg1 = gsi::arg_reader<const QRect & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFormLayout_Adaptor *)cls)->cbs_setGeometry_1792_0 (arg1);
 }
@@ -2240,7 +2241,7 @@ static void _call_cbs_takeAt_767_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   ret.write<QLayoutItem * > ((QLayoutItem *)((QFormLayout_Adaptor *)cls)->cbs_takeAt_767_0 (arg1));
 }
 
@@ -2263,7 +2264,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFormLayout_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }

src/gsiqt/qt4/QtGui/gsiDeclQFrame.cc

@@ -1325,7 +1325,7 @@ static void _call_cbs_actionEvent_1823_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QActionEvent *arg1 = args.read<QActionEvent * > (heap);
+  QActionEvent *arg1 = gsi::arg_reader<QActionEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFrame_Adaptor *)cls)->cbs_actionEvent_1823_0 (arg1);
 }
@@ -1349,7 +1349,7 @@ static void _call_cbs_changeEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFrame_Adaptor *)cls)->cbs_changeEvent_1217_0 (arg1);
 }
@@ -1373,7 +1373,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFrame_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -1397,7 +1397,7 @@ static void _call_cbs_closeEvent_1719_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QCloseEvent *arg1 = args.read<QCloseEvent * > (heap);
+  QCloseEvent *arg1 = gsi::arg_reader<QCloseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFrame_Adaptor *)cls)->cbs_closeEvent_1719_0 (arg1);
 }
@@ -1421,7 +1421,7 @@ static void _call_cbs_contextMenuEvent_2363_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QContextMenuEvent *arg1 = args.read<QContextMenuEvent * > (heap);
+  QContextMenuEvent *arg1 = gsi::arg_reader<QContextMenuEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFrame_Adaptor *)cls)->cbs_contextMenuEvent_2363_0 (arg1);
 }
@@ -1488,7 +1488,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFrame_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -1552,7 +1552,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFrame_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -1576,7 +1576,7 @@ static void _call_cbs_dragEnterEvent_2109_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragEnterEvent *arg1 = args.read<QDragEnterEvent * > (heap);
+  QDragEnterEvent *arg1 = gsi::arg_reader<QDragEnterEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFrame_Adaptor *)cls)->cbs_dragEnterEvent_2109_0 (arg1);
 }
@@ -1600,7 +1600,7 @@ static void _call_cbs_dragLeaveEvent_2092_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragLeaveEvent *arg1 = args.read<QDragLeaveEvent * > (heap);
+  QDragLeaveEvent *arg1 = gsi::arg_reader<QDragLeaveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFrame_Adaptor *)cls)->cbs_dragLeaveEvent_2092_0 (arg1);
 }
@@ -1624,7 +1624,7 @@ static void _call_cbs_dragMoveEvent_2006_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDragMoveEvent *arg1 = args.read<QDragMoveEvent * > (heap);
+  QDragMoveEvent *arg1 = gsi::arg_reader<QDragMoveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFrame_Adaptor *)cls)->cbs_dragMoveEvent_2006_0 (arg1);
 }
@@ -1667,7 +1667,7 @@ static void _call_cbs_dropEvent_1622_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QDropEvent *arg1 = args.read<QDropEvent * > (heap);
+  QDropEvent *arg1 = gsi::arg_reader<QDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFrame_Adaptor *)cls)->cbs_dropEvent_1622_0 (arg1);
 }
@@ -1691,7 +1691,7 @@ static void _call_cbs_enabledChange_864_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFrame_Adaptor *)cls)->cbs_enabledChange_864_0 (arg1);
 }
@@ -1715,7 +1715,7 @@ static void _call_cbs_enterEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFrame_Adaptor *)cls)->cbs_enterEvent_1217_0 (arg1);
 }
@@ -1739,7 +1739,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QFrame_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -1764,8 +1764,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QFrame_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -1788,7 +1788,7 @@ static void _call_cbs_focusInEvent_1729_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFrame_Adaptor *)cls)->cbs_focusInEvent_1729_0 (arg1);
 }
@@ -1826,7 +1826,7 @@ static void _call_cbs_focusNextPrevChild_864_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   ret.write<bool > ((bool)((QFrame_Adaptor *)cls)->cbs_focusNextPrevChild_864_0 (arg1));
 }
 
@@ -1849,7 +1849,7 @@ static void _call_cbs_focusOutEvent_1729_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFrame_Adaptor *)cls)->cbs_focusOutEvent_1729_0 (arg1);
 }
@@ -1887,7 +1887,7 @@ static void _call_cbs_fontChange_1801_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QFont &arg1 = args.read<const QFont & > (heap);
+  const QFont &arg1 = gsi::arg_reader<const QFont & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFrame_Adaptor *)cls)->cbs_fontChange_1801_0 (arg1);
 }
@@ -1911,7 +1911,7 @@ static void _call_cbs_heightForWidth_c767_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   ret.write<int > ((int)((QFrame_Adaptor *)cls)->cbs_heightForWidth_c767_0 (arg1));
 }
 
@@ -1934,7 +1934,7 @@ static void _call_cbs_hideEvent_1595_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QHideEvent *arg1 = args.read<QHideEvent * > (heap);
+  QHideEvent *arg1 = gsi::arg_reader<QHideEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFrame_Adaptor *)cls)->cbs_hideEvent_1595_0 (arg1);
 }
@@ -1958,7 +1958,7 @@ static void _call_cbs_inputMethodEvent_2354_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QInputMethodEvent *arg1 = args.read<QInputMethodEvent * > (heap);
+  QInputMethodEvent *arg1 = gsi::arg_reader<QInputMethodEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFrame_Adaptor *)cls)->cbs_inputMethodEvent_2354_0 (arg1);
 }
@@ -1982,7 +1982,7 @@ static void _call_cbs_inputMethodQuery_c2420_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = args.read<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & > (heap);
+  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & >() (args, heap);
   ret.write<QVariant > ((QVariant)((QFrame_Adaptor *)cls)->cbs_inputMethodQuery_c2420_0 (arg1));
 }
 
@@ -2005,7 +2005,7 @@ static void _call_cbs_keyPressEvent_1514_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFrame_Adaptor *)cls)->cbs_keyPressEvent_1514_0 (arg1);
 }
@@ -2029,7 +2029,7 @@ static void _call_cbs_keyReleaseEvent_1514_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFrame_Adaptor *)cls)->cbs_keyReleaseEvent_1514_0 (arg1);
 }
@@ -2073,7 +2073,7 @@ static void _call_cbs_leaveEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFrame_Adaptor *)cls)->cbs_leaveEvent_1217_0 (arg1);
 }
@@ -2097,7 +2097,7 @@ static void _call_cbs_metric_c3445_0 (const qt_gsi::GenericMethod * /*decl*/, vo
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & arg1 = args.read<const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & > (heap);
+  const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QPaintDevice::PaintDeviceMetric>::target_type & >() (args, heap);
   ret.write<int > ((int)((QFrame_Adaptor *)cls)->cbs_metric_c3445_0 (arg1));
 }
 
@@ -2139,7 +2139,7 @@ static void _call_cbs_mouseDoubleClickEvent_1738_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFrame_Adaptor *)cls)->cbs_mouseDoubleClickEvent_1738_0 (arg1);
 }
@@ -2163,7 +2163,7 @@ static void _call_cbs_mouseMoveEvent_1738_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFrame_Adaptor *)cls)->cbs_mouseMoveEvent_1738_0 (arg1);
 }
@@ -2187,7 +2187,7 @@ static void _call_cbs_mousePressEvent_1738_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFrame_Adaptor *)cls)->cbs_mousePressEvent_1738_0 (arg1);
 }
@@ -2211,7 +2211,7 @@ static void _call_cbs_mouseReleaseEvent_1738_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMouseEvent *arg1 = args.read<QMouseEvent * > (heap);
+  QMouseEvent *arg1 = gsi::arg_reader<QMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFrame_Adaptor *)cls)->cbs_mouseReleaseEvent_1738_0 (arg1);
 }
@@ -2235,7 +2235,7 @@ static void _call_cbs_moveEvent_1624_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMoveEvent *arg1 = args.read<QMoveEvent * > (heap);
+  QMoveEvent *arg1 = gsi::arg_reader<QMoveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFrame_Adaptor *)cls)->cbs_moveEvent_1624_0 (arg1);
 }
@@ -2278,7 +2278,7 @@ static void _call_cbs_paintEvent_1725_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QPaintEvent *arg1 = args.read<QPaintEvent * > (heap);
+  QPaintEvent *arg1 = gsi::arg_reader<QPaintEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFrame_Adaptor *)cls)->cbs_paintEvent_1725_0 (arg1);
 }
@@ -2302,7 +2302,7 @@ static void _call_cbs_paletteChange_2113_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QPalette &arg1 = args.read<const QPalette & > (heap);
+  const QPalette &arg1 = gsi::arg_reader<const QPalette & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFrame_Adaptor *)cls)->cbs_paletteChange_2113_0 (arg1);
 }
@@ -2359,7 +2359,7 @@ static void _call_cbs_resizeEvent_1843_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QResizeEvent *arg1 = args.read<QResizeEvent * > (heap);
+  QResizeEvent *arg1 = gsi::arg_reader<QResizeEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFrame_Adaptor *)cls)->cbs_resizeEvent_1843_0 (arg1);
 }
@@ -2397,7 +2397,7 @@ static void _call_cbs_setVisible_864_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFrame_Adaptor *)cls)->cbs_setVisible_864_0 (arg1);
 }
@@ -2421,7 +2421,7 @@ static void _call_cbs_showEvent_1634_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QShowEvent *arg1 = args.read<QShowEvent * > (heap);
+  QShowEvent *arg1 = gsi::arg_reader<QShowEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFrame_Adaptor *)cls)->cbs_showEvent_1634_0 (arg1);
 }
@@ -2464,7 +2464,7 @@ static void _call_cbs_styleChange_1228_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QStyle &arg1 = args.read<QStyle & > (heap);
+  QStyle &arg1 = gsi::arg_reader<QStyle & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFrame_Adaptor *)cls)->cbs_styleChange_1228_0 (arg1);
 }
@@ -2488,7 +2488,7 @@ static void _call_cbs_tabletEvent_1821_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTabletEvent *arg1 = args.read<QTabletEvent * > (heap);
+  QTabletEvent *arg1 = gsi::arg_reader<QTabletEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFrame_Adaptor *)cls)->cbs_tabletEvent_1821_0 (arg1);
 }
@@ -2512,7 +2512,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFrame_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }
@@ -2551,7 +2551,7 @@ static void _call_cbs_wheelEvent_1718_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QWheelEvent *arg1 = args.read<QWheelEvent * > (heap);
+  QWheelEvent *arg1 = gsi::arg_reader<QWheelEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFrame_Adaptor *)cls)->cbs_wheelEvent_1718_0 (arg1);
 }
@@ -2575,7 +2575,7 @@ static void _call_cbs_windowActivationChange_864_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QFrame_Adaptor *)cls)->cbs_windowActivationChange_864_0 (arg1);
 }

src/gsiqt/qt4/QtGui/gsiDeclQGesture.cc

@@ -477,7 +477,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGesture_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -501,7 +501,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGesture_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -543,7 +543,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGesture_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -567,7 +567,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QGesture_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -592,8 +592,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QGesture_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -648,7 +648,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGesture_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }

src/gsiqt/qt4/QtGui/gsiDeclQGestureRecognizer.cc

@@ -257,7 +257,7 @@ static void _call_cbs_create_1302_0 (const qt_gsi::GenericMethod * /*decl*/, voi
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
   ret.write<QGesture * > ((QGesture *)((QGestureRecognizer_Adaptor *)cls)->cbs_create_1302_0 (arg1));
 }
 
@@ -284,9 +284,9 @@ static void _call_cbs_recognize_3741_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGesture *arg1 = args.read<QGesture * > (heap);
-  QObject *arg2 = args.read<QObject * > (heap);
-  QEvent *arg3 = args.read<QEvent * > (heap);
+  QGesture *arg1 = gsi::arg_reader<QGesture * >() (args, heap);
+  QObject *arg2 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg3 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<QFlags<QGestureRecognizer::ResultFlag> > ((QFlags<QGestureRecognizer::ResultFlag>)((QGestureRecognizer_Adaptor *)cls)->cbs_recognize_3741_0 (arg1, arg2, arg3));
 }
 
@@ -309,7 +309,7 @@ static void _call_cbs_reset_1438_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGesture *arg1 = args.read<QGesture * > (heap);
+  QGesture *arg1 = gsi::arg_reader<QGesture * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGestureRecognizer_Adaptor *)cls)->cbs_reset_1438_0 (arg1);
 }

src/gsiqt/qt4/QtGui/gsiDeclQGraphicsAnchor.cc

@@ -398,7 +398,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsAnchor_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -422,7 +422,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsAnchor_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -464,7 +464,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsAnchor_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -488,7 +488,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsAnchor_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -513,8 +513,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsAnchor_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -569,7 +569,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsAnchor_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }

src/gsiqt/qt4/QtGui/gsiDeclQGraphicsAnchorLayout.cc

@@ -622,10 +622,10 @@ static void _call_cbs_getContentsMargins_c4704_0 (const qt_gsi::GenericMethod *
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  double *arg1 = args.read<double * > (heap);
-  double *arg2 = args.read<double * > (heap);
-  double *arg3 = args.read<double * > (heap);
-  double *arg4 = args.read<double * > (heap);
+  double *arg1 = gsi::arg_reader<double * >() (args, heap);
+  double *arg2 = gsi::arg_reader<double * >() (args, heap);
+  double *arg3 = gsi::arg_reader<double * >() (args, heap);
+  double *arg4 = gsi::arg_reader<double * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsAnchorLayout_Adaptor *)cls)->cbs_getContentsMargins_c4704_0 (arg1, arg2, arg3, arg4);
 }
@@ -669,7 +669,7 @@ static void _call_cbs_itemAt_c767_0 (const qt_gsi::GenericMethod * /*decl*/, voi
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   ret.write<QGraphicsLayoutItem * > ((QGraphicsLayoutItem *)((QGraphicsAnchorLayout_Adaptor *)cls)->cbs_itemAt_c767_0 (arg1));
 }
 
@@ -692,7 +692,7 @@ static void _call_cbs_removeAt_767_0 (const qt_gsi::GenericMethod * /*decl*/, vo
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsAnchorLayout_Adaptor *)cls)->cbs_removeAt_767_0 (arg1);
 }
@@ -716,7 +716,7 @@ static void _call_cbs_setGeometry_1862_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QRectF &arg1 = args.read<const QRectF & > (heap);
+  const QRectF &arg1 = gsi::arg_reader<const QRectF & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsAnchorLayout_Adaptor *)cls)->cbs_setGeometry_1862_0 (arg1);
 }
@@ -780,8 +780,8 @@ static void _call_cbs_sizeHint_c3330_1 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<Qt::SizeHint>::target_type & arg1 = args.read<const qt_gsi::Converter<Qt::SizeHint>::target_type & > (heap);
-  const QSizeF &arg2 = args.read<const QSizeF & > (heap);
+  const qt_gsi::Converter<Qt::SizeHint>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<Qt::SizeHint>::target_type & >() (args, heap);
+  const QSizeF &arg2 = args ? gsi::arg_reader<const QSizeF & >() (args, heap) : gsi::arg_maker<const QSizeF & >() (QSizeF(), heap);
   ret.write<QSizeF > ((QSizeF)((QGraphicsAnchorLayout_Adaptor *)cls)->cbs_sizeHint_c3330_1 (arg1, arg2));
 }
 
@@ -824,7 +824,7 @@ static void _call_cbs_widgetEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsAnchorLayout_Adaptor *)cls)->cbs_widgetEvent_1217_0 (arg1);
 }

src/gsiqt/qt4/QtGui/gsiDeclQGraphicsBlurEffect.cc

@@ -565,7 +565,7 @@ static void _call_cbs_boundingRectFor_c1862_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QRectF &arg1 = args.read<const QRectF & > (heap);
+  const QRectF &arg1 = gsi::arg_reader<const QRectF & >() (args, heap);
   ret.write<QRectF > ((QRectF)((QGraphicsBlurEffect_Adaptor *)cls)->cbs_boundingRectFor_c1862_0 (arg1));
 }
 
@@ -588,7 +588,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsBlurEffect_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -612,7 +612,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsBlurEffect_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -654,7 +654,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsBlurEffect_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -678,7 +678,7 @@ static void _call_cbs_draw_1426_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QPainter *arg1 = args.read<QPainter * > (heap);
+  QPainter *arg1 = gsi::arg_reader<QPainter * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsBlurEffect_Adaptor *)cls)->cbs_draw_1426_0 (arg1);
 }
@@ -739,7 +739,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsBlurEffect_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -764,8 +764,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsBlurEffect_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -838,7 +838,7 @@ static void _call_cbs_sourceChanged_3695_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFlags<QGraphicsEffect::ChangeFlag> arg1 = args.read<QFlags<QGraphicsEffect::ChangeFlag> > (heap);
+  QFlags<QGraphicsEffect::ChangeFlag> arg1 = gsi::arg_reader<QFlags<QGraphicsEffect::ChangeFlag> >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsBlurEffect_Adaptor *)cls)->cbs_sourceChanged_3695_0 (arg1);
 }
@@ -900,7 +900,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsBlurEffect_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }

src/gsiqt/qt4/QtGui/gsiDeclQGraphicsColorizeEffect.cc

@@ -510,7 +510,7 @@ static void _call_cbs_boundingRectFor_c1862_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QRectF &arg1 = args.read<const QRectF & > (heap);
+  const QRectF &arg1 = gsi::arg_reader<const QRectF & >() (args, heap);
   ret.write<QRectF > ((QRectF)((QGraphicsColorizeEffect_Adaptor *)cls)->cbs_boundingRectFor_c1862_0 (arg1));
 }
 
@@ -533,7 +533,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsColorizeEffect_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -575,7 +575,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsColorizeEffect_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -617,7 +617,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsColorizeEffect_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -641,7 +641,7 @@ static void _call_cbs_draw_1426_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QPainter *arg1 = args.read<QPainter * > (heap);
+  QPainter *arg1 = gsi::arg_reader<QPainter * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsColorizeEffect_Adaptor *)cls)->cbs_draw_1426_0 (arg1);
 }
@@ -702,7 +702,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsColorizeEffect_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -727,8 +727,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsColorizeEffect_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -801,7 +801,7 @@ static void _call_cbs_sourceChanged_3695_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFlags<QGraphicsEffect::ChangeFlag> arg1 = args.read<QFlags<QGraphicsEffect::ChangeFlag> > (heap);
+  QFlags<QGraphicsEffect::ChangeFlag> arg1 = gsi::arg_reader<QFlags<QGraphicsEffect::ChangeFlag> >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsColorizeEffect_Adaptor *)cls)->cbs_sourceChanged_3695_0 (arg1);
 }
@@ -881,7 +881,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsColorizeEffect_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }

src/gsiqt/qt4/QtGui/gsiDeclQGraphicsDropShadowEffect.cc

@@ -712,7 +712,7 @@ static void _call_cbs_boundingRectFor_c1862_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QRectF &arg1 = args.read<const QRectF & > (heap);
+  const QRectF &arg1 = gsi::arg_reader<const QRectF & >() (args, heap);
   ret.write<QRectF > ((QRectF)((QGraphicsDropShadowEffect_Adaptor *)cls)->cbs_boundingRectFor_c1862_0 (arg1));
 }
 
@@ -735,7 +735,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsDropShadowEffect_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -777,7 +777,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsDropShadowEffect_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -819,7 +819,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsDropShadowEffect_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -843,7 +843,7 @@ static void _call_cbs_draw_1426_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QPainter *arg1 = args.read<QPainter * > (heap);
+  QPainter *arg1 = gsi::arg_reader<QPainter * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsDropShadowEffect_Adaptor *)cls)->cbs_draw_1426_0 (arg1);
 }
@@ -904,7 +904,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsDropShadowEffect_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -929,8 +929,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsDropShadowEffect_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -1021,7 +1021,7 @@ static void _call_cbs_sourceChanged_3695_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFlags<QGraphicsEffect::ChangeFlag> arg1 = args.read<QFlags<QGraphicsEffect::ChangeFlag> > (heap);
+  QFlags<QGraphicsEffect::ChangeFlag> arg1 = gsi::arg_reader<QFlags<QGraphicsEffect::ChangeFlag> >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsDropShadowEffect_Adaptor *)cls)->cbs_sourceChanged_3695_0 (arg1);
 }
@@ -1083,7 +1083,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsDropShadowEffect_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }

src/gsiqt/qt4/QtGui/gsiDeclQGraphicsEffect.cc

@@ -512,7 +512,7 @@ static void _call_cbs_boundingRectFor_c1862_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QRectF &arg1 = args.read<const QRectF & > (heap);
+  const QRectF &arg1 = gsi::arg_reader<const QRectF & >() (args, heap);
   ret.write<QRectF > ((QRectF)((QGraphicsEffect_Adaptor *)cls)->cbs_boundingRectFor_c1862_0 (arg1));
 }
 
@@ -535,7 +535,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsEffect_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -559,7 +559,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsEffect_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -601,7 +601,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsEffect_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -625,7 +625,7 @@ static void _call_cbs_draw_1426_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QPainter *arg1 = args.read<QPainter * > (heap);
+  QPainter *arg1 = gsi::arg_reader<QPainter * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsEffect_Adaptor *)cls)->cbs_draw_1426_0 (arg1);
 }
@@ -686,7 +686,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsEffect_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -711,8 +711,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsEffect_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -785,7 +785,7 @@ static void _call_cbs_sourceChanged_3695_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFlags<QGraphicsEffect::ChangeFlag> arg1 = args.read<QFlags<QGraphicsEffect::ChangeFlag> > (heap);
+  QFlags<QGraphicsEffect::ChangeFlag> arg1 = gsi::arg_reader<QFlags<QGraphicsEffect::ChangeFlag> >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsEffect_Adaptor *)cls)->cbs_sourceChanged_3695_0 (arg1);
 }
@@ -847,7 +847,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsEffect_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }

src/gsiqt/qt4/QtGui/gsiDeclQGraphicsEllipseItem.cc

@@ -1100,7 +1100,7 @@ static void _call_cbs_advance_767_0 (const qt_gsi::GenericMethod * /*decl*/, voi
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsEllipseItem_Adaptor *)cls)->cbs_advance_767_0 (arg1);
 }
@@ -1145,8 +1145,8 @@ static void _call_cbs_collidesWithItem_c4977_1 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QGraphicsItem *arg1 = args.read<const QGraphicsItem * > (heap);
-  const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & arg2 = args.read<const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & > (heap);
+  const QGraphicsItem *arg1 = gsi::arg_reader<const QGraphicsItem * >() (args, heap);
+  const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & arg2 = args ? gsi::arg_reader<const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & >() (args, heap) : gsi::arg_maker<const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & >() (qt_gsi::CppToQtReadAdaptor<Qt::ItemSelectionMode>(heap, Qt::IntersectsItemShape), heap);
   ret.write<bool > ((bool)((QGraphicsEllipseItem_Adaptor *)cls)->cbs_collidesWithItem_c4977_1 (arg1, arg2));
 }
 
@@ -1171,8 +1171,8 @@ static void _call_cbs_collidesWithPath_c4877_1 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QPainterPath &arg1 = args.read<const QPainterPath & > (heap);
-  const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & arg2 = args.read<const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & > (heap);
+  const QPainterPath &arg1 = gsi::arg_reader<const QPainterPath & >() (args, heap);
+  const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & arg2 = args ? gsi::arg_reader<const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & >() (args, heap) : gsi::arg_maker<const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & >() (qt_gsi::CppToQtReadAdaptor<Qt::ItemSelectionMode>(heap, Qt::IntersectsItemShape), heap);
   ret.write<bool > ((bool)((QGraphicsEllipseItem_Adaptor *)cls)->cbs_collidesWithPath_c4877_1 (arg1, arg2));
 }
 
@@ -1195,7 +1195,7 @@ static void _call_cbs_contains_c1986_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QPointF &arg1 = args.read<const QPointF & > (heap);
+  const QPointF &arg1 = gsi::arg_reader<const QPointF & >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsEllipseItem_Adaptor *)cls)->cbs_contains_c1986_0 (arg1));
 }
 
@@ -1218,7 +1218,7 @@ static void _call_cbs_contextMenuEvent_3674_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneContextMenuEvent *arg1 = args.read<QGraphicsSceneContextMenuEvent * > (heap);
+  QGraphicsSceneContextMenuEvent *arg1 = gsi::arg_reader<QGraphicsSceneContextMenuEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsEllipseItem_Adaptor *)cls)->cbs_contextMenuEvent_3674_0 (arg1);
 }
@@ -1242,7 +1242,7 @@ static void _call_cbs_dragEnterEvent_3315_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneDragDropEvent *arg1 = args.read<QGraphicsSceneDragDropEvent * > (heap);
+  QGraphicsSceneDragDropEvent *arg1 = gsi::arg_reader<QGraphicsSceneDragDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsEllipseItem_Adaptor *)cls)->cbs_dragEnterEvent_3315_0 (arg1);
 }
@@ -1266,7 +1266,7 @@ static void _call_cbs_dragLeaveEvent_3315_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneDragDropEvent *arg1 = args.read<QGraphicsSceneDragDropEvent * > (heap);
+  QGraphicsSceneDragDropEvent *arg1 = gsi::arg_reader<QGraphicsSceneDragDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsEllipseItem_Adaptor *)cls)->cbs_dragLeaveEvent_3315_0 (arg1);
 }
@@ -1290,7 +1290,7 @@ static void _call_cbs_dragMoveEvent_3315_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneDragDropEvent *arg1 = args.read<QGraphicsSceneDragDropEvent * > (heap);
+  QGraphicsSceneDragDropEvent *arg1 = gsi::arg_reader<QGraphicsSceneDragDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsEllipseItem_Adaptor *)cls)->cbs_dragMoveEvent_3315_0 (arg1);
 }
@@ -1314,7 +1314,7 @@ static void _call_cbs_dropEvent_3315_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneDragDropEvent *arg1 = args.read<QGraphicsSceneDragDropEvent * > (heap);
+  QGraphicsSceneDragDropEvent *arg1 = gsi::arg_reader<QGraphicsSceneDragDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsEllipseItem_Adaptor *)cls)->cbs_dropEvent_3315_0 (arg1);
 }
@@ -1338,7 +1338,7 @@ static void _call_cbs_extension_c2119_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QVariant &arg1 = args.read<const QVariant & > (heap);
+  const QVariant &arg1 = gsi::arg_reader<const QVariant & >() (args, heap);
   ret.write<QVariant > ((QVariant)((QGraphicsEllipseItem_Adaptor *)cls)->cbs_extension_c2119_0 (arg1));
 }
 
@@ -1361,7 +1361,7 @@ static void _call_cbs_focusInEvent_1729_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsEllipseItem_Adaptor *)cls)->cbs_focusInEvent_1729_0 (arg1);
 }
@@ -1385,7 +1385,7 @@ static void _call_cbs_focusOutEvent_1729_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsEllipseItem_Adaptor *)cls)->cbs_focusOutEvent_1729_0 (arg1);
 }
@@ -1409,7 +1409,7 @@ static void _call_cbs_hoverEnterEvent_3044_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneHoverEvent *arg1 = args.read<QGraphicsSceneHoverEvent * > (heap);
+  QGraphicsSceneHoverEvent *arg1 = gsi::arg_reader<QGraphicsSceneHoverEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsEllipseItem_Adaptor *)cls)->cbs_hoverEnterEvent_3044_0 (arg1);
 }
@@ -1433,7 +1433,7 @@ static void _call_cbs_hoverLeaveEvent_3044_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneHoverEvent *arg1 = args.read<QGraphicsSceneHoverEvent * > (heap);
+  QGraphicsSceneHoverEvent *arg1 = gsi::arg_reader<QGraphicsSceneHoverEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsEllipseItem_Adaptor *)cls)->cbs_hoverLeaveEvent_3044_0 (arg1);
 }
@@ -1457,7 +1457,7 @@ static void _call_cbs_hoverMoveEvent_3044_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneHoverEvent *arg1 = args.read<QGraphicsSceneHoverEvent * > (heap);
+  QGraphicsSceneHoverEvent *arg1 = gsi::arg_reader<QGraphicsSceneHoverEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsEllipseItem_Adaptor *)cls)->cbs_hoverMoveEvent_3044_0 (arg1);
 }
@@ -1481,7 +1481,7 @@ static void _call_cbs_inputMethodEvent_2354_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QInputMethodEvent *arg1 = args.read<QInputMethodEvent * > (heap);
+  QInputMethodEvent *arg1 = gsi::arg_reader<QInputMethodEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsEllipseItem_Adaptor *)cls)->cbs_inputMethodEvent_2354_0 (arg1);
 }
@@ -1505,7 +1505,7 @@ static void _call_cbs_inputMethodQuery_c2420_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = args.read<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & > (heap);
+  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & >() (args, heap);
   ret.write<QVariant > ((QVariant)((QGraphicsEllipseItem_Adaptor *)cls)->cbs_inputMethodQuery_c2420_0 (arg1));
 }
 
@@ -1528,7 +1528,7 @@ static void _call_cbs_isObscuredBy_c2614_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QGraphicsItem *arg1 = args.read<const QGraphicsItem * > (heap);
+  const QGraphicsItem *arg1 = gsi::arg_reader<const QGraphicsItem * >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsEllipseItem_Adaptor *)cls)->cbs_isObscuredBy_c2614_0 (arg1));
 }
 
@@ -1553,8 +1553,8 @@ static void _call_cbs_itemChange_5658_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QGraphicsItem::GraphicsItemChange>::target_type & arg1 = args.read<const qt_gsi::Converter<QGraphicsItem::GraphicsItemChange>::target_type & > (heap);
-  const QVariant &arg2 = args.read<const QVariant & > (heap);
+  const qt_gsi::Converter<QGraphicsItem::GraphicsItemChange>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QGraphicsItem::GraphicsItemChange>::target_type & >() (args, heap);
+  const QVariant &arg2 = gsi::arg_reader<const QVariant & >() (args, heap);
   ret.write<QVariant > ((QVariant)((QGraphicsEllipseItem_Adaptor *)cls)->cbs_itemChange_5658_0 (arg1, arg2));
 }
 
@@ -1577,7 +1577,7 @@ static void _call_cbs_keyPressEvent_1514_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsEllipseItem_Adaptor *)cls)->cbs_keyPressEvent_1514_0 (arg1);
 }
@@ -1601,7 +1601,7 @@ static void _call_cbs_keyReleaseEvent_1514_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsEllipseItem_Adaptor *)cls)->cbs_keyReleaseEvent_1514_0 (arg1);
 }
@@ -1625,7 +1625,7 @@ static void _call_cbs_mouseDoubleClickEvent_3049_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneMouseEvent *arg1 = args.read<QGraphicsSceneMouseEvent * > (heap);
+  QGraphicsSceneMouseEvent *arg1 = gsi::arg_reader<QGraphicsSceneMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsEllipseItem_Adaptor *)cls)->cbs_mouseDoubleClickEvent_3049_0 (arg1);
 }
@@ -1649,7 +1649,7 @@ static void _call_cbs_mouseMoveEvent_3049_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneMouseEvent *arg1 = args.read<QGraphicsSceneMouseEvent * > (heap);
+  QGraphicsSceneMouseEvent *arg1 = gsi::arg_reader<QGraphicsSceneMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsEllipseItem_Adaptor *)cls)->cbs_mouseMoveEvent_3049_0 (arg1);
 }
@@ -1673,7 +1673,7 @@ static void _call_cbs_mousePressEvent_3049_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneMouseEvent *arg1 = args.read<QGraphicsSceneMouseEvent * > (heap);
+  QGraphicsSceneMouseEvent *arg1 = gsi::arg_reader<QGraphicsSceneMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsEllipseItem_Adaptor *)cls)->cbs_mousePressEvent_3049_0 (arg1);
 }
@@ -1697,7 +1697,7 @@ static void _call_cbs_mouseReleaseEvent_3049_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneMouseEvent *arg1 = args.read<QGraphicsSceneMouseEvent * > (heap);
+  QGraphicsSceneMouseEvent *arg1 = gsi::arg_reader<QGraphicsSceneMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsEllipseItem_Adaptor *)cls)->cbs_mouseReleaseEvent_3049_0 (arg1);
 }
@@ -1744,9 +1744,9 @@ static void _call_cbs_paint_6301_1 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QPainter *arg1 = args.read<QPainter * > (heap);
-  const QStyleOptionGraphicsItem *arg2 = args.read<const QStyleOptionGraphicsItem * > (heap);
-  QWidget *arg3 = args.read<QWidget * > (heap);
+  QPainter *arg1 = gsi::arg_reader<QPainter * >() (args, heap);
+  const QStyleOptionGraphicsItem *arg2 = gsi::arg_reader<const QStyleOptionGraphicsItem * >() (args, heap);
+  QWidget *arg3 = args ? gsi::arg_reader<QWidget * >() (args, heap) : gsi::arg_maker<QWidget * >() (0, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsEllipseItem_Adaptor *)cls)->cbs_paint_6301_1 (arg1, arg2, arg3);
 }
@@ -1800,7 +1800,7 @@ static void _call_cbs_sceneEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsEllipseItem_Adaptor *)cls)->cbs_sceneEvent_1217_0 (arg1));
 }
 
@@ -1825,8 +1825,8 @@ static void _call_cbs_sceneEventFilter_3028_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsItem *arg1 = args.read<QGraphicsItem * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QGraphicsItem *arg1 = gsi::arg_reader<QGraphicsItem * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsEllipseItem_Adaptor *)cls)->cbs_sceneEventFilter_3028_0 (arg1, arg2));
 }
 
@@ -1851,8 +1851,8 @@ static void _call_cbs_setExtension_4817_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  unsigned int arg1 = args.read<unsigned int > (heap);
-  const QVariant &arg2 = args.read<const QVariant & > (heap);
+  unsigned int arg1 = gsi::arg_reader<unsigned int >() (args, heap);
+  const QVariant &arg2 = gsi::arg_reader<const QVariant & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsEllipseItem_Adaptor *)cls)->cbs_setExtension_4817_0 (arg1, arg2);
 }
@@ -1895,7 +1895,7 @@ static void _call_cbs_supportsExtension_c2806_0 (const qt_gsi::GenericMethod * /
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  unsigned int arg1 = args.read<unsigned int > (heap);
+  unsigned int arg1 = gsi::arg_reader<unsigned int >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsEllipseItem_Adaptor *)cls)->cbs_supportsExtension_c2806_0 (arg1));
 }
 
@@ -1937,7 +1937,7 @@ static void _call_cbs_wheelEvent_3029_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneWheelEvent *arg1 = args.read<QGraphicsSceneWheelEvent * > (heap);
+  QGraphicsSceneWheelEvent *arg1 = gsi::arg_reader<QGraphicsSceneWheelEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsEllipseItem_Adaptor *)cls)->cbs_wheelEvent_3029_0 (arg1);
 }

src/gsiqt/qt4/QtGui/gsiDeclQGraphicsGridLayout.cc

@@ -1270,10 +1270,10 @@ static void _call_cbs_getContentsMargins_c4704_0 (const qt_gsi::GenericMethod *
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  double *arg1 = args.read<double * > (heap);
-  double *arg2 = args.read<double * > (heap);
-  double *arg3 = args.read<double * > (heap);
-  double *arg4 = args.read<double * > (heap);
+  double *arg1 = gsi::arg_reader<double * >() (args, heap);
+  double *arg2 = gsi::arg_reader<double * >() (args, heap);
+  double *arg3 = gsi::arg_reader<double * >() (args, heap);
+  double *arg4 = gsi::arg_reader<double * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsGridLayout_Adaptor *)cls)->cbs_getContentsMargins_c4704_0 (arg1, arg2, arg3, arg4);
 }
@@ -1317,7 +1317,7 @@ static void _call_cbs_itemAt_c767_0 (const qt_gsi::GenericMethod * /*decl*/, voi
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   ret.write<QGraphicsLayoutItem * > ((QGraphicsLayoutItem *)((QGraphicsGridLayout_Adaptor *)cls)->cbs_itemAt_c767_0 (arg1));
 }
 
@@ -1340,7 +1340,7 @@ static void _call_cbs_removeAt_767_0 (const qt_gsi::GenericMethod * /*decl*/, vo
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsGridLayout_Adaptor *)cls)->cbs_removeAt_767_0 (arg1);
 }
@@ -1364,7 +1364,7 @@ static void _call_cbs_setGeometry_1862_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QRectF &arg1 = args.read<const QRectF & > (heap);
+  const QRectF &arg1 = gsi::arg_reader<const QRectF & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsGridLayout_Adaptor *)cls)->cbs_setGeometry_1862_0 (arg1);
 }
@@ -1428,8 +1428,8 @@ static void _call_cbs_sizeHint_c3330_1 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<Qt::SizeHint>::target_type & arg1 = args.read<const qt_gsi::Converter<Qt::SizeHint>::target_type & > (heap);
-  const QSizeF &arg2 = args.read<const QSizeF & > (heap);
+  const qt_gsi::Converter<Qt::SizeHint>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<Qt::SizeHint>::target_type & >() (args, heap);
+  const QSizeF &arg2 = args ? gsi::arg_reader<const QSizeF & >() (args, heap) : gsi::arg_maker<const QSizeF & >() (QSizeF(), heap);
   ret.write<QSizeF > ((QSizeF)((QGraphicsGridLayout_Adaptor *)cls)->cbs_sizeHint_c3330_1 (arg1, arg2));
 }
 
@@ -1472,7 +1472,7 @@ static void _call_cbs_widgetEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsGridLayout_Adaptor *)cls)->cbs_widgetEvent_1217_0 (arg1);
 }

src/gsiqt/qt4/QtGui/gsiDeclQGraphicsItem.cc

@@ -4548,7 +4548,7 @@ static void _call_cbs_advance_767_0 (const qt_gsi::GenericMethod * /*decl*/, voi
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsItem_Adaptor *)cls)->cbs_advance_767_0 (arg1);
 }
@@ -4593,8 +4593,8 @@ static void _call_cbs_collidesWithItem_c4977_1 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QGraphicsItem *arg1 = args.read<const QGraphicsItem * > (heap);
-  const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & arg2 = args.read<const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & > (heap);
+  const QGraphicsItem *arg1 = gsi::arg_reader<const QGraphicsItem * >() (args, heap);
+  const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & arg2 = args ? gsi::arg_reader<const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & >() (args, heap) : gsi::arg_maker<const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & >() (qt_gsi::CppToQtReadAdaptor<Qt::ItemSelectionMode>(heap, Qt::IntersectsItemShape), heap);
   ret.write<bool > ((bool)((QGraphicsItem_Adaptor *)cls)->cbs_collidesWithItem_c4977_1 (arg1, arg2));
 }
 
@@ -4619,8 +4619,8 @@ static void _call_cbs_collidesWithPath_c4877_1 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QPainterPath &arg1 = args.read<const QPainterPath & > (heap);
-  const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & arg2 = args.read<const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & > (heap);
+  const QPainterPath &arg1 = gsi::arg_reader<const QPainterPath & >() (args, heap);
+  const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & arg2 = args ? gsi::arg_reader<const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & >() (args, heap) : gsi::arg_maker<const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & >() (qt_gsi::CppToQtReadAdaptor<Qt::ItemSelectionMode>(heap, Qt::IntersectsItemShape), heap);
   ret.write<bool > ((bool)((QGraphicsItem_Adaptor *)cls)->cbs_collidesWithPath_c4877_1 (arg1, arg2));
 }
 
@@ -4643,7 +4643,7 @@ static void _call_cbs_contains_c1986_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QPointF &arg1 = args.read<const QPointF & > (heap);
+  const QPointF &arg1 = gsi::arg_reader<const QPointF & >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsItem_Adaptor *)cls)->cbs_contains_c1986_0 (arg1));
 }
 
@@ -4666,7 +4666,7 @@ static void _call_cbs_contextMenuEvent_3674_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneContextMenuEvent *arg1 = args.read<QGraphicsSceneContextMenuEvent * > (heap);
+  QGraphicsSceneContextMenuEvent *arg1 = gsi::arg_reader<QGraphicsSceneContextMenuEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsItem_Adaptor *)cls)->cbs_contextMenuEvent_3674_0 (arg1);
 }
@@ -4690,7 +4690,7 @@ static void _call_cbs_dragEnterEvent_3315_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneDragDropEvent *arg1 = args.read<QGraphicsSceneDragDropEvent * > (heap);
+  QGraphicsSceneDragDropEvent *arg1 = gsi::arg_reader<QGraphicsSceneDragDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsItem_Adaptor *)cls)->cbs_dragEnterEvent_3315_0 (arg1);
 }
@@ -4714,7 +4714,7 @@ static void _call_cbs_dragLeaveEvent_3315_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneDragDropEvent *arg1 = args.read<QGraphicsSceneDragDropEvent * > (heap);
+  QGraphicsSceneDragDropEvent *arg1 = gsi::arg_reader<QGraphicsSceneDragDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsItem_Adaptor *)cls)->cbs_dragLeaveEvent_3315_0 (arg1);
 }
@@ -4738,7 +4738,7 @@ static void _call_cbs_dragMoveEvent_3315_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneDragDropEvent *arg1 = args.read<QGraphicsSceneDragDropEvent * > (heap);
+  QGraphicsSceneDragDropEvent *arg1 = gsi::arg_reader<QGraphicsSceneDragDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsItem_Adaptor *)cls)->cbs_dragMoveEvent_3315_0 (arg1);
 }
@@ -4762,7 +4762,7 @@ static void _call_cbs_dropEvent_3315_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneDragDropEvent *arg1 = args.read<QGraphicsSceneDragDropEvent * > (heap);
+  QGraphicsSceneDragDropEvent *arg1 = gsi::arg_reader<QGraphicsSceneDragDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsItem_Adaptor *)cls)->cbs_dropEvent_3315_0 (arg1);
 }
@@ -4786,7 +4786,7 @@ static void _call_cbs_extension_c2119_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QVariant &arg1 = args.read<const QVariant & > (heap);
+  const QVariant &arg1 = gsi::arg_reader<const QVariant & >() (args, heap);
   ret.write<QVariant > ((QVariant)((QGraphicsItem_Adaptor *)cls)->cbs_extension_c2119_0 (arg1));
 }
 
@@ -4809,7 +4809,7 @@ static void _call_cbs_focusInEvent_1729_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsItem_Adaptor *)cls)->cbs_focusInEvent_1729_0 (arg1);
 }
@@ -4833,7 +4833,7 @@ static void _call_cbs_focusOutEvent_1729_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsItem_Adaptor *)cls)->cbs_focusOutEvent_1729_0 (arg1);
 }
@@ -4857,7 +4857,7 @@ static void _call_cbs_hoverEnterEvent_3044_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneHoverEvent *arg1 = args.read<QGraphicsSceneHoverEvent * > (heap);
+  QGraphicsSceneHoverEvent *arg1 = gsi::arg_reader<QGraphicsSceneHoverEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsItem_Adaptor *)cls)->cbs_hoverEnterEvent_3044_0 (arg1);
 }
@@ -4881,7 +4881,7 @@ static void _call_cbs_hoverLeaveEvent_3044_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneHoverEvent *arg1 = args.read<QGraphicsSceneHoverEvent * > (heap);
+  QGraphicsSceneHoverEvent *arg1 = gsi::arg_reader<QGraphicsSceneHoverEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsItem_Adaptor *)cls)->cbs_hoverLeaveEvent_3044_0 (arg1);
 }
@@ -4905,7 +4905,7 @@ static void _call_cbs_hoverMoveEvent_3044_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneHoverEvent *arg1 = args.read<QGraphicsSceneHoverEvent * > (heap);
+  QGraphicsSceneHoverEvent *arg1 = gsi::arg_reader<QGraphicsSceneHoverEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsItem_Adaptor *)cls)->cbs_hoverMoveEvent_3044_0 (arg1);
 }
@@ -4929,7 +4929,7 @@ static void _call_cbs_inputMethodEvent_2354_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QInputMethodEvent *arg1 = args.read<QInputMethodEvent * > (heap);
+  QInputMethodEvent *arg1 = gsi::arg_reader<QInputMethodEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsItem_Adaptor *)cls)->cbs_inputMethodEvent_2354_0 (arg1);
 }
@@ -4953,7 +4953,7 @@ static void _call_cbs_inputMethodQuery_c2420_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = args.read<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & > (heap);
+  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & >() (args, heap);
   ret.write<QVariant > ((QVariant)((QGraphicsItem_Adaptor *)cls)->cbs_inputMethodQuery_c2420_0 (arg1));
 }
 
@@ -4976,7 +4976,7 @@ static void _call_cbs_isObscuredBy_c2614_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QGraphicsItem *arg1 = args.read<const QGraphicsItem * > (heap);
+  const QGraphicsItem *arg1 = gsi::arg_reader<const QGraphicsItem * >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsItem_Adaptor *)cls)->cbs_isObscuredBy_c2614_0 (arg1));
 }
 
@@ -5001,8 +5001,8 @@ static void _call_cbs_itemChange_5658_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QGraphicsItem::GraphicsItemChange>::target_type & arg1 = args.read<const qt_gsi::Converter<QGraphicsItem::GraphicsItemChange>::target_type & > (heap);
-  const QVariant &arg2 = args.read<const QVariant & > (heap);
+  const qt_gsi::Converter<QGraphicsItem::GraphicsItemChange>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QGraphicsItem::GraphicsItemChange>::target_type & >() (args, heap);
+  const QVariant &arg2 = gsi::arg_reader<const QVariant & >() (args, heap);
   ret.write<QVariant > ((QVariant)((QGraphicsItem_Adaptor *)cls)->cbs_itemChange_5658_0 (arg1, arg2));
 }
 
@@ -5025,7 +5025,7 @@ static void _call_cbs_keyPressEvent_1514_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsItem_Adaptor *)cls)->cbs_keyPressEvent_1514_0 (arg1);
 }
@@ -5049,7 +5049,7 @@ static void _call_cbs_keyReleaseEvent_1514_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsItem_Adaptor *)cls)->cbs_keyReleaseEvent_1514_0 (arg1);
 }
@@ -5073,7 +5073,7 @@ static void _call_cbs_mouseDoubleClickEvent_3049_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneMouseEvent *arg1 = args.read<QGraphicsSceneMouseEvent * > (heap);
+  QGraphicsSceneMouseEvent *arg1 = gsi::arg_reader<QGraphicsSceneMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsItem_Adaptor *)cls)->cbs_mouseDoubleClickEvent_3049_0 (arg1);
 }
@@ -5097,7 +5097,7 @@ static void _call_cbs_mouseMoveEvent_3049_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneMouseEvent *arg1 = args.read<QGraphicsSceneMouseEvent * > (heap);
+  QGraphicsSceneMouseEvent *arg1 = gsi::arg_reader<QGraphicsSceneMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsItem_Adaptor *)cls)->cbs_mouseMoveEvent_3049_0 (arg1);
 }
@@ -5121,7 +5121,7 @@ static void _call_cbs_mousePressEvent_3049_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneMouseEvent *arg1 = args.read<QGraphicsSceneMouseEvent * > (heap);
+  QGraphicsSceneMouseEvent *arg1 = gsi::arg_reader<QGraphicsSceneMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsItem_Adaptor *)cls)->cbs_mousePressEvent_3049_0 (arg1);
 }
@@ -5145,7 +5145,7 @@ static void _call_cbs_mouseReleaseEvent_3049_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneMouseEvent *arg1 = args.read<QGraphicsSceneMouseEvent * > (heap);
+  QGraphicsSceneMouseEvent *arg1 = gsi::arg_reader<QGraphicsSceneMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsItem_Adaptor *)cls)->cbs_mouseReleaseEvent_3049_0 (arg1);
 }
@@ -5192,9 +5192,9 @@ static void _call_cbs_paint_6301_1 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QPainter *arg1 = args.read<QPainter * > (heap);
-  const QStyleOptionGraphicsItem *arg2 = args.read<const QStyleOptionGraphicsItem * > (heap);
-  QWidget *arg3 = args.read<QWidget * > (heap);
+  QPainter *arg1 = gsi::arg_reader<QPainter * >() (args, heap);
+  const QStyleOptionGraphicsItem *arg2 = gsi::arg_reader<const QStyleOptionGraphicsItem * >() (args, heap);
+  QWidget *arg3 = args ? gsi::arg_reader<QWidget * >() (args, heap) : gsi::arg_maker<QWidget * >() (0, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsItem_Adaptor *)cls)->cbs_paint_6301_1 (arg1, arg2, arg3);
 }
@@ -5248,7 +5248,7 @@ static void _call_cbs_sceneEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsItem_Adaptor *)cls)->cbs_sceneEvent_1217_0 (arg1));
 }
 
@@ -5273,8 +5273,8 @@ static void _call_cbs_sceneEventFilter_3028_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsItem *arg1 = args.read<QGraphicsItem * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QGraphicsItem *arg1 = gsi::arg_reader<QGraphicsItem * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsItem_Adaptor *)cls)->cbs_sceneEventFilter_3028_0 (arg1, arg2));
 }
 
@@ -5299,8 +5299,8 @@ static void _call_cbs_setExtension_4817_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  unsigned int arg1 = args.read<unsigned int > (heap);
-  const QVariant &arg2 = args.read<const QVariant & > (heap);
+  unsigned int arg1 = gsi::arg_reader<unsigned int >() (args, heap);
+  const QVariant &arg2 = gsi::arg_reader<const QVariant & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsItem_Adaptor *)cls)->cbs_setExtension_4817_0 (arg1, arg2);
 }
@@ -5343,7 +5343,7 @@ static void _call_cbs_supportsExtension_c2806_0 (const qt_gsi::GenericMethod * /
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  unsigned int arg1 = args.read<unsigned int > (heap);
+  unsigned int arg1 = gsi::arg_reader<unsigned int >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsItem_Adaptor *)cls)->cbs_supportsExtension_c2806_0 (arg1));
 }
 
@@ -5385,7 +5385,7 @@ static void _call_cbs_wheelEvent_3029_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneWheelEvent *arg1 = args.read<QGraphicsSceneWheelEvent * > (heap);
+  QGraphicsSceneWheelEvent *arg1 = gsi::arg_reader<QGraphicsSceneWheelEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsItem_Adaptor *)cls)->cbs_wheelEvent_3029_0 (arg1);
 }

src/gsiqt/qt4/QtGui/gsiDeclQGraphicsItemAnimation.cc

@@ -891,7 +891,7 @@ static void _call_cbs_afterAnimationStep_1071_0 (const qt_gsi::GenericMethod * /
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  double arg1 = args.read<double > (heap);
+  double arg1 = gsi::arg_reader<double >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsItemAnimation_Adaptor *)cls)->cbs_afterAnimationStep_1071_0 (arg1);
 }
@@ -915,7 +915,7 @@ static void _call_cbs_beforeAnimationStep_1071_0 (const qt_gsi::GenericMethod *
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  double arg1 = args.read<double > (heap);
+  double arg1 = gsi::arg_reader<double >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsItemAnimation_Adaptor *)cls)->cbs_beforeAnimationStep_1071_0 (arg1);
 }
@@ -939,7 +939,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsItemAnimation_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -963,7 +963,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsItemAnimation_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -1005,7 +1005,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsItemAnimation_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -1029,7 +1029,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsItemAnimation_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -1054,8 +1054,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsItemAnimation_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -1110,7 +1110,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsItemAnimation_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }

src/gsiqt/qt4/QtGui/gsiDeclQGraphicsItemGroup.cc

@@ -870,7 +870,7 @@ static void _call_cbs_advance_767_0 (const qt_gsi::GenericMethod * /*decl*/, voi
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsItemGroup_Adaptor *)cls)->cbs_advance_767_0 (arg1);
 }
@@ -915,8 +915,8 @@ static void _call_cbs_collidesWithItem_c4977_1 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QGraphicsItem *arg1 = args.read<const QGraphicsItem * > (heap);
-  const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & arg2 = args.read<const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & > (heap);
+  const QGraphicsItem *arg1 = gsi::arg_reader<const QGraphicsItem * >() (args, heap);
+  const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & arg2 = args ? gsi::arg_reader<const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & >() (args, heap) : gsi::arg_maker<const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & >() (qt_gsi::CppToQtReadAdaptor<Qt::ItemSelectionMode>(heap, Qt::IntersectsItemShape), heap);
   ret.write<bool > ((bool)((QGraphicsItemGroup_Adaptor *)cls)->cbs_collidesWithItem_c4977_1 (arg1, arg2));
 }
 
@@ -941,8 +941,8 @@ static void _call_cbs_collidesWithPath_c4877_1 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QPainterPath &arg1 = args.read<const QPainterPath & > (heap);
-  const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & arg2 = args.read<const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & > (heap);
+  const QPainterPath &arg1 = gsi::arg_reader<const QPainterPath & >() (args, heap);
+  const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & arg2 = args ? gsi::arg_reader<const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & >() (args, heap) : gsi::arg_maker<const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & >() (qt_gsi::CppToQtReadAdaptor<Qt::ItemSelectionMode>(heap, Qt::IntersectsItemShape), heap);
   ret.write<bool > ((bool)((QGraphicsItemGroup_Adaptor *)cls)->cbs_collidesWithPath_c4877_1 (arg1, arg2));
 }
 
@@ -965,7 +965,7 @@ static void _call_cbs_contains_c1986_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QPointF &arg1 = args.read<const QPointF & > (heap);
+  const QPointF &arg1 = gsi::arg_reader<const QPointF & >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsItemGroup_Adaptor *)cls)->cbs_contains_c1986_0 (arg1));
 }
 
@@ -988,7 +988,7 @@ static void _call_cbs_contextMenuEvent_3674_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneContextMenuEvent *arg1 = args.read<QGraphicsSceneContextMenuEvent * > (heap);
+  QGraphicsSceneContextMenuEvent *arg1 = gsi::arg_reader<QGraphicsSceneContextMenuEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsItemGroup_Adaptor *)cls)->cbs_contextMenuEvent_3674_0 (arg1);
 }
@@ -1012,7 +1012,7 @@ static void _call_cbs_dragEnterEvent_3315_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneDragDropEvent *arg1 = args.read<QGraphicsSceneDragDropEvent * > (heap);
+  QGraphicsSceneDragDropEvent *arg1 = gsi::arg_reader<QGraphicsSceneDragDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsItemGroup_Adaptor *)cls)->cbs_dragEnterEvent_3315_0 (arg1);
 }
@@ -1036,7 +1036,7 @@ static void _call_cbs_dragLeaveEvent_3315_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneDragDropEvent *arg1 = args.read<QGraphicsSceneDragDropEvent * > (heap);
+  QGraphicsSceneDragDropEvent *arg1 = gsi::arg_reader<QGraphicsSceneDragDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsItemGroup_Adaptor *)cls)->cbs_dragLeaveEvent_3315_0 (arg1);
 }
@@ -1060,7 +1060,7 @@ static void _call_cbs_dragMoveEvent_3315_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneDragDropEvent *arg1 = args.read<QGraphicsSceneDragDropEvent * > (heap);
+  QGraphicsSceneDragDropEvent *arg1 = gsi::arg_reader<QGraphicsSceneDragDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsItemGroup_Adaptor *)cls)->cbs_dragMoveEvent_3315_0 (arg1);
 }
@@ -1084,7 +1084,7 @@ static void _call_cbs_dropEvent_3315_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneDragDropEvent *arg1 = args.read<QGraphicsSceneDragDropEvent * > (heap);
+  QGraphicsSceneDragDropEvent *arg1 = gsi::arg_reader<QGraphicsSceneDragDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsItemGroup_Adaptor *)cls)->cbs_dropEvent_3315_0 (arg1);
 }
@@ -1108,7 +1108,7 @@ static void _call_cbs_extension_c2119_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QVariant &arg1 = args.read<const QVariant & > (heap);
+  const QVariant &arg1 = gsi::arg_reader<const QVariant & >() (args, heap);
   ret.write<QVariant > ((QVariant)((QGraphicsItemGroup_Adaptor *)cls)->cbs_extension_c2119_0 (arg1));
 }
 
@@ -1131,7 +1131,7 @@ static void _call_cbs_focusInEvent_1729_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsItemGroup_Adaptor *)cls)->cbs_focusInEvent_1729_0 (arg1);
 }
@@ -1155,7 +1155,7 @@ static void _call_cbs_focusOutEvent_1729_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsItemGroup_Adaptor *)cls)->cbs_focusOutEvent_1729_0 (arg1);
 }
@@ -1179,7 +1179,7 @@ static void _call_cbs_hoverEnterEvent_3044_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneHoverEvent *arg1 = args.read<QGraphicsSceneHoverEvent * > (heap);
+  QGraphicsSceneHoverEvent *arg1 = gsi::arg_reader<QGraphicsSceneHoverEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsItemGroup_Adaptor *)cls)->cbs_hoverEnterEvent_3044_0 (arg1);
 }
@@ -1203,7 +1203,7 @@ static void _call_cbs_hoverLeaveEvent_3044_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneHoverEvent *arg1 = args.read<QGraphicsSceneHoverEvent * > (heap);
+  QGraphicsSceneHoverEvent *arg1 = gsi::arg_reader<QGraphicsSceneHoverEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsItemGroup_Adaptor *)cls)->cbs_hoverLeaveEvent_3044_0 (arg1);
 }
@@ -1227,7 +1227,7 @@ static void _call_cbs_hoverMoveEvent_3044_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneHoverEvent *arg1 = args.read<QGraphicsSceneHoverEvent * > (heap);
+  QGraphicsSceneHoverEvent *arg1 = gsi::arg_reader<QGraphicsSceneHoverEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsItemGroup_Adaptor *)cls)->cbs_hoverMoveEvent_3044_0 (arg1);
 }
@@ -1251,7 +1251,7 @@ static void _call_cbs_inputMethodEvent_2354_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QInputMethodEvent *arg1 = args.read<QInputMethodEvent * > (heap);
+  QInputMethodEvent *arg1 = gsi::arg_reader<QInputMethodEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsItemGroup_Adaptor *)cls)->cbs_inputMethodEvent_2354_0 (arg1);
 }
@@ -1275,7 +1275,7 @@ static void _call_cbs_inputMethodQuery_c2420_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = args.read<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & > (heap);
+  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & >() (args, heap);
   ret.write<QVariant > ((QVariant)((QGraphicsItemGroup_Adaptor *)cls)->cbs_inputMethodQuery_c2420_0 (arg1));
 }
 
@@ -1298,7 +1298,7 @@ static void _call_cbs_isObscuredBy_c2614_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QGraphicsItem *arg1 = args.read<const QGraphicsItem * > (heap);
+  const QGraphicsItem *arg1 = gsi::arg_reader<const QGraphicsItem * >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsItemGroup_Adaptor *)cls)->cbs_isObscuredBy_c2614_0 (arg1));
 }
 
@@ -1323,8 +1323,8 @@ static void _call_cbs_itemChange_5658_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QGraphicsItem::GraphicsItemChange>::target_type & arg1 = args.read<const qt_gsi::Converter<QGraphicsItem::GraphicsItemChange>::target_type & > (heap);
-  const QVariant &arg2 = args.read<const QVariant & > (heap);
+  const qt_gsi::Converter<QGraphicsItem::GraphicsItemChange>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QGraphicsItem::GraphicsItemChange>::target_type & >() (args, heap);
+  const QVariant &arg2 = gsi::arg_reader<const QVariant & >() (args, heap);
   ret.write<QVariant > ((QVariant)((QGraphicsItemGroup_Adaptor *)cls)->cbs_itemChange_5658_0 (arg1, arg2));
 }
 
@@ -1347,7 +1347,7 @@ static void _call_cbs_keyPressEvent_1514_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsItemGroup_Adaptor *)cls)->cbs_keyPressEvent_1514_0 (arg1);
 }
@@ -1371,7 +1371,7 @@ static void _call_cbs_keyReleaseEvent_1514_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsItemGroup_Adaptor *)cls)->cbs_keyReleaseEvent_1514_0 (arg1);
 }
@@ -1395,7 +1395,7 @@ static void _call_cbs_mouseDoubleClickEvent_3049_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneMouseEvent *arg1 = args.read<QGraphicsSceneMouseEvent * > (heap);
+  QGraphicsSceneMouseEvent *arg1 = gsi::arg_reader<QGraphicsSceneMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsItemGroup_Adaptor *)cls)->cbs_mouseDoubleClickEvent_3049_0 (arg1);
 }
@@ -1419,7 +1419,7 @@ static void _call_cbs_mouseMoveEvent_3049_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneMouseEvent *arg1 = args.read<QGraphicsSceneMouseEvent * > (heap);
+  QGraphicsSceneMouseEvent *arg1 = gsi::arg_reader<QGraphicsSceneMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsItemGroup_Adaptor *)cls)->cbs_mouseMoveEvent_3049_0 (arg1);
 }
@@ -1443,7 +1443,7 @@ static void _call_cbs_mousePressEvent_3049_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneMouseEvent *arg1 = args.read<QGraphicsSceneMouseEvent * > (heap);
+  QGraphicsSceneMouseEvent *arg1 = gsi::arg_reader<QGraphicsSceneMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsItemGroup_Adaptor *)cls)->cbs_mousePressEvent_3049_0 (arg1);
 }
@@ -1467,7 +1467,7 @@ static void _call_cbs_mouseReleaseEvent_3049_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneMouseEvent *arg1 = args.read<QGraphicsSceneMouseEvent * > (heap);
+  QGraphicsSceneMouseEvent *arg1 = gsi::arg_reader<QGraphicsSceneMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsItemGroup_Adaptor *)cls)->cbs_mouseReleaseEvent_3049_0 (arg1);
 }
@@ -1514,9 +1514,9 @@ static void _call_cbs_paint_6301_1 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QPainter *arg1 = args.read<QPainter * > (heap);
-  const QStyleOptionGraphicsItem *arg2 = args.read<const QStyleOptionGraphicsItem * > (heap);
-  QWidget *arg3 = args.read<QWidget * > (heap);
+  QPainter *arg1 = gsi::arg_reader<QPainter * >() (args, heap);
+  const QStyleOptionGraphicsItem *arg2 = gsi::arg_reader<const QStyleOptionGraphicsItem * >() (args, heap);
+  QWidget *arg3 = args ? gsi::arg_reader<QWidget * >() (args, heap) : gsi::arg_maker<QWidget * >() (0, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsItemGroup_Adaptor *)cls)->cbs_paint_6301_1 (arg1, arg2, arg3);
 }
@@ -1570,7 +1570,7 @@ static void _call_cbs_sceneEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsItemGroup_Adaptor *)cls)->cbs_sceneEvent_1217_0 (arg1));
 }
 
@@ -1595,8 +1595,8 @@ static void _call_cbs_sceneEventFilter_3028_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsItem *arg1 = args.read<QGraphicsItem * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QGraphicsItem *arg1 = gsi::arg_reader<QGraphicsItem * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsItemGroup_Adaptor *)cls)->cbs_sceneEventFilter_3028_0 (arg1, arg2));
 }
 
@@ -1621,8 +1621,8 @@ static void _call_cbs_setExtension_4817_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  unsigned int arg1 = args.read<unsigned int > (heap);
-  const QVariant &arg2 = args.read<const QVariant & > (heap);
+  unsigned int arg1 = gsi::arg_reader<unsigned int >() (args, heap);
+  const QVariant &arg2 = gsi::arg_reader<const QVariant & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsItemGroup_Adaptor *)cls)->cbs_setExtension_4817_0 (arg1, arg2);
 }
@@ -1665,7 +1665,7 @@ static void _call_cbs_supportsExtension_c2806_0 (const qt_gsi::GenericMethod * /
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  unsigned int arg1 = args.read<unsigned int > (heap);
+  unsigned int arg1 = gsi::arg_reader<unsigned int >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsItemGroup_Adaptor *)cls)->cbs_supportsExtension_c2806_0 (arg1));
 }
 
@@ -1707,7 +1707,7 @@ static void _call_cbs_wheelEvent_3029_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneWheelEvent *arg1 = args.read<QGraphicsSceneWheelEvent * > (heap);
+  QGraphicsSceneWheelEvent *arg1 = gsi::arg_reader<QGraphicsSceneWheelEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsItemGroup_Adaptor *)cls)->cbs_wheelEvent_3029_0 (arg1);
 }

src/gsiqt/qt4/QtGui/gsiDeclQGraphicsLayout.cc

@@ -525,10 +525,10 @@ static void _call_cbs_getContentsMargins_c4704_0 (const qt_gsi::GenericMethod *
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  double *arg1 = args.read<double * > (heap);
-  double *arg2 = args.read<double * > (heap);
-  double *arg3 = args.read<double * > (heap);
-  double *arg4 = args.read<double * > (heap);
+  double *arg1 = gsi::arg_reader<double * >() (args, heap);
+  double *arg2 = gsi::arg_reader<double * >() (args, heap);
+  double *arg3 = gsi::arg_reader<double * >() (args, heap);
+  double *arg4 = gsi::arg_reader<double * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsLayout_Adaptor *)cls)->cbs_getContentsMargins_c4704_0 (arg1, arg2, arg3, arg4);
 }
@@ -572,7 +572,7 @@ static void _call_cbs_itemAt_c767_0 (const qt_gsi::GenericMethod * /*decl*/, voi
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   ret.write<QGraphicsLayoutItem * > ((QGraphicsLayoutItem *)((QGraphicsLayout_Adaptor *)cls)->cbs_itemAt_c767_0 (arg1));
 }
 
@@ -595,7 +595,7 @@ static void _call_cbs_removeAt_767_0 (const qt_gsi::GenericMethod * /*decl*/, vo
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsLayout_Adaptor *)cls)->cbs_removeAt_767_0 (arg1);
 }
@@ -619,7 +619,7 @@ static void _call_cbs_setGeometry_1862_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QRectF &arg1 = args.read<const QRectF & > (heap);
+  const QRectF &arg1 = gsi::arg_reader<const QRectF & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsLayout_Adaptor *)cls)->cbs_setGeometry_1862_0 (arg1);
 }
@@ -683,8 +683,8 @@ static void _call_cbs_sizeHint_c3330_1 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<Qt::SizeHint>::target_type & arg1 = args.read<const qt_gsi::Converter<Qt::SizeHint>::target_type & > (heap);
-  const QSizeF &arg2 = args.read<const QSizeF & > (heap);
+  const qt_gsi::Converter<Qt::SizeHint>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<Qt::SizeHint>::target_type & >() (args, heap);
+  const QSizeF &arg2 = args ? gsi::arg_reader<const QSizeF & >() (args, heap) : gsi::arg_maker<const QSizeF & >() (QSizeF(), heap);
   ret.write<QSizeF > ((QSizeF)((QGraphicsLayout_Adaptor *)cls)->cbs_sizeHint_c3330_1 (arg1, arg2));
 }
 
@@ -727,7 +727,7 @@ static void _call_cbs_widgetEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsLayout_Adaptor *)cls)->cbs_widgetEvent_1217_0 (arg1);
 }

src/gsiqt/qt4/QtGui/gsiDeclQGraphicsLayoutItem.cc

@@ -877,10 +877,10 @@ static void _call_cbs_getContentsMargins_c4704_0 (const qt_gsi::GenericMethod *
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  double *arg1 = args.read<double * > (heap);
-  double *arg2 = args.read<double * > (heap);
-  double *arg3 = args.read<double * > (heap);
-  double *arg4 = args.read<double * > (heap);
+  double *arg1 = gsi::arg_reader<double * >() (args, heap);
+  double *arg2 = gsi::arg_reader<double * >() (args, heap);
+  double *arg3 = gsi::arg_reader<double * >() (args, heap);
+  double *arg4 = gsi::arg_reader<double * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsLayoutItem_Adaptor *)cls)->cbs_getContentsMargins_c4704_0 (arg1, arg2, arg3, arg4);
 }
@@ -904,7 +904,7 @@ static void _call_cbs_setGeometry_1862_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QRectF &arg1 = args.read<const QRectF & > (heap);
+  const QRectF &arg1 = gsi::arg_reader<const QRectF & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsLayoutItem_Adaptor *)cls)->cbs_setGeometry_1862_0 (arg1);
 }
@@ -968,8 +968,8 @@ static void _call_cbs_sizeHint_c3330_1 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<Qt::SizeHint>::target_type & arg1 = args.read<const qt_gsi::Converter<Qt::SizeHint>::target_type & > (heap);
-  const QSizeF &arg2 = args.read<const QSizeF & > (heap);
+  const qt_gsi::Converter<Qt::SizeHint>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<Qt::SizeHint>::target_type & >() (args, heap);
+  const QSizeF &arg2 = args ? gsi::arg_reader<const QSizeF & >() (args, heap) : gsi::arg_maker<const QSizeF & >() (QSizeF(), heap);
   ret.write<QSizeF > ((QSizeF)((QGraphicsLayoutItem_Adaptor *)cls)->cbs_sizeHint_c3330_1 (arg1, arg2));
 }
 

src/gsiqt/qt4/QtGui/gsiDeclQGraphicsLineItem.cc

@@ -1063,7 +1063,7 @@ static void _call_cbs_advance_767_0 (const qt_gsi::GenericMethod * /*decl*/, voi
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsLineItem_Adaptor *)cls)->cbs_advance_767_0 (arg1);
 }
@@ -1108,8 +1108,8 @@ static void _call_cbs_collidesWithItem_c4977_1 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QGraphicsItem *arg1 = args.read<const QGraphicsItem * > (heap);
-  const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & arg2 = args.read<const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & > (heap);
+  const QGraphicsItem *arg1 = gsi::arg_reader<const QGraphicsItem * >() (args, heap);
+  const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & arg2 = args ? gsi::arg_reader<const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & >() (args, heap) : gsi::arg_maker<const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & >() (qt_gsi::CppToQtReadAdaptor<Qt::ItemSelectionMode>(heap, Qt::IntersectsItemShape), heap);
   ret.write<bool > ((bool)((QGraphicsLineItem_Adaptor *)cls)->cbs_collidesWithItem_c4977_1 (arg1, arg2));
 }
 
@@ -1134,8 +1134,8 @@ static void _call_cbs_collidesWithPath_c4877_1 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QPainterPath &arg1 = args.read<const QPainterPath & > (heap);
-  const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & arg2 = args.read<const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & > (heap);
+  const QPainterPath &arg1 = gsi::arg_reader<const QPainterPath & >() (args, heap);
+  const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & arg2 = args ? gsi::arg_reader<const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & >() (args, heap) : gsi::arg_maker<const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & >() (qt_gsi::CppToQtReadAdaptor<Qt::ItemSelectionMode>(heap, Qt::IntersectsItemShape), heap);
   ret.write<bool > ((bool)((QGraphicsLineItem_Adaptor *)cls)->cbs_collidesWithPath_c4877_1 (arg1, arg2));
 }
 
@@ -1158,7 +1158,7 @@ static void _call_cbs_contains_c1986_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QPointF &arg1 = args.read<const QPointF & > (heap);
+  const QPointF &arg1 = gsi::arg_reader<const QPointF & >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsLineItem_Adaptor *)cls)->cbs_contains_c1986_0 (arg1));
 }
 
@@ -1181,7 +1181,7 @@ static void _call_cbs_contextMenuEvent_3674_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneContextMenuEvent *arg1 = args.read<QGraphicsSceneContextMenuEvent * > (heap);
+  QGraphicsSceneContextMenuEvent *arg1 = gsi::arg_reader<QGraphicsSceneContextMenuEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsLineItem_Adaptor *)cls)->cbs_contextMenuEvent_3674_0 (arg1);
 }
@@ -1205,7 +1205,7 @@ static void _call_cbs_dragEnterEvent_3315_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneDragDropEvent *arg1 = args.read<QGraphicsSceneDragDropEvent * > (heap);
+  QGraphicsSceneDragDropEvent *arg1 = gsi::arg_reader<QGraphicsSceneDragDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsLineItem_Adaptor *)cls)->cbs_dragEnterEvent_3315_0 (arg1);
 }
@@ -1229,7 +1229,7 @@ static void _call_cbs_dragLeaveEvent_3315_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneDragDropEvent *arg1 = args.read<QGraphicsSceneDragDropEvent * > (heap);
+  QGraphicsSceneDragDropEvent *arg1 = gsi::arg_reader<QGraphicsSceneDragDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsLineItem_Adaptor *)cls)->cbs_dragLeaveEvent_3315_0 (arg1);
 }
@@ -1253,7 +1253,7 @@ static void _call_cbs_dragMoveEvent_3315_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneDragDropEvent *arg1 = args.read<QGraphicsSceneDragDropEvent * > (heap);
+  QGraphicsSceneDragDropEvent *arg1 = gsi::arg_reader<QGraphicsSceneDragDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsLineItem_Adaptor *)cls)->cbs_dragMoveEvent_3315_0 (arg1);
 }
@@ -1277,7 +1277,7 @@ static void _call_cbs_dropEvent_3315_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneDragDropEvent *arg1 = args.read<QGraphicsSceneDragDropEvent * > (heap);
+  QGraphicsSceneDragDropEvent *arg1 = gsi::arg_reader<QGraphicsSceneDragDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsLineItem_Adaptor *)cls)->cbs_dropEvent_3315_0 (arg1);
 }
@@ -1301,7 +1301,7 @@ static void _call_cbs_extension_c2119_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QVariant &arg1 = args.read<const QVariant & > (heap);
+  const QVariant &arg1 = gsi::arg_reader<const QVariant & >() (args, heap);
   ret.write<QVariant > ((QVariant)((QGraphicsLineItem_Adaptor *)cls)->cbs_extension_c2119_0 (arg1));
 }
 
@@ -1324,7 +1324,7 @@ static void _call_cbs_focusInEvent_1729_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsLineItem_Adaptor *)cls)->cbs_focusInEvent_1729_0 (arg1);
 }
@@ -1348,7 +1348,7 @@ static void _call_cbs_focusOutEvent_1729_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsLineItem_Adaptor *)cls)->cbs_focusOutEvent_1729_0 (arg1);
 }
@@ -1372,7 +1372,7 @@ static void _call_cbs_hoverEnterEvent_3044_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneHoverEvent *arg1 = args.read<QGraphicsSceneHoverEvent * > (heap);
+  QGraphicsSceneHoverEvent *arg1 = gsi::arg_reader<QGraphicsSceneHoverEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsLineItem_Adaptor *)cls)->cbs_hoverEnterEvent_3044_0 (arg1);
 }
@@ -1396,7 +1396,7 @@ static void _call_cbs_hoverLeaveEvent_3044_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneHoverEvent *arg1 = args.read<QGraphicsSceneHoverEvent * > (heap);
+  QGraphicsSceneHoverEvent *arg1 = gsi::arg_reader<QGraphicsSceneHoverEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsLineItem_Adaptor *)cls)->cbs_hoverLeaveEvent_3044_0 (arg1);
 }
@@ -1420,7 +1420,7 @@ static void _call_cbs_hoverMoveEvent_3044_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneHoverEvent *arg1 = args.read<QGraphicsSceneHoverEvent * > (heap);
+  QGraphicsSceneHoverEvent *arg1 = gsi::arg_reader<QGraphicsSceneHoverEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsLineItem_Adaptor *)cls)->cbs_hoverMoveEvent_3044_0 (arg1);
 }
@@ -1444,7 +1444,7 @@ static void _call_cbs_inputMethodEvent_2354_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QInputMethodEvent *arg1 = args.read<QInputMethodEvent * > (heap);
+  QInputMethodEvent *arg1 = gsi::arg_reader<QInputMethodEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsLineItem_Adaptor *)cls)->cbs_inputMethodEvent_2354_0 (arg1);
 }
@@ -1468,7 +1468,7 @@ static void _call_cbs_inputMethodQuery_c2420_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = args.read<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & > (heap);
+  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & >() (args, heap);
   ret.write<QVariant > ((QVariant)((QGraphicsLineItem_Adaptor *)cls)->cbs_inputMethodQuery_c2420_0 (arg1));
 }
 
@@ -1491,7 +1491,7 @@ static void _call_cbs_isObscuredBy_c2614_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QGraphicsItem *arg1 = args.read<const QGraphicsItem * > (heap);
+  const QGraphicsItem *arg1 = gsi::arg_reader<const QGraphicsItem * >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsLineItem_Adaptor *)cls)->cbs_isObscuredBy_c2614_0 (arg1));
 }
 
@@ -1516,8 +1516,8 @@ static void _call_cbs_itemChange_5658_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QGraphicsItem::GraphicsItemChange>::target_type & arg1 = args.read<const qt_gsi::Converter<QGraphicsItem::GraphicsItemChange>::target_type & > (heap);
-  const QVariant &arg2 = args.read<const QVariant & > (heap);
+  const qt_gsi::Converter<QGraphicsItem::GraphicsItemChange>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QGraphicsItem::GraphicsItemChange>::target_type & >() (args, heap);
+  const QVariant &arg2 = gsi::arg_reader<const QVariant & >() (args, heap);
   ret.write<QVariant > ((QVariant)((QGraphicsLineItem_Adaptor *)cls)->cbs_itemChange_5658_0 (arg1, arg2));
 }
 
@@ -1540,7 +1540,7 @@ static void _call_cbs_keyPressEvent_1514_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsLineItem_Adaptor *)cls)->cbs_keyPressEvent_1514_0 (arg1);
 }
@@ -1564,7 +1564,7 @@ static void _call_cbs_keyReleaseEvent_1514_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsLineItem_Adaptor *)cls)->cbs_keyReleaseEvent_1514_0 (arg1);
 }
@@ -1588,7 +1588,7 @@ static void _call_cbs_mouseDoubleClickEvent_3049_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneMouseEvent *arg1 = args.read<QGraphicsSceneMouseEvent * > (heap);
+  QGraphicsSceneMouseEvent *arg1 = gsi::arg_reader<QGraphicsSceneMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsLineItem_Adaptor *)cls)->cbs_mouseDoubleClickEvent_3049_0 (arg1);
 }
@@ -1612,7 +1612,7 @@ static void _call_cbs_mouseMoveEvent_3049_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneMouseEvent *arg1 = args.read<QGraphicsSceneMouseEvent * > (heap);
+  QGraphicsSceneMouseEvent *arg1 = gsi::arg_reader<QGraphicsSceneMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsLineItem_Adaptor *)cls)->cbs_mouseMoveEvent_3049_0 (arg1);
 }
@@ -1636,7 +1636,7 @@ static void _call_cbs_mousePressEvent_3049_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneMouseEvent *arg1 = args.read<QGraphicsSceneMouseEvent * > (heap);
+  QGraphicsSceneMouseEvent *arg1 = gsi::arg_reader<QGraphicsSceneMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsLineItem_Adaptor *)cls)->cbs_mousePressEvent_3049_0 (arg1);
 }
@@ -1660,7 +1660,7 @@ static void _call_cbs_mouseReleaseEvent_3049_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneMouseEvent *arg1 = args.read<QGraphicsSceneMouseEvent * > (heap);
+  QGraphicsSceneMouseEvent *arg1 = gsi::arg_reader<QGraphicsSceneMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsLineItem_Adaptor *)cls)->cbs_mouseReleaseEvent_3049_0 (arg1);
 }
@@ -1707,9 +1707,9 @@ static void _call_cbs_paint_6301_1 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QPainter *arg1 = args.read<QPainter * > (heap);
-  const QStyleOptionGraphicsItem *arg2 = args.read<const QStyleOptionGraphicsItem * > (heap);
-  QWidget *arg3 = args.read<QWidget * > (heap);
+  QPainter *arg1 = gsi::arg_reader<QPainter * >() (args, heap);
+  const QStyleOptionGraphicsItem *arg2 = gsi::arg_reader<const QStyleOptionGraphicsItem * >() (args, heap);
+  QWidget *arg3 = args ? gsi::arg_reader<QWidget * >() (args, heap) : gsi::arg_maker<QWidget * >() (0, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsLineItem_Adaptor *)cls)->cbs_paint_6301_1 (arg1, arg2, arg3);
 }
@@ -1763,7 +1763,7 @@ static void _call_cbs_sceneEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsLineItem_Adaptor *)cls)->cbs_sceneEvent_1217_0 (arg1));
 }
 
@@ -1788,8 +1788,8 @@ static void _call_cbs_sceneEventFilter_3028_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsItem *arg1 = args.read<QGraphicsItem * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QGraphicsItem *arg1 = gsi::arg_reader<QGraphicsItem * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsLineItem_Adaptor *)cls)->cbs_sceneEventFilter_3028_0 (arg1, arg2));
 }
 
@@ -1814,8 +1814,8 @@ static void _call_cbs_setExtension_4817_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  unsigned int arg1 = args.read<unsigned int > (heap);
-  const QVariant &arg2 = args.read<const QVariant & > (heap);
+  unsigned int arg1 = gsi::arg_reader<unsigned int >() (args, heap);
+  const QVariant &arg2 = gsi::arg_reader<const QVariant & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsLineItem_Adaptor *)cls)->cbs_setExtension_4817_0 (arg1, arg2);
 }
@@ -1858,7 +1858,7 @@ static void _call_cbs_supportsExtension_c2806_0 (const qt_gsi::GenericMethod * /
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  unsigned int arg1 = args.read<unsigned int > (heap);
+  unsigned int arg1 = gsi::arg_reader<unsigned int >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsLineItem_Adaptor *)cls)->cbs_supportsExtension_c2806_0 (arg1));
 }
 
@@ -1900,7 +1900,7 @@ static void _call_cbs_wheelEvent_3029_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneWheelEvent *arg1 = args.read<QGraphicsSceneWheelEvent * > (heap);
+  QGraphicsSceneWheelEvent *arg1 = gsi::arg_reader<QGraphicsSceneWheelEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsLineItem_Adaptor *)cls)->cbs_wheelEvent_3029_0 (arg1);
 }

src/gsiqt/qt4/QtGui/gsiDeclQGraphicsLinearLayout.cc

@@ -805,10 +805,10 @@ static void _call_cbs_getContentsMargins_c4704_0 (const qt_gsi::GenericMethod *
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  double *arg1 = args.read<double * > (heap);
-  double *arg2 = args.read<double * > (heap);
-  double *arg3 = args.read<double * > (heap);
-  double *arg4 = args.read<double * > (heap);
+  double *arg1 = gsi::arg_reader<double * >() (args, heap);
+  double *arg2 = gsi::arg_reader<double * >() (args, heap);
+  double *arg3 = gsi::arg_reader<double * >() (args, heap);
+  double *arg4 = gsi::arg_reader<double * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsLinearLayout_Adaptor *)cls)->cbs_getContentsMargins_c4704_0 (arg1, arg2, arg3, arg4);
 }
@@ -852,7 +852,7 @@ static void _call_cbs_itemAt_c767_0 (const qt_gsi::GenericMethod * /*decl*/, voi
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   ret.write<QGraphicsLayoutItem * > ((QGraphicsLayoutItem *)((QGraphicsLinearLayout_Adaptor *)cls)->cbs_itemAt_c767_0 (arg1));
 }
 
@@ -875,7 +875,7 @@ static void _call_cbs_removeAt_767_0 (const qt_gsi::GenericMethod * /*decl*/, vo
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsLinearLayout_Adaptor *)cls)->cbs_removeAt_767_0 (arg1);
 }
@@ -899,7 +899,7 @@ static void _call_cbs_setGeometry_1862_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QRectF &arg1 = args.read<const QRectF & > (heap);
+  const QRectF &arg1 = gsi::arg_reader<const QRectF & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsLinearLayout_Adaptor *)cls)->cbs_setGeometry_1862_0 (arg1);
 }
@@ -963,8 +963,8 @@ static void _call_cbs_sizeHint_c3330_1 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<Qt::SizeHint>::target_type & arg1 = args.read<const qt_gsi::Converter<Qt::SizeHint>::target_type & > (heap);
-  const QSizeF &arg2 = args.read<const QSizeF & > (heap);
+  const qt_gsi::Converter<Qt::SizeHint>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<Qt::SizeHint>::target_type & >() (args, heap);
+  const QSizeF &arg2 = args ? gsi::arg_reader<const QSizeF & >() (args, heap) : gsi::arg_maker<const QSizeF & >() (QSizeF(), heap);
   ret.write<QSizeF > ((QSizeF)((QGraphicsLinearLayout_Adaptor *)cls)->cbs_sizeHint_c3330_1 (arg1, arg2));
 }
 
@@ -1007,7 +1007,7 @@ static void _call_cbs_widgetEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsLinearLayout_Adaptor *)cls)->cbs_widgetEvent_1217_0 (arg1);
 }

src/gsiqt/qt4/QtGui/gsiDeclQGraphicsObject.cc

@@ -1134,7 +1134,7 @@ static void _call_cbs_advance_767_0 (const qt_gsi::GenericMethod * /*decl*/, voi
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsObject_Adaptor *)cls)->cbs_advance_767_0 (arg1);
 }
@@ -1177,7 +1177,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsObject_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -1203,8 +1203,8 @@ static void _call_cbs_collidesWithItem_c4977_1 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QGraphicsItem *arg1 = args.read<const QGraphicsItem * > (heap);
-  const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & arg2 = args.read<const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & > (heap);
+  const QGraphicsItem *arg1 = gsi::arg_reader<const QGraphicsItem * >() (args, heap);
+  const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & arg2 = args ? gsi::arg_reader<const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & >() (args, heap) : gsi::arg_maker<const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & >() (qt_gsi::CppToQtReadAdaptor<Qt::ItemSelectionMode>(heap, Qt::IntersectsItemShape), heap);
   ret.write<bool > ((bool)((QGraphicsObject_Adaptor *)cls)->cbs_collidesWithItem_c4977_1 (arg1, arg2));
 }
 
@@ -1229,8 +1229,8 @@ static void _call_cbs_collidesWithPath_c4877_1 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QPainterPath &arg1 = args.read<const QPainterPath & > (heap);
-  const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & arg2 = args.read<const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & > (heap);
+  const QPainterPath &arg1 = gsi::arg_reader<const QPainterPath & >() (args, heap);
+  const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & arg2 = args ? gsi::arg_reader<const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & >() (args, heap) : gsi::arg_maker<const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & >() (qt_gsi::CppToQtReadAdaptor<Qt::ItemSelectionMode>(heap, Qt::IntersectsItemShape), heap);
   ret.write<bool > ((bool)((QGraphicsObject_Adaptor *)cls)->cbs_collidesWithPath_c4877_1 (arg1, arg2));
 }
 
@@ -1253,7 +1253,7 @@ static void _call_cbs_contains_c1986_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QPointF &arg1 = args.read<const QPointF & > (heap);
+  const QPointF &arg1 = gsi::arg_reader<const QPointF & >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsObject_Adaptor *)cls)->cbs_contains_c1986_0 (arg1));
 }
 
@@ -1276,7 +1276,7 @@ static void _call_cbs_contextMenuEvent_3674_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneContextMenuEvent *arg1 = args.read<QGraphicsSceneContextMenuEvent * > (heap);
+  QGraphicsSceneContextMenuEvent *arg1 = gsi::arg_reader<QGraphicsSceneContextMenuEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsObject_Adaptor *)cls)->cbs_contextMenuEvent_3674_0 (arg1);
 }
@@ -1300,7 +1300,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsObject_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -1342,7 +1342,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsObject_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -1366,7 +1366,7 @@ static void _call_cbs_dragEnterEvent_3315_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneDragDropEvent *arg1 = args.read<QGraphicsSceneDragDropEvent * > (heap);
+  QGraphicsSceneDragDropEvent *arg1 = gsi::arg_reader<QGraphicsSceneDragDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsObject_Adaptor *)cls)->cbs_dragEnterEvent_3315_0 (arg1);
 }
@@ -1390,7 +1390,7 @@ static void _call_cbs_dragLeaveEvent_3315_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneDragDropEvent *arg1 = args.read<QGraphicsSceneDragDropEvent * > (heap);
+  QGraphicsSceneDragDropEvent *arg1 = gsi::arg_reader<QGraphicsSceneDragDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsObject_Adaptor *)cls)->cbs_dragLeaveEvent_3315_0 (arg1);
 }
@@ -1414,7 +1414,7 @@ static void _call_cbs_dragMoveEvent_3315_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneDragDropEvent *arg1 = args.read<QGraphicsSceneDragDropEvent * > (heap);
+  QGraphicsSceneDragDropEvent *arg1 = gsi::arg_reader<QGraphicsSceneDragDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsObject_Adaptor *)cls)->cbs_dragMoveEvent_3315_0 (arg1);
 }
@@ -1438,7 +1438,7 @@ static void _call_cbs_dropEvent_3315_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneDragDropEvent *arg1 = args.read<QGraphicsSceneDragDropEvent * > (heap);
+  QGraphicsSceneDragDropEvent *arg1 = gsi::arg_reader<QGraphicsSceneDragDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsObject_Adaptor *)cls)->cbs_dropEvent_3315_0 (arg1);
 }
@@ -1476,7 +1476,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsObject_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -1501,8 +1501,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsObject_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -1525,7 +1525,7 @@ static void _call_cbs_extension_c2119_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QVariant &arg1 = args.read<const QVariant & > (heap);
+  const QVariant &arg1 = gsi::arg_reader<const QVariant & >() (args, heap);
   ret.write<QVariant > ((QVariant)((QGraphicsObject_Adaptor *)cls)->cbs_extension_c2119_0 (arg1));
 }
 
@@ -1548,7 +1548,7 @@ static void _call_cbs_focusInEvent_1729_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsObject_Adaptor *)cls)->cbs_focusInEvent_1729_0 (arg1);
 }
@@ -1572,7 +1572,7 @@ static void _call_cbs_focusOutEvent_1729_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsObject_Adaptor *)cls)->cbs_focusOutEvent_1729_0 (arg1);
 }
@@ -1596,7 +1596,7 @@ static void _call_cbs_hoverEnterEvent_3044_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneHoverEvent *arg1 = args.read<QGraphicsSceneHoverEvent * > (heap);
+  QGraphicsSceneHoverEvent *arg1 = gsi::arg_reader<QGraphicsSceneHoverEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsObject_Adaptor *)cls)->cbs_hoverEnterEvent_3044_0 (arg1);
 }
@@ -1620,7 +1620,7 @@ static void _call_cbs_hoverLeaveEvent_3044_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneHoverEvent *arg1 = args.read<QGraphicsSceneHoverEvent * > (heap);
+  QGraphicsSceneHoverEvent *arg1 = gsi::arg_reader<QGraphicsSceneHoverEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsObject_Adaptor *)cls)->cbs_hoverLeaveEvent_3044_0 (arg1);
 }
@@ -1644,7 +1644,7 @@ static void _call_cbs_hoverMoveEvent_3044_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneHoverEvent *arg1 = args.read<QGraphicsSceneHoverEvent * > (heap);
+  QGraphicsSceneHoverEvent *arg1 = gsi::arg_reader<QGraphicsSceneHoverEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsObject_Adaptor *)cls)->cbs_hoverMoveEvent_3044_0 (arg1);
 }
@@ -1668,7 +1668,7 @@ static void _call_cbs_inputMethodEvent_2354_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QInputMethodEvent *arg1 = args.read<QInputMethodEvent * > (heap);
+  QInputMethodEvent *arg1 = gsi::arg_reader<QInputMethodEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsObject_Adaptor *)cls)->cbs_inputMethodEvent_2354_0 (arg1);
 }
@@ -1692,7 +1692,7 @@ static void _call_cbs_inputMethodQuery_c2420_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = args.read<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & > (heap);
+  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & >() (args, heap);
   ret.write<QVariant > ((QVariant)((QGraphicsObject_Adaptor *)cls)->cbs_inputMethodQuery_c2420_0 (arg1));
 }
 
@@ -1715,7 +1715,7 @@ static void _call_cbs_isObscuredBy_c2614_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QGraphicsItem *arg1 = args.read<const QGraphicsItem * > (heap);
+  const QGraphicsItem *arg1 = gsi::arg_reader<const QGraphicsItem * >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsObject_Adaptor *)cls)->cbs_isObscuredBy_c2614_0 (arg1));
 }
 
@@ -1740,8 +1740,8 @@ static void _call_cbs_itemChange_5658_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QGraphicsItem::GraphicsItemChange>::target_type & arg1 = args.read<const qt_gsi::Converter<QGraphicsItem::GraphicsItemChange>::target_type & > (heap);
-  const QVariant &arg2 = args.read<const QVariant & > (heap);
+  const qt_gsi::Converter<QGraphicsItem::GraphicsItemChange>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QGraphicsItem::GraphicsItemChange>::target_type & >() (args, heap);
+  const QVariant &arg2 = gsi::arg_reader<const QVariant & >() (args, heap);
   ret.write<QVariant > ((QVariant)((QGraphicsObject_Adaptor *)cls)->cbs_itemChange_5658_0 (arg1, arg2));
 }
 
@@ -1764,7 +1764,7 @@ static void _call_cbs_keyPressEvent_1514_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsObject_Adaptor *)cls)->cbs_keyPressEvent_1514_0 (arg1);
 }
@@ -1788,7 +1788,7 @@ static void _call_cbs_keyReleaseEvent_1514_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsObject_Adaptor *)cls)->cbs_keyReleaseEvent_1514_0 (arg1);
 }
@@ -1812,7 +1812,7 @@ static void _call_cbs_mouseDoubleClickEvent_3049_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneMouseEvent *arg1 = args.read<QGraphicsSceneMouseEvent * > (heap);
+  QGraphicsSceneMouseEvent *arg1 = gsi::arg_reader<QGraphicsSceneMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsObject_Adaptor *)cls)->cbs_mouseDoubleClickEvent_3049_0 (arg1);
 }
@@ -1836,7 +1836,7 @@ static void _call_cbs_mouseMoveEvent_3049_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneMouseEvent *arg1 = args.read<QGraphicsSceneMouseEvent * > (heap);
+  QGraphicsSceneMouseEvent *arg1 = gsi::arg_reader<QGraphicsSceneMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsObject_Adaptor *)cls)->cbs_mouseMoveEvent_3049_0 (arg1);
 }
@@ -1860,7 +1860,7 @@ static void _call_cbs_mousePressEvent_3049_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneMouseEvent *arg1 = args.read<QGraphicsSceneMouseEvent * > (heap);
+  QGraphicsSceneMouseEvent *arg1 = gsi::arg_reader<QGraphicsSceneMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsObject_Adaptor *)cls)->cbs_mousePressEvent_3049_0 (arg1);
 }
@@ -1884,7 +1884,7 @@ static void _call_cbs_mouseReleaseEvent_3049_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneMouseEvent *arg1 = args.read<QGraphicsSceneMouseEvent * > (heap);
+  QGraphicsSceneMouseEvent *arg1 = gsi::arg_reader<QGraphicsSceneMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsObject_Adaptor *)cls)->cbs_mouseReleaseEvent_3049_0 (arg1);
 }
@@ -1945,9 +1945,9 @@ static void _call_cbs_paint_6301_1 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QPainter *arg1 = args.read<QPainter * > (heap);
-  const QStyleOptionGraphicsItem *arg2 = args.read<const QStyleOptionGraphicsItem * > (heap);
-  QWidget *arg3 = args.read<QWidget * > (heap);
+  QPainter *arg1 = gsi::arg_reader<QPainter * >() (args, heap);
+  const QStyleOptionGraphicsItem *arg2 = gsi::arg_reader<const QStyleOptionGraphicsItem * >() (args, heap);
+  QWidget *arg3 = args ? gsi::arg_reader<QWidget * >() (args, heap) : gsi::arg_maker<QWidget * >() (0, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsObject_Adaptor *)cls)->cbs_paint_6301_1 (arg1, arg2, arg3);
 }
@@ -2061,7 +2061,7 @@ static void _call_cbs_sceneEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsObject_Adaptor *)cls)->cbs_sceneEvent_1217_0 (arg1));
 }
 
@@ -2086,8 +2086,8 @@ static void _call_cbs_sceneEventFilter_3028_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsItem *arg1 = args.read<QGraphicsItem * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QGraphicsItem *arg1 = gsi::arg_reader<QGraphicsItem * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsObject_Adaptor *)cls)->cbs_sceneEventFilter_3028_0 (arg1, arg2));
 }
 
@@ -2126,8 +2126,8 @@ static void _call_cbs_setExtension_4817_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  unsigned int arg1 = args.read<unsigned int > (heap);
-  const QVariant &arg2 = args.read<const QVariant & > (heap);
+  unsigned int arg1 = gsi::arg_reader<unsigned int >() (args, heap);
+  const QVariant &arg2 = gsi::arg_reader<const QVariant & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsObject_Adaptor *)cls)->cbs_setExtension_4817_0 (arg1, arg2);
 }
@@ -2170,7 +2170,7 @@ static void _call_cbs_supportsExtension_c2806_0 (const qt_gsi::GenericMethod * /
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  unsigned int arg1 = args.read<unsigned int > (heap);
+  unsigned int arg1 = gsi::arg_reader<unsigned int >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsObject_Adaptor *)cls)->cbs_supportsExtension_c2806_0 (arg1));
 }
 
@@ -2193,7 +2193,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsObject_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }
@@ -2250,7 +2250,7 @@ static void _call_cbs_wheelEvent_3029_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneWheelEvent *arg1 = args.read<QGraphicsSceneWheelEvent * > (heap);
+  QGraphicsSceneWheelEvent *arg1 = gsi::arg_reader<QGraphicsSceneWheelEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsObject_Adaptor *)cls)->cbs_wheelEvent_3029_0 (arg1);
 }

src/gsiqt/qt4/QtGui/gsiDeclQGraphicsOpacityEffect.cc

@@ -510,7 +510,7 @@ static void _call_cbs_boundingRectFor_c1862_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QRectF &arg1 = args.read<const QRectF & > (heap);
+  const QRectF &arg1 = gsi::arg_reader<const QRectF & >() (args, heap);
   ret.write<QRectF > ((QRectF)((QGraphicsOpacityEffect_Adaptor *)cls)->cbs_boundingRectFor_c1862_0 (arg1));
 }
 
@@ -533,7 +533,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsOpacityEffect_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -557,7 +557,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsOpacityEffect_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -599,7 +599,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsOpacityEffect_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -623,7 +623,7 @@ static void _call_cbs_draw_1426_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QPainter *arg1 = args.read<QPainter * > (heap);
+  QPainter *arg1 = gsi::arg_reader<QPainter * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsOpacityEffect_Adaptor *)cls)->cbs_draw_1426_0 (arg1);
 }
@@ -684,7 +684,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsOpacityEffect_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -709,8 +709,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsOpacityEffect_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -819,7 +819,7 @@ static void _call_cbs_sourceChanged_3695_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFlags<QGraphicsEffect::ChangeFlag> arg1 = args.read<QFlags<QGraphicsEffect::ChangeFlag> > (heap);
+  QFlags<QGraphicsEffect::ChangeFlag> arg1 = gsi::arg_reader<QFlags<QGraphicsEffect::ChangeFlag> >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsOpacityEffect_Adaptor *)cls)->cbs_sourceChanged_3695_0 (arg1);
 }
@@ -881,7 +881,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsOpacityEffect_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }

src/gsiqt/qt4/QtGui/gsiDeclQGraphicsPathItem.cc

@@ -945,7 +945,7 @@ static void _call_cbs_advance_767_0 (const qt_gsi::GenericMethod * /*decl*/, voi
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsPathItem_Adaptor *)cls)->cbs_advance_767_0 (arg1);
 }
@@ -990,8 +990,8 @@ static void _call_cbs_collidesWithItem_c4977_1 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QGraphicsItem *arg1 = args.read<const QGraphicsItem * > (heap);
-  const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & arg2 = args.read<const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & > (heap);
+  const QGraphicsItem *arg1 = gsi::arg_reader<const QGraphicsItem * >() (args, heap);
+  const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & arg2 = args ? gsi::arg_reader<const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & >() (args, heap) : gsi::arg_maker<const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & >() (qt_gsi::CppToQtReadAdaptor<Qt::ItemSelectionMode>(heap, Qt::IntersectsItemShape), heap);
   ret.write<bool > ((bool)((QGraphicsPathItem_Adaptor *)cls)->cbs_collidesWithItem_c4977_1 (arg1, arg2));
 }
 
@@ -1016,8 +1016,8 @@ static void _call_cbs_collidesWithPath_c4877_1 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QPainterPath &arg1 = args.read<const QPainterPath & > (heap);
-  const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & arg2 = args.read<const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & > (heap);
+  const QPainterPath &arg1 = gsi::arg_reader<const QPainterPath & >() (args, heap);
+  const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & arg2 = args ? gsi::arg_reader<const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & >() (args, heap) : gsi::arg_maker<const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & >() (qt_gsi::CppToQtReadAdaptor<Qt::ItemSelectionMode>(heap, Qt::IntersectsItemShape), heap);
   ret.write<bool > ((bool)((QGraphicsPathItem_Adaptor *)cls)->cbs_collidesWithPath_c4877_1 (arg1, arg2));
 }
 
@@ -1040,7 +1040,7 @@ static void _call_cbs_contains_c1986_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QPointF &arg1 = args.read<const QPointF & > (heap);
+  const QPointF &arg1 = gsi::arg_reader<const QPointF & >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsPathItem_Adaptor *)cls)->cbs_contains_c1986_0 (arg1));
 }
 
@@ -1063,7 +1063,7 @@ static void _call_cbs_contextMenuEvent_3674_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneContextMenuEvent *arg1 = args.read<QGraphicsSceneContextMenuEvent * > (heap);
+  QGraphicsSceneContextMenuEvent *arg1 = gsi::arg_reader<QGraphicsSceneContextMenuEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsPathItem_Adaptor *)cls)->cbs_contextMenuEvent_3674_0 (arg1);
 }
@@ -1087,7 +1087,7 @@ static void _call_cbs_dragEnterEvent_3315_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneDragDropEvent *arg1 = args.read<QGraphicsSceneDragDropEvent * > (heap);
+  QGraphicsSceneDragDropEvent *arg1 = gsi::arg_reader<QGraphicsSceneDragDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsPathItem_Adaptor *)cls)->cbs_dragEnterEvent_3315_0 (arg1);
 }
@@ -1111,7 +1111,7 @@ static void _call_cbs_dragLeaveEvent_3315_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneDragDropEvent *arg1 = args.read<QGraphicsSceneDragDropEvent * > (heap);
+  QGraphicsSceneDragDropEvent *arg1 = gsi::arg_reader<QGraphicsSceneDragDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsPathItem_Adaptor *)cls)->cbs_dragLeaveEvent_3315_0 (arg1);
 }
@@ -1135,7 +1135,7 @@ static void _call_cbs_dragMoveEvent_3315_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneDragDropEvent *arg1 = args.read<QGraphicsSceneDragDropEvent * > (heap);
+  QGraphicsSceneDragDropEvent *arg1 = gsi::arg_reader<QGraphicsSceneDragDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsPathItem_Adaptor *)cls)->cbs_dragMoveEvent_3315_0 (arg1);
 }
@@ -1159,7 +1159,7 @@ static void _call_cbs_dropEvent_3315_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneDragDropEvent *arg1 = args.read<QGraphicsSceneDragDropEvent * > (heap);
+  QGraphicsSceneDragDropEvent *arg1 = gsi::arg_reader<QGraphicsSceneDragDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsPathItem_Adaptor *)cls)->cbs_dropEvent_3315_0 (arg1);
 }
@@ -1183,7 +1183,7 @@ static void _call_cbs_extension_c2119_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QVariant &arg1 = args.read<const QVariant & > (heap);
+  const QVariant &arg1 = gsi::arg_reader<const QVariant & >() (args, heap);
   ret.write<QVariant > ((QVariant)((QGraphicsPathItem_Adaptor *)cls)->cbs_extension_c2119_0 (arg1));
 }
 
@@ -1206,7 +1206,7 @@ static void _call_cbs_focusInEvent_1729_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsPathItem_Adaptor *)cls)->cbs_focusInEvent_1729_0 (arg1);
 }
@@ -1230,7 +1230,7 @@ static void _call_cbs_focusOutEvent_1729_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsPathItem_Adaptor *)cls)->cbs_focusOutEvent_1729_0 (arg1);
 }
@@ -1254,7 +1254,7 @@ static void _call_cbs_hoverEnterEvent_3044_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneHoverEvent *arg1 = args.read<QGraphicsSceneHoverEvent * > (heap);
+  QGraphicsSceneHoverEvent *arg1 = gsi::arg_reader<QGraphicsSceneHoverEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsPathItem_Adaptor *)cls)->cbs_hoverEnterEvent_3044_0 (arg1);
 }
@@ -1278,7 +1278,7 @@ static void _call_cbs_hoverLeaveEvent_3044_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneHoverEvent *arg1 = args.read<QGraphicsSceneHoverEvent * > (heap);
+  QGraphicsSceneHoverEvent *arg1 = gsi::arg_reader<QGraphicsSceneHoverEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsPathItem_Adaptor *)cls)->cbs_hoverLeaveEvent_3044_0 (arg1);
 }
@@ -1302,7 +1302,7 @@ static void _call_cbs_hoverMoveEvent_3044_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneHoverEvent *arg1 = args.read<QGraphicsSceneHoverEvent * > (heap);
+  QGraphicsSceneHoverEvent *arg1 = gsi::arg_reader<QGraphicsSceneHoverEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsPathItem_Adaptor *)cls)->cbs_hoverMoveEvent_3044_0 (arg1);
 }
@@ -1326,7 +1326,7 @@ static void _call_cbs_inputMethodEvent_2354_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QInputMethodEvent *arg1 = args.read<QInputMethodEvent * > (heap);
+  QInputMethodEvent *arg1 = gsi::arg_reader<QInputMethodEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsPathItem_Adaptor *)cls)->cbs_inputMethodEvent_2354_0 (arg1);
 }
@@ -1350,7 +1350,7 @@ static void _call_cbs_inputMethodQuery_c2420_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = args.read<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & > (heap);
+  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & >() (args, heap);
   ret.write<QVariant > ((QVariant)((QGraphicsPathItem_Adaptor *)cls)->cbs_inputMethodQuery_c2420_0 (arg1));
 }
 
@@ -1373,7 +1373,7 @@ static void _call_cbs_isObscuredBy_c2614_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QGraphicsItem *arg1 = args.read<const QGraphicsItem * > (heap);
+  const QGraphicsItem *arg1 = gsi::arg_reader<const QGraphicsItem * >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsPathItem_Adaptor *)cls)->cbs_isObscuredBy_c2614_0 (arg1));
 }
 
@@ -1398,8 +1398,8 @@ static void _call_cbs_itemChange_5658_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QGraphicsItem::GraphicsItemChange>::target_type & arg1 = args.read<const qt_gsi::Converter<QGraphicsItem::GraphicsItemChange>::target_type & > (heap);
-  const QVariant &arg2 = args.read<const QVariant & > (heap);
+  const qt_gsi::Converter<QGraphicsItem::GraphicsItemChange>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QGraphicsItem::GraphicsItemChange>::target_type & >() (args, heap);
+  const QVariant &arg2 = gsi::arg_reader<const QVariant & >() (args, heap);
   ret.write<QVariant > ((QVariant)((QGraphicsPathItem_Adaptor *)cls)->cbs_itemChange_5658_0 (arg1, arg2));
 }
 
@@ -1422,7 +1422,7 @@ static void _call_cbs_keyPressEvent_1514_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsPathItem_Adaptor *)cls)->cbs_keyPressEvent_1514_0 (arg1);
 }
@@ -1446,7 +1446,7 @@ static void _call_cbs_keyReleaseEvent_1514_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsPathItem_Adaptor *)cls)->cbs_keyReleaseEvent_1514_0 (arg1);
 }
@@ -1470,7 +1470,7 @@ static void _call_cbs_mouseDoubleClickEvent_3049_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneMouseEvent *arg1 = args.read<QGraphicsSceneMouseEvent * > (heap);
+  QGraphicsSceneMouseEvent *arg1 = gsi::arg_reader<QGraphicsSceneMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsPathItem_Adaptor *)cls)->cbs_mouseDoubleClickEvent_3049_0 (arg1);
 }
@@ -1494,7 +1494,7 @@ static void _call_cbs_mouseMoveEvent_3049_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneMouseEvent *arg1 = args.read<QGraphicsSceneMouseEvent * > (heap);
+  QGraphicsSceneMouseEvent *arg1 = gsi::arg_reader<QGraphicsSceneMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsPathItem_Adaptor *)cls)->cbs_mouseMoveEvent_3049_0 (arg1);
 }
@@ -1518,7 +1518,7 @@ static void _call_cbs_mousePressEvent_3049_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneMouseEvent *arg1 = args.read<QGraphicsSceneMouseEvent * > (heap);
+  QGraphicsSceneMouseEvent *arg1 = gsi::arg_reader<QGraphicsSceneMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsPathItem_Adaptor *)cls)->cbs_mousePressEvent_3049_0 (arg1);
 }
@@ -1542,7 +1542,7 @@ static void _call_cbs_mouseReleaseEvent_3049_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneMouseEvent *arg1 = args.read<QGraphicsSceneMouseEvent * > (heap);
+  QGraphicsSceneMouseEvent *arg1 = gsi::arg_reader<QGraphicsSceneMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsPathItem_Adaptor *)cls)->cbs_mouseReleaseEvent_3049_0 (arg1);
 }
@@ -1589,9 +1589,9 @@ static void _call_cbs_paint_6301_1 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QPainter *arg1 = args.read<QPainter * > (heap);
-  const QStyleOptionGraphicsItem *arg2 = args.read<const QStyleOptionGraphicsItem * > (heap);
-  QWidget *arg3 = args.read<QWidget * > (heap);
+  QPainter *arg1 = gsi::arg_reader<QPainter * >() (args, heap);
+  const QStyleOptionGraphicsItem *arg2 = gsi::arg_reader<const QStyleOptionGraphicsItem * >() (args, heap);
+  QWidget *arg3 = args ? gsi::arg_reader<QWidget * >() (args, heap) : gsi::arg_maker<QWidget * >() (0, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsPathItem_Adaptor *)cls)->cbs_paint_6301_1 (arg1, arg2, arg3);
 }
@@ -1645,7 +1645,7 @@ static void _call_cbs_sceneEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsPathItem_Adaptor *)cls)->cbs_sceneEvent_1217_0 (arg1));
 }
 
@@ -1670,8 +1670,8 @@ static void _call_cbs_sceneEventFilter_3028_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsItem *arg1 = args.read<QGraphicsItem * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QGraphicsItem *arg1 = gsi::arg_reader<QGraphicsItem * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsPathItem_Adaptor *)cls)->cbs_sceneEventFilter_3028_0 (arg1, arg2));
 }
 
@@ -1696,8 +1696,8 @@ static void _call_cbs_setExtension_4817_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  unsigned int arg1 = args.read<unsigned int > (heap);
-  const QVariant &arg2 = args.read<const QVariant & > (heap);
+  unsigned int arg1 = gsi::arg_reader<unsigned int >() (args, heap);
+  const QVariant &arg2 = gsi::arg_reader<const QVariant & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsPathItem_Adaptor *)cls)->cbs_setExtension_4817_0 (arg1, arg2);
 }
@@ -1740,7 +1740,7 @@ static void _call_cbs_supportsExtension_c2806_0 (const qt_gsi::GenericMethod * /
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  unsigned int arg1 = args.read<unsigned int > (heap);
+  unsigned int arg1 = gsi::arg_reader<unsigned int >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsPathItem_Adaptor *)cls)->cbs_supportsExtension_c2806_0 (arg1));
 }
 
@@ -1782,7 +1782,7 @@ static void _call_cbs_wheelEvent_3029_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneWheelEvent *arg1 = args.read<QGraphicsSceneWheelEvent * > (heap);
+  QGraphicsSceneWheelEvent *arg1 = gsi::arg_reader<QGraphicsSceneWheelEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsPathItem_Adaptor *)cls)->cbs_wheelEvent_3029_0 (arg1);
 }

src/gsiqt/qt4/QtGui/gsiDeclQGraphicsPixmapItem.cc

@@ -1079,7 +1079,7 @@ static void _call_cbs_advance_767_0 (const qt_gsi::GenericMethod * /*decl*/, voi
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsPixmapItem_Adaptor *)cls)->cbs_advance_767_0 (arg1);
 }
@@ -1124,8 +1124,8 @@ static void _call_cbs_collidesWithItem_c4977_1 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QGraphicsItem *arg1 = args.read<const QGraphicsItem * > (heap);
-  const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & arg2 = args.read<const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & > (heap);
+  const QGraphicsItem *arg1 = gsi::arg_reader<const QGraphicsItem * >() (args, heap);
+  const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & arg2 = args ? gsi::arg_reader<const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & >() (args, heap) : gsi::arg_maker<const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & >() (qt_gsi::CppToQtReadAdaptor<Qt::ItemSelectionMode>(heap, Qt::IntersectsItemShape), heap);
   ret.write<bool > ((bool)((QGraphicsPixmapItem_Adaptor *)cls)->cbs_collidesWithItem_c4977_1 (arg1, arg2));
 }
 
@@ -1150,8 +1150,8 @@ static void _call_cbs_collidesWithPath_c4877_1 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QPainterPath &arg1 = args.read<const QPainterPath & > (heap);
-  const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & arg2 = args.read<const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & > (heap);
+  const QPainterPath &arg1 = gsi::arg_reader<const QPainterPath & >() (args, heap);
+  const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & arg2 = args ? gsi::arg_reader<const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & >() (args, heap) : gsi::arg_maker<const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & >() (qt_gsi::CppToQtReadAdaptor<Qt::ItemSelectionMode>(heap, Qt::IntersectsItemShape), heap);
   ret.write<bool > ((bool)((QGraphicsPixmapItem_Adaptor *)cls)->cbs_collidesWithPath_c4877_1 (arg1, arg2));
 }
 
@@ -1174,7 +1174,7 @@ static void _call_cbs_contains_c1986_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QPointF &arg1 = args.read<const QPointF & > (heap);
+  const QPointF &arg1 = gsi::arg_reader<const QPointF & >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsPixmapItem_Adaptor *)cls)->cbs_contains_c1986_0 (arg1));
 }
 
@@ -1197,7 +1197,7 @@ static void _call_cbs_contextMenuEvent_3674_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneContextMenuEvent *arg1 = args.read<QGraphicsSceneContextMenuEvent * > (heap);
+  QGraphicsSceneContextMenuEvent *arg1 = gsi::arg_reader<QGraphicsSceneContextMenuEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsPixmapItem_Adaptor *)cls)->cbs_contextMenuEvent_3674_0 (arg1);
 }
@@ -1221,7 +1221,7 @@ static void _call_cbs_dragEnterEvent_3315_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneDragDropEvent *arg1 = args.read<QGraphicsSceneDragDropEvent * > (heap);
+  QGraphicsSceneDragDropEvent *arg1 = gsi::arg_reader<QGraphicsSceneDragDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsPixmapItem_Adaptor *)cls)->cbs_dragEnterEvent_3315_0 (arg1);
 }
@@ -1245,7 +1245,7 @@ static void _call_cbs_dragLeaveEvent_3315_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneDragDropEvent *arg1 = args.read<QGraphicsSceneDragDropEvent * > (heap);
+  QGraphicsSceneDragDropEvent *arg1 = gsi::arg_reader<QGraphicsSceneDragDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsPixmapItem_Adaptor *)cls)->cbs_dragLeaveEvent_3315_0 (arg1);
 }
@@ -1269,7 +1269,7 @@ static void _call_cbs_dragMoveEvent_3315_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneDragDropEvent *arg1 = args.read<QGraphicsSceneDragDropEvent * > (heap);
+  QGraphicsSceneDragDropEvent *arg1 = gsi::arg_reader<QGraphicsSceneDragDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsPixmapItem_Adaptor *)cls)->cbs_dragMoveEvent_3315_0 (arg1);
 }
@@ -1293,7 +1293,7 @@ static void _call_cbs_dropEvent_3315_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneDragDropEvent *arg1 = args.read<QGraphicsSceneDragDropEvent * > (heap);
+  QGraphicsSceneDragDropEvent *arg1 = gsi::arg_reader<QGraphicsSceneDragDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsPixmapItem_Adaptor *)cls)->cbs_dropEvent_3315_0 (arg1);
 }
@@ -1317,7 +1317,7 @@ static void _call_cbs_extension_c2119_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QVariant &arg1 = args.read<const QVariant & > (heap);
+  const QVariant &arg1 = gsi::arg_reader<const QVariant & >() (args, heap);
   ret.write<QVariant > ((QVariant)((QGraphicsPixmapItem_Adaptor *)cls)->cbs_extension_c2119_0 (arg1));
 }
 
@@ -1340,7 +1340,7 @@ static void _call_cbs_focusInEvent_1729_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsPixmapItem_Adaptor *)cls)->cbs_focusInEvent_1729_0 (arg1);
 }
@@ -1364,7 +1364,7 @@ static void _call_cbs_focusOutEvent_1729_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsPixmapItem_Adaptor *)cls)->cbs_focusOutEvent_1729_0 (arg1);
 }
@@ -1388,7 +1388,7 @@ static void _call_cbs_hoverEnterEvent_3044_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneHoverEvent *arg1 = args.read<QGraphicsSceneHoverEvent * > (heap);
+  QGraphicsSceneHoverEvent *arg1 = gsi::arg_reader<QGraphicsSceneHoverEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsPixmapItem_Adaptor *)cls)->cbs_hoverEnterEvent_3044_0 (arg1);
 }
@@ -1412,7 +1412,7 @@ static void _call_cbs_hoverLeaveEvent_3044_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneHoverEvent *arg1 = args.read<QGraphicsSceneHoverEvent * > (heap);
+  QGraphicsSceneHoverEvent *arg1 = gsi::arg_reader<QGraphicsSceneHoverEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsPixmapItem_Adaptor *)cls)->cbs_hoverLeaveEvent_3044_0 (arg1);
 }
@@ -1436,7 +1436,7 @@ static void _call_cbs_hoverMoveEvent_3044_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneHoverEvent *arg1 = args.read<QGraphicsSceneHoverEvent * > (heap);
+  QGraphicsSceneHoverEvent *arg1 = gsi::arg_reader<QGraphicsSceneHoverEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsPixmapItem_Adaptor *)cls)->cbs_hoverMoveEvent_3044_0 (arg1);
 }
@@ -1460,7 +1460,7 @@ static void _call_cbs_inputMethodEvent_2354_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QInputMethodEvent *arg1 = args.read<QInputMethodEvent * > (heap);
+  QInputMethodEvent *arg1 = gsi::arg_reader<QInputMethodEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsPixmapItem_Adaptor *)cls)->cbs_inputMethodEvent_2354_0 (arg1);
 }
@@ -1484,7 +1484,7 @@ static void _call_cbs_inputMethodQuery_c2420_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = args.read<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & > (heap);
+  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & >() (args, heap);
   ret.write<QVariant > ((QVariant)((QGraphicsPixmapItem_Adaptor *)cls)->cbs_inputMethodQuery_c2420_0 (arg1));
 }
 
@@ -1507,7 +1507,7 @@ static void _call_cbs_isObscuredBy_c2614_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QGraphicsItem *arg1 = args.read<const QGraphicsItem * > (heap);
+  const QGraphicsItem *arg1 = gsi::arg_reader<const QGraphicsItem * >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsPixmapItem_Adaptor *)cls)->cbs_isObscuredBy_c2614_0 (arg1));
 }
 
@@ -1532,8 +1532,8 @@ static void _call_cbs_itemChange_5658_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QGraphicsItem::GraphicsItemChange>::target_type & arg1 = args.read<const qt_gsi::Converter<QGraphicsItem::GraphicsItemChange>::target_type & > (heap);
-  const QVariant &arg2 = args.read<const QVariant & > (heap);
+  const qt_gsi::Converter<QGraphicsItem::GraphicsItemChange>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QGraphicsItem::GraphicsItemChange>::target_type & >() (args, heap);
+  const QVariant &arg2 = gsi::arg_reader<const QVariant & >() (args, heap);
   ret.write<QVariant > ((QVariant)((QGraphicsPixmapItem_Adaptor *)cls)->cbs_itemChange_5658_0 (arg1, arg2));
 }
 
@@ -1556,7 +1556,7 @@ static void _call_cbs_keyPressEvent_1514_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsPixmapItem_Adaptor *)cls)->cbs_keyPressEvent_1514_0 (arg1);
 }
@@ -1580,7 +1580,7 @@ static void _call_cbs_keyReleaseEvent_1514_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsPixmapItem_Adaptor *)cls)->cbs_keyReleaseEvent_1514_0 (arg1);
 }
@@ -1604,7 +1604,7 @@ static void _call_cbs_mouseDoubleClickEvent_3049_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneMouseEvent *arg1 = args.read<QGraphicsSceneMouseEvent * > (heap);
+  QGraphicsSceneMouseEvent *arg1 = gsi::arg_reader<QGraphicsSceneMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsPixmapItem_Adaptor *)cls)->cbs_mouseDoubleClickEvent_3049_0 (arg1);
 }
@@ -1628,7 +1628,7 @@ static void _call_cbs_mouseMoveEvent_3049_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneMouseEvent *arg1 = args.read<QGraphicsSceneMouseEvent * > (heap);
+  QGraphicsSceneMouseEvent *arg1 = gsi::arg_reader<QGraphicsSceneMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsPixmapItem_Adaptor *)cls)->cbs_mouseMoveEvent_3049_0 (arg1);
 }
@@ -1652,7 +1652,7 @@ static void _call_cbs_mousePressEvent_3049_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneMouseEvent *arg1 = args.read<QGraphicsSceneMouseEvent * > (heap);
+  QGraphicsSceneMouseEvent *arg1 = gsi::arg_reader<QGraphicsSceneMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsPixmapItem_Adaptor *)cls)->cbs_mousePressEvent_3049_0 (arg1);
 }
@@ -1676,7 +1676,7 @@ static void _call_cbs_mouseReleaseEvent_3049_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneMouseEvent *arg1 = args.read<QGraphicsSceneMouseEvent * > (heap);
+  QGraphicsSceneMouseEvent *arg1 = gsi::arg_reader<QGraphicsSceneMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsPixmapItem_Adaptor *)cls)->cbs_mouseReleaseEvent_3049_0 (arg1);
 }
@@ -1723,9 +1723,9 @@ static void _call_cbs_paint_6301_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QPainter *arg1 = args.read<QPainter * > (heap);
-  const QStyleOptionGraphicsItem *arg2 = args.read<const QStyleOptionGraphicsItem * > (heap);
-  QWidget *arg3 = args.read<QWidget * > (heap);
+  QPainter *arg1 = gsi::arg_reader<QPainter * >() (args, heap);
+  const QStyleOptionGraphicsItem *arg2 = gsi::arg_reader<const QStyleOptionGraphicsItem * >() (args, heap);
+  QWidget *arg3 = gsi::arg_reader<QWidget * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsPixmapItem_Adaptor *)cls)->cbs_paint_6301_0 (arg1, arg2, arg3);
 }
@@ -1779,7 +1779,7 @@ static void _call_cbs_sceneEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsPixmapItem_Adaptor *)cls)->cbs_sceneEvent_1217_0 (arg1));
 }
 
@@ -1804,8 +1804,8 @@ static void _call_cbs_sceneEventFilter_3028_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsItem *arg1 = args.read<QGraphicsItem * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QGraphicsItem *arg1 = gsi::arg_reader<QGraphicsItem * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsPixmapItem_Adaptor *)cls)->cbs_sceneEventFilter_3028_0 (arg1, arg2));
 }
 
@@ -1830,8 +1830,8 @@ static void _call_cbs_setExtension_4817_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  unsigned int arg1 = args.read<unsigned int > (heap);
-  const QVariant &arg2 = args.read<const QVariant & > (heap);
+  unsigned int arg1 = gsi::arg_reader<unsigned int >() (args, heap);
+  const QVariant &arg2 = gsi::arg_reader<const QVariant & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsPixmapItem_Adaptor *)cls)->cbs_setExtension_4817_0 (arg1, arg2);
 }
@@ -1874,7 +1874,7 @@ static void _call_cbs_supportsExtension_c2806_0 (const qt_gsi::GenericMethod * /
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  unsigned int arg1 = args.read<unsigned int > (heap);
+  unsigned int arg1 = gsi::arg_reader<unsigned int >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsPixmapItem_Adaptor *)cls)->cbs_supportsExtension_c2806_0 (arg1));
 }
 
@@ -1916,7 +1916,7 @@ static void _call_cbs_wheelEvent_3029_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneWheelEvent *arg1 = args.read<QGraphicsSceneWheelEvent * > (heap);
+  QGraphicsSceneWheelEvent *arg1 = gsi::arg_reader<QGraphicsSceneWheelEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsPixmapItem_Adaptor *)cls)->cbs_wheelEvent_3029_0 (arg1);
 }

src/gsiqt/qt4/QtGui/gsiDeclQGraphicsPolygonItem.cc

@@ -982,7 +982,7 @@ static void _call_cbs_advance_767_0 (const qt_gsi::GenericMethod * /*decl*/, voi
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsPolygonItem_Adaptor *)cls)->cbs_advance_767_0 (arg1);
 }
@@ -1027,8 +1027,8 @@ static void _call_cbs_collidesWithItem_c4977_1 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QGraphicsItem *arg1 = args.read<const QGraphicsItem * > (heap);
-  const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & arg2 = args.read<const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & > (heap);
+  const QGraphicsItem *arg1 = gsi::arg_reader<const QGraphicsItem * >() (args, heap);
+  const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & arg2 = args ? gsi::arg_reader<const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & >() (args, heap) : gsi::arg_maker<const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & >() (qt_gsi::CppToQtReadAdaptor<Qt::ItemSelectionMode>(heap, Qt::IntersectsItemShape), heap);
   ret.write<bool > ((bool)((QGraphicsPolygonItem_Adaptor *)cls)->cbs_collidesWithItem_c4977_1 (arg1, arg2));
 }
 
@@ -1053,8 +1053,8 @@ static void _call_cbs_collidesWithPath_c4877_1 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QPainterPath &arg1 = args.read<const QPainterPath & > (heap);
-  const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & arg2 = args.read<const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & > (heap);
+  const QPainterPath &arg1 = gsi::arg_reader<const QPainterPath & >() (args, heap);
+  const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & arg2 = args ? gsi::arg_reader<const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & >() (args, heap) : gsi::arg_maker<const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & >() (qt_gsi::CppToQtReadAdaptor<Qt::ItemSelectionMode>(heap, Qt::IntersectsItemShape), heap);
   ret.write<bool > ((bool)((QGraphicsPolygonItem_Adaptor *)cls)->cbs_collidesWithPath_c4877_1 (arg1, arg2));
 }
 
@@ -1077,7 +1077,7 @@ static void _call_cbs_contains_c1986_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QPointF &arg1 = args.read<const QPointF & > (heap);
+  const QPointF &arg1 = gsi::arg_reader<const QPointF & >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsPolygonItem_Adaptor *)cls)->cbs_contains_c1986_0 (arg1));
 }
 
@@ -1100,7 +1100,7 @@ static void _call_cbs_contextMenuEvent_3674_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneContextMenuEvent *arg1 = args.read<QGraphicsSceneContextMenuEvent * > (heap);
+  QGraphicsSceneContextMenuEvent *arg1 = gsi::arg_reader<QGraphicsSceneContextMenuEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsPolygonItem_Adaptor *)cls)->cbs_contextMenuEvent_3674_0 (arg1);
 }
@@ -1124,7 +1124,7 @@ static void _call_cbs_dragEnterEvent_3315_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneDragDropEvent *arg1 = args.read<QGraphicsSceneDragDropEvent * > (heap);
+  QGraphicsSceneDragDropEvent *arg1 = gsi::arg_reader<QGraphicsSceneDragDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsPolygonItem_Adaptor *)cls)->cbs_dragEnterEvent_3315_0 (arg1);
 }
@@ -1148,7 +1148,7 @@ static void _call_cbs_dragLeaveEvent_3315_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneDragDropEvent *arg1 = args.read<QGraphicsSceneDragDropEvent * > (heap);
+  QGraphicsSceneDragDropEvent *arg1 = gsi::arg_reader<QGraphicsSceneDragDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsPolygonItem_Adaptor *)cls)->cbs_dragLeaveEvent_3315_0 (arg1);
 }
@@ -1172,7 +1172,7 @@ static void _call_cbs_dragMoveEvent_3315_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneDragDropEvent *arg1 = args.read<QGraphicsSceneDragDropEvent * > (heap);
+  QGraphicsSceneDragDropEvent *arg1 = gsi::arg_reader<QGraphicsSceneDragDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsPolygonItem_Adaptor *)cls)->cbs_dragMoveEvent_3315_0 (arg1);
 }
@@ -1196,7 +1196,7 @@ static void _call_cbs_dropEvent_3315_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneDragDropEvent *arg1 = args.read<QGraphicsSceneDragDropEvent * > (heap);
+  QGraphicsSceneDragDropEvent *arg1 = gsi::arg_reader<QGraphicsSceneDragDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsPolygonItem_Adaptor *)cls)->cbs_dropEvent_3315_0 (arg1);
 }
@@ -1220,7 +1220,7 @@ static void _call_cbs_extension_c2119_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QVariant &arg1 = args.read<const QVariant & > (heap);
+  const QVariant &arg1 = gsi::arg_reader<const QVariant & >() (args, heap);
   ret.write<QVariant > ((QVariant)((QGraphicsPolygonItem_Adaptor *)cls)->cbs_extension_c2119_0 (arg1));
 }
 
@@ -1243,7 +1243,7 @@ static void _call_cbs_focusInEvent_1729_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsPolygonItem_Adaptor *)cls)->cbs_focusInEvent_1729_0 (arg1);
 }
@@ -1267,7 +1267,7 @@ static void _call_cbs_focusOutEvent_1729_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsPolygonItem_Adaptor *)cls)->cbs_focusOutEvent_1729_0 (arg1);
 }
@@ -1291,7 +1291,7 @@ static void _call_cbs_hoverEnterEvent_3044_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneHoverEvent *arg1 = args.read<QGraphicsSceneHoverEvent * > (heap);
+  QGraphicsSceneHoverEvent *arg1 = gsi::arg_reader<QGraphicsSceneHoverEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsPolygonItem_Adaptor *)cls)->cbs_hoverEnterEvent_3044_0 (arg1);
 }
@@ -1315,7 +1315,7 @@ static void _call_cbs_hoverLeaveEvent_3044_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneHoverEvent *arg1 = args.read<QGraphicsSceneHoverEvent * > (heap);
+  QGraphicsSceneHoverEvent *arg1 = gsi::arg_reader<QGraphicsSceneHoverEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsPolygonItem_Adaptor *)cls)->cbs_hoverLeaveEvent_3044_0 (arg1);
 }
@@ -1339,7 +1339,7 @@ static void _call_cbs_hoverMoveEvent_3044_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneHoverEvent *arg1 = args.read<QGraphicsSceneHoverEvent * > (heap);
+  QGraphicsSceneHoverEvent *arg1 = gsi::arg_reader<QGraphicsSceneHoverEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsPolygonItem_Adaptor *)cls)->cbs_hoverMoveEvent_3044_0 (arg1);
 }
@@ -1363,7 +1363,7 @@ static void _call_cbs_inputMethodEvent_2354_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QInputMethodEvent *arg1 = args.read<QInputMethodEvent * > (heap);
+  QInputMethodEvent *arg1 = gsi::arg_reader<QInputMethodEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsPolygonItem_Adaptor *)cls)->cbs_inputMethodEvent_2354_0 (arg1);
 }
@@ -1387,7 +1387,7 @@ static void _call_cbs_inputMethodQuery_c2420_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = args.read<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & > (heap);
+  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & >() (args, heap);
   ret.write<QVariant > ((QVariant)((QGraphicsPolygonItem_Adaptor *)cls)->cbs_inputMethodQuery_c2420_0 (arg1));
 }
 
@@ -1410,7 +1410,7 @@ static void _call_cbs_isObscuredBy_c2614_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QGraphicsItem *arg1 = args.read<const QGraphicsItem * > (heap);
+  const QGraphicsItem *arg1 = gsi::arg_reader<const QGraphicsItem * >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsPolygonItem_Adaptor *)cls)->cbs_isObscuredBy_c2614_0 (arg1));
 }
 
@@ -1435,8 +1435,8 @@ static void _call_cbs_itemChange_5658_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QGraphicsItem::GraphicsItemChange>::target_type & arg1 = args.read<const qt_gsi::Converter<QGraphicsItem::GraphicsItemChange>::target_type & > (heap);
-  const QVariant &arg2 = args.read<const QVariant & > (heap);
+  const qt_gsi::Converter<QGraphicsItem::GraphicsItemChange>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QGraphicsItem::GraphicsItemChange>::target_type & >() (args, heap);
+  const QVariant &arg2 = gsi::arg_reader<const QVariant & >() (args, heap);
   ret.write<QVariant > ((QVariant)((QGraphicsPolygonItem_Adaptor *)cls)->cbs_itemChange_5658_0 (arg1, arg2));
 }
 
@@ -1459,7 +1459,7 @@ static void _call_cbs_keyPressEvent_1514_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsPolygonItem_Adaptor *)cls)->cbs_keyPressEvent_1514_0 (arg1);
 }
@@ -1483,7 +1483,7 @@ static void _call_cbs_keyReleaseEvent_1514_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsPolygonItem_Adaptor *)cls)->cbs_keyReleaseEvent_1514_0 (arg1);
 }
@@ -1507,7 +1507,7 @@ static void _call_cbs_mouseDoubleClickEvent_3049_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneMouseEvent *arg1 = args.read<QGraphicsSceneMouseEvent * > (heap);
+  QGraphicsSceneMouseEvent *arg1 = gsi::arg_reader<QGraphicsSceneMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsPolygonItem_Adaptor *)cls)->cbs_mouseDoubleClickEvent_3049_0 (arg1);
 }
@@ -1531,7 +1531,7 @@ static void _call_cbs_mouseMoveEvent_3049_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneMouseEvent *arg1 = args.read<QGraphicsSceneMouseEvent * > (heap);
+  QGraphicsSceneMouseEvent *arg1 = gsi::arg_reader<QGraphicsSceneMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsPolygonItem_Adaptor *)cls)->cbs_mouseMoveEvent_3049_0 (arg1);
 }
@@ -1555,7 +1555,7 @@ static void _call_cbs_mousePressEvent_3049_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneMouseEvent *arg1 = args.read<QGraphicsSceneMouseEvent * > (heap);
+  QGraphicsSceneMouseEvent *arg1 = gsi::arg_reader<QGraphicsSceneMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsPolygonItem_Adaptor *)cls)->cbs_mousePressEvent_3049_0 (arg1);
 }
@@ -1579,7 +1579,7 @@ static void _call_cbs_mouseReleaseEvent_3049_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneMouseEvent *arg1 = args.read<QGraphicsSceneMouseEvent * > (heap);
+  QGraphicsSceneMouseEvent *arg1 = gsi::arg_reader<QGraphicsSceneMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsPolygonItem_Adaptor *)cls)->cbs_mouseReleaseEvent_3049_0 (arg1);
 }
@@ -1626,9 +1626,9 @@ static void _call_cbs_paint_6301_1 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QPainter *arg1 = args.read<QPainter * > (heap);
-  const QStyleOptionGraphicsItem *arg2 = args.read<const QStyleOptionGraphicsItem * > (heap);
-  QWidget *arg3 = args.read<QWidget * > (heap);
+  QPainter *arg1 = gsi::arg_reader<QPainter * >() (args, heap);
+  const QStyleOptionGraphicsItem *arg2 = gsi::arg_reader<const QStyleOptionGraphicsItem * >() (args, heap);
+  QWidget *arg3 = args ? gsi::arg_reader<QWidget * >() (args, heap) : gsi::arg_maker<QWidget * >() (0, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsPolygonItem_Adaptor *)cls)->cbs_paint_6301_1 (arg1, arg2, arg3);
 }
@@ -1682,7 +1682,7 @@ static void _call_cbs_sceneEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsPolygonItem_Adaptor *)cls)->cbs_sceneEvent_1217_0 (arg1));
 }
 
@@ -1707,8 +1707,8 @@ static void _call_cbs_sceneEventFilter_3028_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsItem *arg1 = args.read<QGraphicsItem * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QGraphicsItem *arg1 = gsi::arg_reader<QGraphicsItem * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsPolygonItem_Adaptor *)cls)->cbs_sceneEventFilter_3028_0 (arg1, arg2));
 }
 
@@ -1733,8 +1733,8 @@ static void _call_cbs_setExtension_4817_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  unsigned int arg1 = args.read<unsigned int > (heap);
-  const QVariant &arg2 = args.read<const QVariant & > (heap);
+  unsigned int arg1 = gsi::arg_reader<unsigned int >() (args, heap);
+  const QVariant &arg2 = gsi::arg_reader<const QVariant & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsPolygonItem_Adaptor *)cls)->cbs_setExtension_4817_0 (arg1, arg2);
 }
@@ -1777,7 +1777,7 @@ static void _call_cbs_supportsExtension_c2806_0 (const qt_gsi::GenericMethod * /
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  unsigned int arg1 = args.read<unsigned int > (heap);
+  unsigned int arg1 = gsi::arg_reader<unsigned int >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsPolygonItem_Adaptor *)cls)->cbs_supportsExtension_c2806_0 (arg1));
 }
 
@@ -1819,7 +1819,7 @@ static void _call_cbs_wheelEvent_3029_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneWheelEvent *arg1 = args.read<QGraphicsSceneWheelEvent * > (heap);
+  QGraphicsSceneWheelEvent *arg1 = gsi::arg_reader<QGraphicsSceneWheelEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsPolygonItem_Adaptor *)cls)->cbs_wheelEvent_3029_0 (arg1);
 }

src/gsiqt/qt4/QtGui/gsiDeclQGraphicsProxyWidget.cc

@@ -1532,7 +1532,7 @@ static void _call_cbs_advance_767_0 (const qt_gsi::GenericMethod * /*decl*/, voi
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsProxyWidget_Adaptor *)cls)->cbs_advance_767_0 (arg1);
 }
@@ -1575,7 +1575,7 @@ static void _call_cbs_changeEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsProxyWidget_Adaptor *)cls)->cbs_changeEvent_1217_0 (arg1);
 }
@@ -1599,7 +1599,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsProxyWidget_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -1623,7 +1623,7 @@ static void _call_cbs_closeEvent_1719_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QCloseEvent *arg1 = args.read<QCloseEvent * > (heap);
+  QCloseEvent *arg1 = gsi::arg_reader<QCloseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsProxyWidget_Adaptor *)cls)->cbs_closeEvent_1719_0 (arg1);
 }
@@ -1649,8 +1649,8 @@ static void _call_cbs_collidesWithItem_c4977_1 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QGraphicsItem *arg1 = args.read<const QGraphicsItem * > (heap);
-  const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & arg2 = args.read<const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & > (heap);
+  const QGraphicsItem *arg1 = gsi::arg_reader<const QGraphicsItem * >() (args, heap);
+  const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & arg2 = args ? gsi::arg_reader<const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & >() (args, heap) : gsi::arg_maker<const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & >() (qt_gsi::CppToQtReadAdaptor<Qt::ItemSelectionMode>(heap, Qt::IntersectsItemShape), heap);
   ret.write<bool > ((bool)((QGraphicsProxyWidget_Adaptor *)cls)->cbs_collidesWithItem_c4977_1 (arg1, arg2));
 }
 
@@ -1675,8 +1675,8 @@ static void _call_cbs_collidesWithPath_c4877_1 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QPainterPath &arg1 = args.read<const QPainterPath & > (heap);
-  const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & arg2 = args.read<const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & > (heap);
+  const QPainterPath &arg1 = gsi::arg_reader<const QPainterPath & >() (args, heap);
+  const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & arg2 = args ? gsi::arg_reader<const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & >() (args, heap) : gsi::arg_maker<const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & >() (qt_gsi::CppToQtReadAdaptor<Qt::ItemSelectionMode>(heap, Qt::IntersectsItemShape), heap);
   ret.write<bool > ((bool)((QGraphicsProxyWidget_Adaptor *)cls)->cbs_collidesWithPath_c4877_1 (arg1, arg2));
 }
 
@@ -1699,7 +1699,7 @@ static void _call_cbs_contains_c1986_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QPointF &arg1 = args.read<const QPointF & > (heap);
+  const QPointF &arg1 = gsi::arg_reader<const QPointF & >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsProxyWidget_Adaptor *)cls)->cbs_contains_c1986_0 (arg1));
 }
 
@@ -1722,7 +1722,7 @@ static void _call_cbs_contextMenuEvent_3674_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneContextMenuEvent *arg1 = args.read<QGraphicsSceneContextMenuEvent * > (heap);
+  QGraphicsSceneContextMenuEvent *arg1 = gsi::arg_reader<QGraphicsSceneContextMenuEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsProxyWidget_Adaptor *)cls)->cbs_contextMenuEvent_3674_0 (arg1);
 }
@@ -1746,7 +1746,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsProxyWidget_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -1788,7 +1788,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsProxyWidget_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -1812,7 +1812,7 @@ static void _call_cbs_dragEnterEvent_3315_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneDragDropEvent *arg1 = args.read<QGraphicsSceneDragDropEvent * > (heap);
+  QGraphicsSceneDragDropEvent *arg1 = gsi::arg_reader<QGraphicsSceneDragDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsProxyWidget_Adaptor *)cls)->cbs_dragEnterEvent_3315_0 (arg1);
 }
@@ -1836,7 +1836,7 @@ static void _call_cbs_dragLeaveEvent_3315_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneDragDropEvent *arg1 = args.read<QGraphicsSceneDragDropEvent * > (heap);
+  QGraphicsSceneDragDropEvent *arg1 = gsi::arg_reader<QGraphicsSceneDragDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsProxyWidget_Adaptor *)cls)->cbs_dragLeaveEvent_3315_0 (arg1);
 }
@@ -1860,7 +1860,7 @@ static void _call_cbs_dragMoveEvent_3315_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneDragDropEvent *arg1 = args.read<QGraphicsSceneDragDropEvent * > (heap);
+  QGraphicsSceneDragDropEvent *arg1 = gsi::arg_reader<QGraphicsSceneDragDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsProxyWidget_Adaptor *)cls)->cbs_dragMoveEvent_3315_0 (arg1);
 }
@@ -1884,7 +1884,7 @@ static void _call_cbs_dropEvent_3315_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneDragDropEvent *arg1 = args.read<QGraphicsSceneDragDropEvent * > (heap);
+  QGraphicsSceneDragDropEvent *arg1 = gsi::arg_reader<QGraphicsSceneDragDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsProxyWidget_Adaptor *)cls)->cbs_dropEvent_3315_0 (arg1);
 }
@@ -1922,7 +1922,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsProxyWidget_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -1947,8 +1947,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsProxyWidget_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -1971,7 +1971,7 @@ static void _call_cbs_extension_c2119_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QVariant &arg1 = args.read<const QVariant & > (heap);
+  const QVariant &arg1 = gsi::arg_reader<const QVariant & >() (args, heap);
   ret.write<QVariant > ((QVariant)((QGraphicsProxyWidget_Adaptor *)cls)->cbs_extension_c2119_0 (arg1));
 }
 
@@ -1994,7 +1994,7 @@ static void _call_cbs_focusInEvent_1729_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsProxyWidget_Adaptor *)cls)->cbs_focusInEvent_1729_0 (arg1);
 }
@@ -2018,7 +2018,7 @@ static void _call_cbs_focusNextPrevChild_864_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  bool arg1 = args.read<bool > (heap);
+  bool arg1 = gsi::arg_reader<bool >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsProxyWidget_Adaptor *)cls)->cbs_focusNextPrevChild_864_0 (arg1));
 }
 
@@ -2041,7 +2041,7 @@ static void _call_cbs_focusOutEvent_1729_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsProxyWidget_Adaptor *)cls)->cbs_focusOutEvent_1729_0 (arg1);
 }
@@ -2071,10 +2071,10 @@ static void _call_cbs_getContentsMargins_c4704_0 (const qt_gsi::GenericMethod *
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  double *arg1 = args.read<double * > (heap);
-  double *arg2 = args.read<double * > (heap);
-  double *arg3 = args.read<double * > (heap);
-  double *arg4 = args.read<double * > (heap);
+  double *arg1 = gsi::arg_reader<double * >() (args, heap);
+  double *arg2 = gsi::arg_reader<double * >() (args, heap);
+  double *arg3 = gsi::arg_reader<double * >() (args, heap);
+  double *arg4 = gsi::arg_reader<double * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsProxyWidget_Adaptor *)cls)->cbs_getContentsMargins_c4704_0 (arg1, arg2, arg3, arg4);
 }
@@ -2098,7 +2098,7 @@ static void _call_cbs_grabKeyboardEvent_1217_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsProxyWidget_Adaptor *)cls)->cbs_grabKeyboardEvent_1217_0 (arg1);
 }
@@ -2122,7 +2122,7 @@ static void _call_cbs_grabMouseEvent_1217_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsProxyWidget_Adaptor *)cls)->cbs_grabMouseEvent_1217_0 (arg1);
 }
@@ -2146,7 +2146,7 @@ static void _call_cbs_hideEvent_1595_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QHideEvent *arg1 = args.read<QHideEvent * > (heap);
+  QHideEvent *arg1 = gsi::arg_reader<QHideEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsProxyWidget_Adaptor *)cls)->cbs_hideEvent_1595_0 (arg1);
 }
@@ -2170,7 +2170,7 @@ static void _call_cbs_hoverEnterEvent_3044_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneHoverEvent *arg1 = args.read<QGraphicsSceneHoverEvent * > (heap);
+  QGraphicsSceneHoverEvent *arg1 = gsi::arg_reader<QGraphicsSceneHoverEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsProxyWidget_Adaptor *)cls)->cbs_hoverEnterEvent_3044_0 (arg1);
 }
@@ -2194,7 +2194,7 @@ static void _call_cbs_hoverLeaveEvent_3044_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneHoverEvent *arg1 = args.read<QGraphicsSceneHoverEvent * > (heap);
+  QGraphicsSceneHoverEvent *arg1 = gsi::arg_reader<QGraphicsSceneHoverEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsProxyWidget_Adaptor *)cls)->cbs_hoverLeaveEvent_3044_0 (arg1);
 }
@@ -2218,7 +2218,7 @@ static void _call_cbs_hoverMoveEvent_3044_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneHoverEvent *arg1 = args.read<QGraphicsSceneHoverEvent * > (heap);
+  QGraphicsSceneHoverEvent *arg1 = gsi::arg_reader<QGraphicsSceneHoverEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsProxyWidget_Adaptor *)cls)->cbs_hoverMoveEvent_3044_0 (arg1);
 }
@@ -2242,7 +2242,7 @@ static void _call_cbs_initStyleOption_c1865_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QStyleOption *arg1 = args.read<QStyleOption * > (heap);
+  QStyleOption *arg1 = gsi::arg_reader<QStyleOption * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsProxyWidget_Adaptor *)cls)->cbs_initStyleOption_c1865_0 (arg1);
 }
@@ -2266,7 +2266,7 @@ static void _call_cbs_inputMethodEvent_2354_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QInputMethodEvent *arg1 = args.read<QInputMethodEvent * > (heap);
+  QInputMethodEvent *arg1 = gsi::arg_reader<QInputMethodEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsProxyWidget_Adaptor *)cls)->cbs_inputMethodEvent_2354_0 (arg1);
 }
@@ -2290,7 +2290,7 @@ static void _call_cbs_inputMethodQuery_c2420_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = args.read<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & > (heap);
+  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & >() (args, heap);
   ret.write<QVariant > ((QVariant)((QGraphicsProxyWidget_Adaptor *)cls)->cbs_inputMethodQuery_c2420_0 (arg1));
 }
 
@@ -2313,7 +2313,7 @@ static void _call_cbs_isObscuredBy_c2614_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QGraphicsItem *arg1 = args.read<const QGraphicsItem * > (heap);
+  const QGraphicsItem *arg1 = gsi::arg_reader<const QGraphicsItem * >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsProxyWidget_Adaptor *)cls)->cbs_isObscuredBy_c2614_0 (arg1));
 }
 
@@ -2338,8 +2338,8 @@ static void _call_cbs_itemChange_5658_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QGraphicsItem::GraphicsItemChange>::target_type & arg1 = args.read<const qt_gsi::Converter<QGraphicsItem::GraphicsItemChange>::target_type & > (heap);
-  const QVariant &arg2 = args.read<const QVariant & > (heap);
+  const qt_gsi::Converter<QGraphicsItem::GraphicsItemChange>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QGraphicsItem::GraphicsItemChange>::target_type & >() (args, heap);
+  const QVariant &arg2 = gsi::arg_reader<const QVariant & >() (args, heap);
   ret.write<QVariant > ((QVariant)((QGraphicsProxyWidget_Adaptor *)cls)->cbs_itemChange_5658_0 (arg1, arg2));
 }
 
@@ -2362,7 +2362,7 @@ static void _call_cbs_keyPressEvent_1514_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsProxyWidget_Adaptor *)cls)->cbs_keyPressEvent_1514_0 (arg1);
 }
@@ -2386,7 +2386,7 @@ static void _call_cbs_keyReleaseEvent_1514_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsProxyWidget_Adaptor *)cls)->cbs_keyReleaseEvent_1514_0 (arg1);
 }
@@ -2410,7 +2410,7 @@ static void _call_cbs_mouseDoubleClickEvent_3049_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneMouseEvent *arg1 = args.read<QGraphicsSceneMouseEvent * > (heap);
+  QGraphicsSceneMouseEvent *arg1 = gsi::arg_reader<QGraphicsSceneMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsProxyWidget_Adaptor *)cls)->cbs_mouseDoubleClickEvent_3049_0 (arg1);
 }
@@ -2434,7 +2434,7 @@ static void _call_cbs_mouseMoveEvent_3049_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneMouseEvent *arg1 = args.read<QGraphicsSceneMouseEvent * > (heap);
+  QGraphicsSceneMouseEvent *arg1 = gsi::arg_reader<QGraphicsSceneMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsProxyWidget_Adaptor *)cls)->cbs_mouseMoveEvent_3049_0 (arg1);
 }
@@ -2458,7 +2458,7 @@ static void _call_cbs_mousePressEvent_3049_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneMouseEvent *arg1 = args.read<QGraphicsSceneMouseEvent * > (heap);
+  QGraphicsSceneMouseEvent *arg1 = gsi::arg_reader<QGraphicsSceneMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsProxyWidget_Adaptor *)cls)->cbs_mousePressEvent_3049_0 (arg1);
 }
@@ -2482,7 +2482,7 @@ static void _call_cbs_mouseReleaseEvent_3049_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneMouseEvent *arg1 = args.read<QGraphicsSceneMouseEvent * > (heap);
+  QGraphicsSceneMouseEvent *arg1 = gsi::arg_reader<QGraphicsSceneMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsProxyWidget_Adaptor *)cls)->cbs_mouseReleaseEvent_3049_0 (arg1);
 }
@@ -2506,7 +2506,7 @@ static void _call_cbs_moveEvent_2935_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneMoveEvent *arg1 = args.read<QGraphicsSceneMoveEvent * > (heap);
+  QGraphicsSceneMoveEvent *arg1 = gsi::arg_reader<QGraphicsSceneMoveEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsProxyWidget_Adaptor *)cls)->cbs_moveEvent_2935_0 (arg1);
 }
@@ -2585,9 +2585,9 @@ static void _call_cbs_paint_6301_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QPainter *arg1 = args.read<QPainter * > (heap);
-  const QStyleOptionGraphicsItem *arg2 = args.read<const QStyleOptionGraphicsItem * > (heap);
-  QWidget *arg3 = args.read<QWidget * > (heap);
+  QPainter *arg1 = gsi::arg_reader<QPainter * >() (args, heap);
+  const QStyleOptionGraphicsItem *arg2 = gsi::arg_reader<const QStyleOptionGraphicsItem * >() (args, heap);
+  QWidget *arg3 = gsi::arg_reader<QWidget * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsProxyWidget_Adaptor *)cls)->cbs_paint_6301_0 (arg1, arg2, arg3);
 }
@@ -2615,9 +2615,9 @@ static void _call_cbs_paintWindowFrame_6301_1 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QPainter *arg1 = args.read<QPainter * > (heap);
-  const QStyleOptionGraphicsItem *arg2 = args.read<const QStyleOptionGraphicsItem * > (heap);
-  QWidget *arg3 = args.read<QWidget * > (heap);
+  QPainter *arg1 = gsi::arg_reader<QPainter * >() (args, heap);
+  const QStyleOptionGraphicsItem *arg2 = gsi::arg_reader<const QStyleOptionGraphicsItem * >() (args, heap);
+  QWidget *arg3 = args ? gsi::arg_reader<QWidget * >() (args, heap) : gsi::arg_maker<QWidget * >() (0, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsProxyWidget_Adaptor *)cls)->cbs_paintWindowFrame_6301_1 (arg1, arg2, arg3);
 }
@@ -2692,8 +2692,8 @@ static void _call_cbs_propertyChange_4036_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QString &arg1 = args.read<const QString & > (heap);
-  const QVariant &arg2 = args.read<const QVariant & > (heap);
+  const QString &arg1 = gsi::arg_reader<const QString & >() (args, heap);
+  const QVariant &arg2 = gsi::arg_reader<const QVariant & >() (args, heap);
   ret.write<QVariant > ((QVariant)((QGraphicsProxyWidget_Adaptor *)cls)->cbs_propertyChange_4036_0 (arg1, arg2));
 }
 
@@ -2749,7 +2749,7 @@ static void _call_cbs_resizeEvent_3154_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneResizeEvent *arg1 = args.read<QGraphicsSceneResizeEvent * > (heap);
+  QGraphicsSceneResizeEvent *arg1 = gsi::arg_reader<QGraphicsSceneResizeEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsProxyWidget_Adaptor *)cls)->cbs_resizeEvent_3154_0 (arg1);
 }
@@ -2801,7 +2801,7 @@ static void _call_cbs_sceneEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsProxyWidget_Adaptor *)cls)->cbs_sceneEvent_1217_0 (arg1));
 }
 
@@ -2826,8 +2826,8 @@ static void _call_cbs_sceneEventFilter_3028_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsItem *arg1 = args.read<QGraphicsItem * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QGraphicsItem *arg1 = gsi::arg_reader<QGraphicsItem * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsProxyWidget_Adaptor *)cls)->cbs_sceneEventFilter_3028_0 (arg1, arg2));
 }
 
@@ -2866,8 +2866,8 @@ static void _call_cbs_setExtension_4817_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  unsigned int arg1 = args.read<unsigned int > (heap);
-  const QVariant &arg2 = args.read<const QVariant & > (heap);
+  unsigned int arg1 = gsi::arg_reader<unsigned int >() (args, heap);
+  const QVariant &arg2 = gsi::arg_reader<const QVariant & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsProxyWidget_Adaptor *)cls)->cbs_setExtension_4817_0 (arg1, arg2);
 }
@@ -2891,7 +2891,7 @@ static void _call_cbs_setGeometry_1862_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QRectF &arg1 = args.read<const QRectF & > (heap);
+  const QRectF &arg1 = gsi::arg_reader<const QRectF & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsProxyWidget_Adaptor *)cls)->cbs_setGeometry_1862_0 (arg1);
 }
@@ -2972,7 +2972,7 @@ static void _call_cbs_showEvent_1634_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QShowEvent *arg1 = args.read<QShowEvent * > (heap);
+  QShowEvent *arg1 = gsi::arg_reader<QShowEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsProxyWidget_Adaptor *)cls)->cbs_showEvent_1634_0 (arg1);
 }
@@ -2998,8 +2998,8 @@ static void _call_cbs_sizeHint_c3330_1 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<Qt::SizeHint>::target_type & arg1 = args.read<const qt_gsi::Converter<Qt::SizeHint>::target_type & > (heap);
-  const QSizeF &arg2 = args.read<const QSizeF & > (heap);
+  const qt_gsi::Converter<Qt::SizeHint>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<Qt::SizeHint>::target_type & >() (args, heap);
+  const QSizeF &arg2 = args ? gsi::arg_reader<const QSizeF & >() (args, heap) : gsi::arg_maker<const QSizeF & >() (QSizeF(), heap);
   ret.write<QSizeF > ((QSizeF)((QGraphicsProxyWidget_Adaptor *)cls)->cbs_sizeHint_c3330_1 (arg1, arg2));
 }
 
@@ -3022,7 +3022,7 @@ static void _call_cbs_supportsExtension_c2806_0 (const qt_gsi::GenericMethod * /
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  unsigned int arg1 = args.read<unsigned int > (heap);
+  unsigned int arg1 = gsi::arg_reader<unsigned int >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsProxyWidget_Adaptor *)cls)->cbs_supportsExtension_c2806_0 (arg1));
 }
 
@@ -3045,7 +3045,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsProxyWidget_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }
@@ -3088,7 +3088,7 @@ static void _call_cbs_ungrabKeyboardEvent_1217_0 (const qt_gsi::GenericMethod *
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsProxyWidget_Adaptor *)cls)->cbs_ungrabKeyboardEvent_1217_0 (arg1);
 }
@@ -3112,7 +3112,7 @@ static void _call_cbs_ungrabMouseEvent_1217_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsProxyWidget_Adaptor *)cls)->cbs_ungrabMouseEvent_1217_0 (arg1);
 }
@@ -3170,7 +3170,7 @@ static void _call_cbs_wheelEvent_3029_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneWheelEvent *arg1 = args.read<QGraphicsSceneWheelEvent * > (heap);
+  QGraphicsSceneWheelEvent *arg1 = gsi::arg_reader<QGraphicsSceneWheelEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsProxyWidget_Adaptor *)cls)->cbs_wheelEvent_3029_0 (arg1);
 }
@@ -3194,7 +3194,7 @@ static void _call_cbs_windowFrameEvent_1217_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsProxyWidget_Adaptor *)cls)->cbs_windowFrameEvent_1217_0 (arg1));
 }
 
@@ -3217,7 +3217,7 @@ static void _call_cbs_windowFrameSectionAt_c1986_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QPointF &arg1 = args.read<const QPointF & > (heap);
+  const QPointF &arg1 = gsi::arg_reader<const QPointF & >() (args, heap);
   ret.write<qt_gsi::Converter<Qt::WindowFrameSection>::target_type > ((qt_gsi::Converter<Qt::WindowFrameSection>::target_type)((QGraphicsProxyWidget_Adaptor *)cls)->cbs_windowFrameSectionAt_c1986_0 (arg1));
 }
 

src/gsiqt/qt4/QtGui/gsiDeclQGraphicsRectItem.cc

@@ -1026,7 +1026,7 @@ static void _call_cbs_advance_767_0 (const qt_gsi::GenericMethod * /*decl*/, voi
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsRectItem_Adaptor *)cls)->cbs_advance_767_0 (arg1);
 }
@@ -1071,8 +1071,8 @@ static void _call_cbs_collidesWithItem_c4977_1 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QGraphicsItem *arg1 = args.read<const QGraphicsItem * > (heap);
-  const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & arg2 = args.read<const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & > (heap);
+  const QGraphicsItem *arg1 = gsi::arg_reader<const QGraphicsItem * >() (args, heap);
+  const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & arg2 = args ? gsi::arg_reader<const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & >() (args, heap) : gsi::arg_maker<const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & >() (qt_gsi::CppToQtReadAdaptor<Qt::ItemSelectionMode>(heap, Qt::IntersectsItemShape), heap);
   ret.write<bool > ((bool)((QGraphicsRectItem_Adaptor *)cls)->cbs_collidesWithItem_c4977_1 (arg1, arg2));
 }
 
@@ -1097,8 +1097,8 @@ static void _call_cbs_collidesWithPath_c4877_1 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QPainterPath &arg1 = args.read<const QPainterPath & > (heap);
-  const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & arg2 = args.read<const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & > (heap);
+  const QPainterPath &arg1 = gsi::arg_reader<const QPainterPath & >() (args, heap);
+  const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & arg2 = args ? gsi::arg_reader<const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & >() (args, heap) : gsi::arg_maker<const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & >() (qt_gsi::CppToQtReadAdaptor<Qt::ItemSelectionMode>(heap, Qt::IntersectsItemShape), heap);
   ret.write<bool > ((bool)((QGraphicsRectItem_Adaptor *)cls)->cbs_collidesWithPath_c4877_1 (arg1, arg2));
 }
 
@@ -1121,7 +1121,7 @@ static void _call_cbs_contains_c1986_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QPointF &arg1 = args.read<const QPointF & > (heap);
+  const QPointF &arg1 = gsi::arg_reader<const QPointF & >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsRectItem_Adaptor *)cls)->cbs_contains_c1986_0 (arg1));
 }
 
@@ -1144,7 +1144,7 @@ static void _call_cbs_contextMenuEvent_3674_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneContextMenuEvent *arg1 = args.read<QGraphicsSceneContextMenuEvent * > (heap);
+  QGraphicsSceneContextMenuEvent *arg1 = gsi::arg_reader<QGraphicsSceneContextMenuEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsRectItem_Adaptor *)cls)->cbs_contextMenuEvent_3674_0 (arg1);
 }
@@ -1168,7 +1168,7 @@ static void _call_cbs_dragEnterEvent_3315_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneDragDropEvent *arg1 = args.read<QGraphicsSceneDragDropEvent * > (heap);
+  QGraphicsSceneDragDropEvent *arg1 = gsi::arg_reader<QGraphicsSceneDragDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsRectItem_Adaptor *)cls)->cbs_dragEnterEvent_3315_0 (arg1);
 }
@@ -1192,7 +1192,7 @@ static void _call_cbs_dragLeaveEvent_3315_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneDragDropEvent *arg1 = args.read<QGraphicsSceneDragDropEvent * > (heap);
+  QGraphicsSceneDragDropEvent *arg1 = gsi::arg_reader<QGraphicsSceneDragDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsRectItem_Adaptor *)cls)->cbs_dragLeaveEvent_3315_0 (arg1);
 }
@@ -1216,7 +1216,7 @@ static void _call_cbs_dragMoveEvent_3315_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneDragDropEvent *arg1 = args.read<QGraphicsSceneDragDropEvent * > (heap);
+  QGraphicsSceneDragDropEvent *arg1 = gsi::arg_reader<QGraphicsSceneDragDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsRectItem_Adaptor *)cls)->cbs_dragMoveEvent_3315_0 (arg1);
 }
@@ -1240,7 +1240,7 @@ static void _call_cbs_dropEvent_3315_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneDragDropEvent *arg1 = args.read<QGraphicsSceneDragDropEvent * > (heap);
+  QGraphicsSceneDragDropEvent *arg1 = gsi::arg_reader<QGraphicsSceneDragDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsRectItem_Adaptor *)cls)->cbs_dropEvent_3315_0 (arg1);
 }
@@ -1264,7 +1264,7 @@ static void _call_cbs_extension_c2119_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QVariant &arg1 = args.read<const QVariant & > (heap);
+  const QVariant &arg1 = gsi::arg_reader<const QVariant & >() (args, heap);
   ret.write<QVariant > ((QVariant)((QGraphicsRectItem_Adaptor *)cls)->cbs_extension_c2119_0 (arg1));
 }
 
@@ -1287,7 +1287,7 @@ static void _call_cbs_focusInEvent_1729_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsRectItem_Adaptor *)cls)->cbs_focusInEvent_1729_0 (arg1);
 }
@@ -1311,7 +1311,7 @@ static void _call_cbs_focusOutEvent_1729_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsRectItem_Adaptor *)cls)->cbs_focusOutEvent_1729_0 (arg1);
 }
@@ -1335,7 +1335,7 @@ static void _call_cbs_hoverEnterEvent_3044_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneHoverEvent *arg1 = args.read<QGraphicsSceneHoverEvent * > (heap);
+  QGraphicsSceneHoverEvent *arg1 = gsi::arg_reader<QGraphicsSceneHoverEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsRectItem_Adaptor *)cls)->cbs_hoverEnterEvent_3044_0 (arg1);
 }
@@ -1359,7 +1359,7 @@ static void _call_cbs_hoverLeaveEvent_3044_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneHoverEvent *arg1 = args.read<QGraphicsSceneHoverEvent * > (heap);
+  QGraphicsSceneHoverEvent *arg1 = gsi::arg_reader<QGraphicsSceneHoverEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsRectItem_Adaptor *)cls)->cbs_hoverLeaveEvent_3044_0 (arg1);
 }
@@ -1383,7 +1383,7 @@ static void _call_cbs_hoverMoveEvent_3044_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneHoverEvent *arg1 = args.read<QGraphicsSceneHoverEvent * > (heap);
+  QGraphicsSceneHoverEvent *arg1 = gsi::arg_reader<QGraphicsSceneHoverEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsRectItem_Adaptor *)cls)->cbs_hoverMoveEvent_3044_0 (arg1);
 }
@@ -1407,7 +1407,7 @@ static void _call_cbs_inputMethodEvent_2354_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QInputMethodEvent *arg1 = args.read<QInputMethodEvent * > (heap);
+  QInputMethodEvent *arg1 = gsi::arg_reader<QInputMethodEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsRectItem_Adaptor *)cls)->cbs_inputMethodEvent_2354_0 (arg1);
 }
@@ -1431,7 +1431,7 @@ static void _call_cbs_inputMethodQuery_c2420_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = args.read<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & > (heap);
+  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & >() (args, heap);
   ret.write<QVariant > ((QVariant)((QGraphicsRectItem_Adaptor *)cls)->cbs_inputMethodQuery_c2420_0 (arg1));
 }
 
@@ -1454,7 +1454,7 @@ static void _call_cbs_isObscuredBy_c2614_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QGraphicsItem *arg1 = args.read<const QGraphicsItem * > (heap);
+  const QGraphicsItem *arg1 = gsi::arg_reader<const QGraphicsItem * >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsRectItem_Adaptor *)cls)->cbs_isObscuredBy_c2614_0 (arg1));
 }
 
@@ -1479,8 +1479,8 @@ static void _call_cbs_itemChange_5658_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QGraphicsItem::GraphicsItemChange>::target_type & arg1 = args.read<const qt_gsi::Converter<QGraphicsItem::GraphicsItemChange>::target_type & > (heap);
-  const QVariant &arg2 = args.read<const QVariant & > (heap);
+  const qt_gsi::Converter<QGraphicsItem::GraphicsItemChange>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QGraphicsItem::GraphicsItemChange>::target_type & >() (args, heap);
+  const QVariant &arg2 = gsi::arg_reader<const QVariant & >() (args, heap);
   ret.write<QVariant > ((QVariant)((QGraphicsRectItem_Adaptor *)cls)->cbs_itemChange_5658_0 (arg1, arg2));
 }
 
@@ -1503,7 +1503,7 @@ static void _call_cbs_keyPressEvent_1514_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsRectItem_Adaptor *)cls)->cbs_keyPressEvent_1514_0 (arg1);
 }
@@ -1527,7 +1527,7 @@ static void _call_cbs_keyReleaseEvent_1514_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsRectItem_Adaptor *)cls)->cbs_keyReleaseEvent_1514_0 (arg1);
 }
@@ -1551,7 +1551,7 @@ static void _call_cbs_mouseDoubleClickEvent_3049_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneMouseEvent *arg1 = args.read<QGraphicsSceneMouseEvent * > (heap);
+  QGraphicsSceneMouseEvent *arg1 = gsi::arg_reader<QGraphicsSceneMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsRectItem_Adaptor *)cls)->cbs_mouseDoubleClickEvent_3049_0 (arg1);
 }
@@ -1575,7 +1575,7 @@ static void _call_cbs_mouseMoveEvent_3049_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneMouseEvent *arg1 = args.read<QGraphicsSceneMouseEvent * > (heap);
+  QGraphicsSceneMouseEvent *arg1 = gsi::arg_reader<QGraphicsSceneMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsRectItem_Adaptor *)cls)->cbs_mouseMoveEvent_3049_0 (arg1);
 }
@@ -1599,7 +1599,7 @@ static void _call_cbs_mousePressEvent_3049_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneMouseEvent *arg1 = args.read<QGraphicsSceneMouseEvent * > (heap);
+  QGraphicsSceneMouseEvent *arg1 = gsi::arg_reader<QGraphicsSceneMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsRectItem_Adaptor *)cls)->cbs_mousePressEvent_3049_0 (arg1);
 }
@@ -1623,7 +1623,7 @@ static void _call_cbs_mouseReleaseEvent_3049_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneMouseEvent *arg1 = args.read<QGraphicsSceneMouseEvent * > (heap);
+  QGraphicsSceneMouseEvent *arg1 = gsi::arg_reader<QGraphicsSceneMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsRectItem_Adaptor *)cls)->cbs_mouseReleaseEvent_3049_0 (arg1);
 }
@@ -1670,9 +1670,9 @@ static void _call_cbs_paint_6301_1 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QPainter *arg1 = args.read<QPainter * > (heap);
-  const QStyleOptionGraphicsItem *arg2 = args.read<const QStyleOptionGraphicsItem * > (heap);
-  QWidget *arg3 = args.read<QWidget * > (heap);
+  QPainter *arg1 = gsi::arg_reader<QPainter * >() (args, heap);
+  const QStyleOptionGraphicsItem *arg2 = gsi::arg_reader<const QStyleOptionGraphicsItem * >() (args, heap);
+  QWidget *arg3 = args ? gsi::arg_reader<QWidget * >() (args, heap) : gsi::arg_maker<QWidget * >() (0, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsRectItem_Adaptor *)cls)->cbs_paint_6301_1 (arg1, arg2, arg3);
 }
@@ -1726,7 +1726,7 @@ static void _call_cbs_sceneEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsRectItem_Adaptor *)cls)->cbs_sceneEvent_1217_0 (arg1));
 }
 
@@ -1751,8 +1751,8 @@ static void _call_cbs_sceneEventFilter_3028_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsItem *arg1 = args.read<QGraphicsItem * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QGraphicsItem *arg1 = gsi::arg_reader<QGraphicsItem * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsRectItem_Adaptor *)cls)->cbs_sceneEventFilter_3028_0 (arg1, arg2));
 }
 
@@ -1777,8 +1777,8 @@ static void _call_cbs_setExtension_4817_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  unsigned int arg1 = args.read<unsigned int > (heap);
-  const QVariant &arg2 = args.read<const QVariant & > (heap);
+  unsigned int arg1 = gsi::arg_reader<unsigned int >() (args, heap);
+  const QVariant &arg2 = gsi::arg_reader<const QVariant & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsRectItem_Adaptor *)cls)->cbs_setExtension_4817_0 (arg1, arg2);
 }
@@ -1821,7 +1821,7 @@ static void _call_cbs_supportsExtension_c2806_0 (const qt_gsi::GenericMethod * /
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  unsigned int arg1 = args.read<unsigned int > (heap);
+  unsigned int arg1 = gsi::arg_reader<unsigned int >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsRectItem_Adaptor *)cls)->cbs_supportsExtension_c2806_0 (arg1));
 }
 
@@ -1863,7 +1863,7 @@ static void _call_cbs_wheelEvent_3029_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneWheelEvent *arg1 = args.read<QGraphicsSceneWheelEvent * > (heap);
+  QGraphicsSceneWheelEvent *arg1 = gsi::arg_reader<QGraphicsSceneWheelEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsRectItem_Adaptor *)cls)->cbs_wheelEvent_3029_0 (arg1);
 }

src/gsiqt/qt4/QtGui/gsiDeclQGraphicsRotation.cc

@@ -548,7 +548,7 @@ static void _call_cbs_applyTo_c1556_0 (const qt_gsi::GenericMethod * /*decl*/, v
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMatrix4x4 *arg1 = args.read<QMatrix4x4 * > (heap);
+  QMatrix4x4 *arg1 = gsi::arg_reader<QMatrix4x4 * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsRotation_Adaptor *)cls)->cbs_applyTo_c1556_0 (arg1);
 }
@@ -586,7 +586,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsRotation_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -610,7 +610,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsRotation_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -652,7 +652,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsRotation_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -676,7 +676,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsRotation_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -701,8 +701,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsRotation_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -771,7 +771,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsRotation_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }

src/gsiqt/qt4/QtGui/gsiDeclQGraphicsScale.cc

@@ -543,7 +543,7 @@ static void _call_cbs_applyTo_c1556_0 (const qt_gsi::GenericMethod * /*decl*/, v
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QMatrix4x4 *arg1 = args.read<QMatrix4x4 * > (heap);
+  QMatrix4x4 *arg1 = gsi::arg_reader<QMatrix4x4 * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsScale_Adaptor *)cls)->cbs_applyTo_c1556_0 (arg1);
 }
@@ -567,7 +567,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsScale_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -591,7 +591,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsScale_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -633,7 +633,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsScale_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -657,7 +657,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsScale_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -682,8 +682,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsScale_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -766,7 +766,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsScale_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }

src/gsiqt/qt4/QtGui/gsiDeclQGraphicsScene.cc

@@ -2626,7 +2626,7 @@ static void _call_cbs_childEvent_1701_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QChildEvent *arg1 = args.read<QChildEvent * > (heap);
+  QChildEvent *arg1 = gsi::arg_reader<QChildEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsScene_Adaptor *)cls)->cbs_childEvent_1701_0 (arg1);
 }
@@ -2650,7 +2650,7 @@ static void _call_cbs_contextMenuEvent_3674_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneContextMenuEvent *arg1 = args.read<QGraphicsSceneContextMenuEvent * > (heap);
+  QGraphicsSceneContextMenuEvent *arg1 = gsi::arg_reader<QGraphicsSceneContextMenuEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsScene_Adaptor *)cls)->cbs_contextMenuEvent_3674_0 (arg1);
 }
@@ -2674,7 +2674,7 @@ static void _call_cbs_customEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsScene_Adaptor *)cls)->cbs_customEvent_1217_0 (arg1);
 }
@@ -2716,7 +2716,7 @@ static void _call_cbs_disconnectNotify_1731_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const char *arg1 = args.read<const char * > (heap);
+  const char *arg1 = gsi::arg_reader<const char * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsScene_Adaptor *)cls)->cbs_disconnectNotify_1731_0 (arg1);
 }
@@ -2740,7 +2740,7 @@ static void _call_cbs_dragEnterEvent_3315_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneDragDropEvent *arg1 = args.read<QGraphicsSceneDragDropEvent * > (heap);
+  QGraphicsSceneDragDropEvent *arg1 = gsi::arg_reader<QGraphicsSceneDragDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsScene_Adaptor *)cls)->cbs_dragEnterEvent_3315_0 (arg1);
 }
@@ -2764,7 +2764,7 @@ static void _call_cbs_dragLeaveEvent_3315_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneDragDropEvent *arg1 = args.read<QGraphicsSceneDragDropEvent * > (heap);
+  QGraphicsSceneDragDropEvent *arg1 = gsi::arg_reader<QGraphicsSceneDragDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsScene_Adaptor *)cls)->cbs_dragLeaveEvent_3315_0 (arg1);
 }
@@ -2788,7 +2788,7 @@ static void _call_cbs_dragMoveEvent_3315_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneDragDropEvent *arg1 = args.read<QGraphicsSceneDragDropEvent * > (heap);
+  QGraphicsSceneDragDropEvent *arg1 = gsi::arg_reader<QGraphicsSceneDragDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsScene_Adaptor *)cls)->cbs_dragMoveEvent_3315_0 (arg1);
 }
@@ -2814,8 +2814,8 @@ static void _call_cbs_drawBackground_3180_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QPainter *arg1 = args.read<QPainter * > (heap);
-  const QRectF &arg2 = args.read<const QRectF & > (heap);
+  QPainter *arg1 = gsi::arg_reader<QPainter * >() (args, heap);
+  const QRectF &arg2 = gsi::arg_reader<const QRectF & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsScene_Adaptor *)cls)->cbs_drawBackground_3180_0 (arg1, arg2);
 }
@@ -2841,8 +2841,8 @@ static void _call_cbs_drawForeground_3180_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QPainter *arg1 = args.read<QPainter * > (heap);
-  const QRectF &arg2 = args.read<const QRectF & > (heap);
+  QPainter *arg1 = gsi::arg_reader<QPainter * >() (args, heap);
+  const QRectF &arg2 = gsi::arg_reader<const QRectF & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsScene_Adaptor *)cls)->cbs_drawForeground_3180_0 (arg1, arg2);
 }
@@ -2866,7 +2866,7 @@ static void _call_cbs_dropEvent_3315_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneDragDropEvent *arg1 = args.read<QGraphicsSceneDragDropEvent * > (heap);
+  QGraphicsSceneDragDropEvent *arg1 = gsi::arg_reader<QGraphicsSceneDragDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsScene_Adaptor *)cls)->cbs_dropEvent_3315_0 (arg1);
 }
@@ -2890,7 +2890,7 @@ static void _call_cbs_event_1217_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsScene_Adaptor *)cls)->cbs_event_1217_0 (arg1));
 }
 
@@ -2915,8 +2915,8 @@ static void _call_cbs_eventFilter_2411_0 (const qt_gsi::GenericMethod * /*decl*/
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QObject *arg1 = args.read<QObject * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QObject *arg1 = gsi::arg_reader<QObject * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsScene_Adaptor *)cls)->cbs_eventFilter_2411_0 (arg1, arg2));
 }
 
@@ -2939,7 +2939,7 @@ static void _call_cbs_focusInEvent_1729_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsScene_Adaptor *)cls)->cbs_focusInEvent_1729_0 (arg1);
 }
@@ -2981,7 +2981,7 @@ static void _call_cbs_focusOutEvent_1729_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsScene_Adaptor *)cls)->cbs_focusOutEvent_1729_0 (arg1);
 }
@@ -3005,7 +3005,7 @@ static void _call_cbs_helpEvent_2921_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneHelpEvent *arg1 = args.read<QGraphicsSceneHelpEvent * > (heap);
+  QGraphicsSceneHelpEvent *arg1 = gsi::arg_reader<QGraphicsSceneHelpEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsScene_Adaptor *)cls)->cbs_helpEvent_2921_0 (arg1);
 }
@@ -3029,7 +3029,7 @@ static void _call_cbs_inputMethodEvent_2354_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QInputMethodEvent *arg1 = args.read<QInputMethodEvent * > (heap);
+  QInputMethodEvent *arg1 = gsi::arg_reader<QInputMethodEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsScene_Adaptor *)cls)->cbs_inputMethodEvent_2354_0 (arg1);
 }
@@ -3053,7 +3053,7 @@ static void _call_cbs_inputMethodQuery_c2420_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = args.read<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & > (heap);
+  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & >() (args, heap);
   ret.write<QVariant > ((QVariant)((QGraphicsScene_Adaptor *)cls)->cbs_inputMethodQuery_c2420_0 (arg1));
 }
 
@@ -3076,7 +3076,7 @@ static void _call_cbs_keyPressEvent_1514_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsScene_Adaptor *)cls)->cbs_keyPressEvent_1514_0 (arg1);
 }
@@ -3100,7 +3100,7 @@ static void _call_cbs_keyReleaseEvent_1514_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsScene_Adaptor *)cls)->cbs_keyReleaseEvent_1514_0 (arg1);
 }
@@ -3124,7 +3124,7 @@ static void _call_cbs_mouseDoubleClickEvent_3049_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneMouseEvent *arg1 = args.read<QGraphicsSceneMouseEvent * > (heap);
+  QGraphicsSceneMouseEvent *arg1 = gsi::arg_reader<QGraphicsSceneMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsScene_Adaptor *)cls)->cbs_mouseDoubleClickEvent_3049_0 (arg1);
 }
@@ -3148,7 +3148,7 @@ static void _call_cbs_mouseMoveEvent_3049_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneMouseEvent *arg1 = args.read<QGraphicsSceneMouseEvent * > (heap);
+  QGraphicsSceneMouseEvent *arg1 = gsi::arg_reader<QGraphicsSceneMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsScene_Adaptor *)cls)->cbs_mouseMoveEvent_3049_0 (arg1);
 }
@@ -3172,7 +3172,7 @@ static void _call_cbs_mousePressEvent_3049_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneMouseEvent *arg1 = args.read<QGraphicsSceneMouseEvent * > (heap);
+  QGraphicsSceneMouseEvent *arg1 = gsi::arg_reader<QGraphicsSceneMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsScene_Adaptor *)cls)->cbs_mousePressEvent_3049_0 (arg1);
 }
@@ -3196,7 +3196,7 @@ static void _call_cbs_mouseReleaseEvent_3049_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneMouseEvent *arg1 = args.read<QGraphicsSceneMouseEvent * > (heap);
+  QGraphicsSceneMouseEvent *arg1 = gsi::arg_reader<QGraphicsSceneMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsScene_Adaptor *)cls)->cbs_mouseReleaseEvent_3049_0 (arg1);
 }
@@ -3284,7 +3284,7 @@ static void _call_cbs_timerEvent_1730_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QTimerEvent *arg1 = args.read<QTimerEvent * > (heap);
+  QTimerEvent *arg1 = gsi::arg_reader<QTimerEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsScene_Adaptor *)cls)->cbs_timerEvent_1730_0 (arg1);
 }
@@ -3308,7 +3308,7 @@ static void _call_cbs_wheelEvent_3029_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneWheelEvent *arg1 = args.read<QGraphicsSceneWheelEvent * > (heap);
+  QGraphicsSceneWheelEvent *arg1 = gsi::arg_reader<QGraphicsSceneWheelEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsScene_Adaptor *)cls)->cbs_wheelEvent_3029_0 (arg1);
 }

src/gsiqt/qt4/QtGui/gsiDeclQGraphicsSimpleTextItem.cc

@@ -983,7 +983,7 @@ static void _call_cbs_advance_767_0 (const qt_gsi::GenericMethod * /*decl*/, voi
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  int arg1 = args.read<int > (heap);
+  int arg1 = gsi::arg_reader<int >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsSimpleTextItem_Adaptor *)cls)->cbs_advance_767_0 (arg1);
 }
@@ -1028,8 +1028,8 @@ static void _call_cbs_collidesWithItem_c4977_1 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QGraphicsItem *arg1 = args.read<const QGraphicsItem * > (heap);
-  const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & arg2 = args.read<const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & > (heap);
+  const QGraphicsItem *arg1 = gsi::arg_reader<const QGraphicsItem * >() (args, heap);
+  const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & arg2 = args ? gsi::arg_reader<const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & >() (args, heap) : gsi::arg_maker<const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & >() (qt_gsi::CppToQtReadAdaptor<Qt::ItemSelectionMode>(heap, Qt::IntersectsItemShape), heap);
   ret.write<bool > ((bool)((QGraphicsSimpleTextItem_Adaptor *)cls)->cbs_collidesWithItem_c4977_1 (arg1, arg2));
 }
 
@@ -1054,8 +1054,8 @@ static void _call_cbs_collidesWithPath_c4877_1 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QPainterPath &arg1 = args.read<const QPainterPath & > (heap);
-  const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & arg2 = args.read<const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & > (heap);
+  const QPainterPath &arg1 = gsi::arg_reader<const QPainterPath & >() (args, heap);
+  const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & arg2 = args ? gsi::arg_reader<const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & >() (args, heap) : gsi::arg_maker<const qt_gsi::Converter<Qt::ItemSelectionMode>::target_type & >() (qt_gsi::CppToQtReadAdaptor<Qt::ItemSelectionMode>(heap, Qt::IntersectsItemShape), heap);
   ret.write<bool > ((bool)((QGraphicsSimpleTextItem_Adaptor *)cls)->cbs_collidesWithPath_c4877_1 (arg1, arg2));
 }
 
@@ -1078,7 +1078,7 @@ static void _call_cbs_contains_c1986_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QPointF &arg1 = args.read<const QPointF & > (heap);
+  const QPointF &arg1 = gsi::arg_reader<const QPointF & >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsSimpleTextItem_Adaptor *)cls)->cbs_contains_c1986_0 (arg1));
 }
 
@@ -1101,7 +1101,7 @@ static void _call_cbs_contextMenuEvent_3674_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneContextMenuEvent *arg1 = args.read<QGraphicsSceneContextMenuEvent * > (heap);
+  QGraphicsSceneContextMenuEvent *arg1 = gsi::arg_reader<QGraphicsSceneContextMenuEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsSimpleTextItem_Adaptor *)cls)->cbs_contextMenuEvent_3674_0 (arg1);
 }
@@ -1125,7 +1125,7 @@ static void _call_cbs_dragEnterEvent_3315_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneDragDropEvent *arg1 = args.read<QGraphicsSceneDragDropEvent * > (heap);
+  QGraphicsSceneDragDropEvent *arg1 = gsi::arg_reader<QGraphicsSceneDragDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsSimpleTextItem_Adaptor *)cls)->cbs_dragEnterEvent_3315_0 (arg1);
 }
@@ -1149,7 +1149,7 @@ static void _call_cbs_dragLeaveEvent_3315_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneDragDropEvent *arg1 = args.read<QGraphicsSceneDragDropEvent * > (heap);
+  QGraphicsSceneDragDropEvent *arg1 = gsi::arg_reader<QGraphicsSceneDragDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsSimpleTextItem_Adaptor *)cls)->cbs_dragLeaveEvent_3315_0 (arg1);
 }
@@ -1173,7 +1173,7 @@ static void _call_cbs_dragMoveEvent_3315_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneDragDropEvent *arg1 = args.read<QGraphicsSceneDragDropEvent * > (heap);
+  QGraphicsSceneDragDropEvent *arg1 = gsi::arg_reader<QGraphicsSceneDragDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsSimpleTextItem_Adaptor *)cls)->cbs_dragMoveEvent_3315_0 (arg1);
 }
@@ -1197,7 +1197,7 @@ static void _call_cbs_dropEvent_3315_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneDragDropEvent *arg1 = args.read<QGraphicsSceneDragDropEvent * > (heap);
+  QGraphicsSceneDragDropEvent *arg1 = gsi::arg_reader<QGraphicsSceneDragDropEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsSimpleTextItem_Adaptor *)cls)->cbs_dropEvent_3315_0 (arg1);
 }
@@ -1221,7 +1221,7 @@ static void _call_cbs_extension_c2119_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QVariant &arg1 = args.read<const QVariant & > (heap);
+  const QVariant &arg1 = gsi::arg_reader<const QVariant & >() (args, heap);
   ret.write<QVariant > ((QVariant)((QGraphicsSimpleTextItem_Adaptor *)cls)->cbs_extension_c2119_0 (arg1));
 }
 
@@ -1244,7 +1244,7 @@ static void _call_cbs_focusInEvent_1729_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsSimpleTextItem_Adaptor *)cls)->cbs_focusInEvent_1729_0 (arg1);
 }
@@ -1268,7 +1268,7 @@ static void _call_cbs_focusOutEvent_1729_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QFocusEvent *arg1 = args.read<QFocusEvent * > (heap);
+  QFocusEvent *arg1 = gsi::arg_reader<QFocusEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsSimpleTextItem_Adaptor *)cls)->cbs_focusOutEvent_1729_0 (arg1);
 }
@@ -1292,7 +1292,7 @@ static void _call_cbs_hoverEnterEvent_3044_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneHoverEvent *arg1 = args.read<QGraphicsSceneHoverEvent * > (heap);
+  QGraphicsSceneHoverEvent *arg1 = gsi::arg_reader<QGraphicsSceneHoverEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsSimpleTextItem_Adaptor *)cls)->cbs_hoverEnterEvent_3044_0 (arg1);
 }
@@ -1316,7 +1316,7 @@ static void _call_cbs_hoverLeaveEvent_3044_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneHoverEvent *arg1 = args.read<QGraphicsSceneHoverEvent * > (heap);
+  QGraphicsSceneHoverEvent *arg1 = gsi::arg_reader<QGraphicsSceneHoverEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsSimpleTextItem_Adaptor *)cls)->cbs_hoverLeaveEvent_3044_0 (arg1);
 }
@@ -1340,7 +1340,7 @@ static void _call_cbs_hoverMoveEvent_3044_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneHoverEvent *arg1 = args.read<QGraphicsSceneHoverEvent * > (heap);
+  QGraphicsSceneHoverEvent *arg1 = gsi::arg_reader<QGraphicsSceneHoverEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsSimpleTextItem_Adaptor *)cls)->cbs_hoverMoveEvent_3044_0 (arg1);
 }
@@ -1364,7 +1364,7 @@ static void _call_cbs_inputMethodEvent_2354_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QInputMethodEvent *arg1 = args.read<QInputMethodEvent * > (heap);
+  QInputMethodEvent *arg1 = gsi::arg_reader<QInputMethodEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsSimpleTextItem_Adaptor *)cls)->cbs_inputMethodEvent_2354_0 (arg1);
 }
@@ -1388,7 +1388,7 @@ static void _call_cbs_inputMethodQuery_c2420_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = args.read<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & > (heap);
+  const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<Qt::InputMethodQuery>::target_type & >() (args, heap);
   ret.write<QVariant > ((QVariant)((QGraphicsSimpleTextItem_Adaptor *)cls)->cbs_inputMethodQuery_c2420_0 (arg1));
 }
 
@@ -1411,7 +1411,7 @@ static void _call_cbs_isObscuredBy_c2614_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const QGraphicsItem *arg1 = args.read<const QGraphicsItem * > (heap);
+  const QGraphicsItem *arg1 = gsi::arg_reader<const QGraphicsItem * >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsSimpleTextItem_Adaptor *)cls)->cbs_isObscuredBy_c2614_0 (arg1));
 }
 
@@ -1436,8 +1436,8 @@ static void _call_cbs_itemChange_5658_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  const qt_gsi::Converter<QGraphicsItem::GraphicsItemChange>::target_type & arg1 = args.read<const qt_gsi::Converter<QGraphicsItem::GraphicsItemChange>::target_type & > (heap);
-  const QVariant &arg2 = args.read<const QVariant & > (heap);
+  const qt_gsi::Converter<QGraphicsItem::GraphicsItemChange>::target_type & arg1 = gsi::arg_reader<const qt_gsi::Converter<QGraphicsItem::GraphicsItemChange>::target_type & >() (args, heap);
+  const QVariant &arg2 = gsi::arg_reader<const QVariant & >() (args, heap);
   ret.write<QVariant > ((QVariant)((QGraphicsSimpleTextItem_Adaptor *)cls)->cbs_itemChange_5658_0 (arg1, arg2));
 }
 
@@ -1460,7 +1460,7 @@ static void _call_cbs_keyPressEvent_1514_0 (const qt_gsi::GenericMethod * /*decl
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsSimpleTextItem_Adaptor *)cls)->cbs_keyPressEvent_1514_0 (arg1);
 }
@@ -1484,7 +1484,7 @@ static void _call_cbs_keyReleaseEvent_1514_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QKeyEvent *arg1 = args.read<QKeyEvent * > (heap);
+  QKeyEvent *arg1 = gsi::arg_reader<QKeyEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsSimpleTextItem_Adaptor *)cls)->cbs_keyReleaseEvent_1514_0 (arg1);
 }
@@ -1508,7 +1508,7 @@ static void _call_cbs_mouseDoubleClickEvent_3049_0 (const qt_gsi::GenericMethod
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneMouseEvent *arg1 = args.read<QGraphicsSceneMouseEvent * > (heap);
+  QGraphicsSceneMouseEvent *arg1 = gsi::arg_reader<QGraphicsSceneMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsSimpleTextItem_Adaptor *)cls)->cbs_mouseDoubleClickEvent_3049_0 (arg1);
 }
@@ -1532,7 +1532,7 @@ static void _call_cbs_mouseMoveEvent_3049_0 (const qt_gsi::GenericMethod * /*dec
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneMouseEvent *arg1 = args.read<QGraphicsSceneMouseEvent * > (heap);
+  QGraphicsSceneMouseEvent *arg1 = gsi::arg_reader<QGraphicsSceneMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsSimpleTextItem_Adaptor *)cls)->cbs_mouseMoveEvent_3049_0 (arg1);
 }
@@ -1556,7 +1556,7 @@ static void _call_cbs_mousePressEvent_3049_0 (const qt_gsi::GenericMethod * /*de
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneMouseEvent *arg1 = args.read<QGraphicsSceneMouseEvent * > (heap);
+  QGraphicsSceneMouseEvent *arg1 = gsi::arg_reader<QGraphicsSceneMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsSimpleTextItem_Adaptor *)cls)->cbs_mousePressEvent_3049_0 (arg1);
 }
@@ -1580,7 +1580,7 @@ static void _call_cbs_mouseReleaseEvent_3049_0 (const qt_gsi::GenericMethod * /*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneMouseEvent *arg1 = args.read<QGraphicsSceneMouseEvent * > (heap);
+  QGraphicsSceneMouseEvent *arg1 = gsi::arg_reader<QGraphicsSceneMouseEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsSimpleTextItem_Adaptor *)cls)->cbs_mouseReleaseEvent_3049_0 (arg1);
 }
@@ -1627,9 +1627,9 @@ static void _call_cbs_paint_6301_0 (const qt_gsi::GenericMethod * /*decl*/, void
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QPainter *arg1 = args.read<QPainter * > (heap);
-  const QStyleOptionGraphicsItem *arg2 = args.read<const QStyleOptionGraphicsItem * > (heap);
-  QWidget *arg3 = args.read<QWidget * > (heap);
+  QPainter *arg1 = gsi::arg_reader<QPainter * >() (args, heap);
+  const QStyleOptionGraphicsItem *arg2 = gsi::arg_reader<const QStyleOptionGraphicsItem * >() (args, heap);
+  QWidget *arg3 = gsi::arg_reader<QWidget * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsSimpleTextItem_Adaptor *)cls)->cbs_paint_6301_0 (arg1, arg2, arg3);
 }
@@ -1683,7 +1683,7 @@ static void _call_cbs_sceneEvent_1217_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QEvent *arg1 = args.read<QEvent * > (heap);
+  QEvent *arg1 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsSimpleTextItem_Adaptor *)cls)->cbs_sceneEvent_1217_0 (arg1));
 }
 
@@ -1708,8 +1708,8 @@ static void _call_cbs_sceneEventFilter_3028_0 (const qt_gsi::GenericMethod * /*d
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsItem *arg1 = args.read<QGraphicsItem * > (heap);
-  QEvent *arg2 = args.read<QEvent * > (heap);
+  QGraphicsItem *arg1 = gsi::arg_reader<QGraphicsItem * >() (args, heap);
+  QEvent *arg2 = gsi::arg_reader<QEvent * >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsSimpleTextItem_Adaptor *)cls)->cbs_sceneEventFilter_3028_0 (arg1, arg2));
 }
 
@@ -1734,8 +1734,8 @@ static void _call_cbs_setExtension_4817_0 (const qt_gsi::GenericMethod * /*decl*
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  unsigned int arg1 = args.read<unsigned int > (heap);
-  const QVariant &arg2 = args.read<const QVariant & > (heap);
+  unsigned int arg1 = gsi::arg_reader<unsigned int >() (args, heap);
+  const QVariant &arg2 = gsi::arg_reader<const QVariant & >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsSimpleTextItem_Adaptor *)cls)->cbs_setExtension_4817_0 (arg1, arg2);
 }
@@ -1778,7 +1778,7 @@ static void _call_cbs_supportsExtension_c2806_0 (const qt_gsi::GenericMethod * /
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  unsigned int arg1 = args.read<unsigned int > (heap);
+  unsigned int arg1 = gsi::arg_reader<unsigned int >() (args, heap);
   ret.write<bool > ((bool)((QGraphicsSimpleTextItem_Adaptor *)cls)->cbs_supportsExtension_c2806_0 (arg1));
 }
 
@@ -1820,7 +1820,7 @@ static void _call_cbs_wheelEvent_3029_0 (const qt_gsi::GenericMethod * /*decl*/,
 {
   __SUPPRESS_UNUSED_WARNING(args);
   tl::Heap heap;
-  QGraphicsSceneWheelEvent *arg1 = args.read<QGraphicsSceneWheelEvent * > (heap);
+  QGraphicsSceneWheelEvent *arg1 = gsi::arg_reader<QGraphicsSceneWheelEvent * >() (args, heap);
   __SUPPRESS_UNUSED_WARNING(ret);
   ((QGraphicsSimpleTextItem_Adaptor *)cls)->cbs_wheelEvent_3029_0 (arg1);
 }