From 81e7fd946f172df3e567a6caef463b559505b106 Mon Sep 17 00:00:00 2001
From: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Date: Thu, 29 Nov 2018 10:29:34 +0100
Subject: Move old glue code to snippets files

Most of the old glue code was directly injected into
the typesystem, so it was possible to add them
as snippets.

There are still a couple of header files that will remain
there, because the include tag does not have the file/snippet
tags.

A few lines of code were modified in favor of "modern" C++,
and good practices.

Task-number: PYSIDE-834
Change-Id: I3072298b16d7280550c6a7f6abae045250663ba6
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
---
 .../PySide2/QtWidgets/typesystem_widgets_common.xml    | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml')

diff --git a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml
index d22d694cc..13cc6f7cf 100644
--- a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml
+++ b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml
@@ -800,7 +800,7 @@
     </modify-function>
   </object-type>
   <object-type name="QMenu">
-    <inject-code class="native" position="beginning" file="glue/qmenu_glue.cpp"/>
+    <inject-code class="native" position="beginning" file="../glue/qtwidgets.cpp" snippet="qmenu-glue"/>
 
     <modify-function signature="exec()" rename="exec_" allow-thread="yes"/>
     <modify-function signature="exec(const QPoint&amp;,QAction*)" rename="exec_" allow-thread="yes"/>
@@ -882,7 +882,7 @@
   </object-type>
 
   <object-type name="QMenuBar">
-    <inject-code class="native" position="beginning" file="glue/qmenubar_glue.cpp"/>
+    <inject-code class="native" position="beginning" file="../glue/qtwidgets.cpp" snippet="qmenubar-glue"/>
     <modify-function signature="addAction(const QString&amp;)">
       <modify-argument index="return">
         <parent index="this" action="add"/>
@@ -1247,7 +1247,7 @@
   </object-type>
 
   <object-type name="QLayout">
-    <inject-code class="native" position="beginning" file="glue/qlayout_help_functions.cpp"/>
+    <inject-code class="native" position="beginning" file="../glue/qtwidgets.cpp" snippet="qlayout-help-functions"/>
 
     <enum-type name="SizeConstraint"/>
 
@@ -1332,7 +1332,7 @@
   </object-type>
 
   <object-type name="QStackedLayout">
-    <inject-code class="native" position="beginning" file="glue/qlayout_help_functions.cpp"/>
+    <inject-code class="native" position="beginning" file="../glue/qtwidgets.cpp" snippet="qlayout-help-functions"/>
     <enum-type name="StackingMode"/>
     <modify-function signature="insertWidget(int,QWidget*)">
       <inject-code class="target" position="beginning" file="../glue/qtwidgets.cpp" snippet="addownership-2"/>
@@ -1340,7 +1340,7 @@
   </object-type>
 
   <object-type name="QBoxLayout">
-    <inject-code class="native" position="beginning" file="glue/qlayout_help_functions.cpp"/>
+    <inject-code class="native" position="beginning" file="../glue/qtwidgets.cpp" snippet="qlayout-help-functions"/>
 
     <enum-type name="Direction"/>
 
@@ -1370,7 +1370,7 @@
   </object-type>
 
   <object-type name="QGridLayout">
-    <inject-code class="native" position="beginning" file="glue/qlayout_help_functions.cpp"/>
+    <inject-code class="native" position="beginning" file="../glue/qtwidgets.cpp" snippet="qlayout-help-functions"/>
     <modify-function signature="itemAtPosition (int,int)const">
       <modify-argument index="return">
         <define-ownership owner="default"/>
@@ -2028,7 +2028,7 @@
       <include file-name="QMessageBox" location="global"/>
     </extra-includes>
 
-    <inject-code class="native" file="glue/qwidget_glue.cpp" position="beginning"/>
+    <inject-code class="native" position="beginning" file="../glue/qtwidgets.cpp" snippet="qwidget-glue"/>
 
     <enum-type name="RenderFlag" flags="RenderFlags"/>
 
@@ -2947,7 +2947,7 @@
       <inject-code class="target" position="end" file="../glue/qtwidgets.cpp" snippet="qapplication-setStyle"/>
     </modify-function>
     <modify-function signature="exec()" rename="exec_" allow-thread="yes"/>
-    <inject-code class="native" file="glue/qapplication_init.cpp" position="beginning"/>
+    <inject-code class="native" position="beginning" file="../glue/qtwidgets.cpp" snippet="qapplication-init"/>
   </object-type>
 
   <object-type name="QCommandLinkButton"/>
@@ -2960,7 +2960,7 @@
     </modify-function>
   </object-type>
   <object-type name="QFormLayout">
-    <inject-code class="native" position="beginning" file="glue/qlayout_help_functions.cpp"/>
+    <inject-code class="native" position="beginning" file="../glue/qtwidgets.cpp" snippet="qlayout-help-functions"/>
 
     <enum-type name="FieldGrowthPolicy"/>
     <enum-type name="ItemRole"/>
-- 
cgit v1.2.3