Separated class typesystem from the main typesystem.

Remove class specification,  detected during the compilation from the
main typesystem to avoid errors during the generation.

Fixes bug #661

Reviewer: Marcelo Lira <marcelo.lira@openbossa.org>
          Hugo Parente Lima <hugo.pl@gmail.com>

15 files changed, 102 insertions, 94 deletions

diff --git a/PySide/QtGui/CMakeLists.txt b/PySide/QtGui/CMakeLists.txt
index 7178e60..4313606 100644
--- a/PySide/QtGui/CMakeLists.txt
+++ b/PySide/QtGui/CMakeLists.txt
@@ -381,24 +381,24 @@ ${SPECIFIC_OS_FILES}
 ${QtGui_46_SRC}
 )
 
-
+set(TARGET_TYPESYSTEM "${CMAKE_CURRENT_BINARY_DIR}/typesystem_gui.xml")
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/typesystem_gui.xml.in"
-               "${CMAKE_CURRENT_BINARY_DIR}/typesystem_gui.xml" @ONLY)
+               "${TARGET_TYPESYSTEM}" @ONLY)
 
-check_qt_class(QtGui QGtkStyle QtGui_SRC)
-check_qt_class(QtGui QSessionManager QtGui_SRC)
-check_qt_class(QtGui QSizeGrip QtGui_SRC)
-check_qt_class(QtGui QSystemTrayIcon QtGui_SRC)
+check_qt_class(QtGui QGtkStyle QtGui_SRC ${TARGET_TYPESYSTEM})
+check_qt_class(QtGui QSessionManager QtGui_SRC ${TARGET_TYPESYSTEM})
+check_qt_class(QtGui QSizeGrip QtGui_SRC ${TARGET_TYPESYSTEM})
+check_qt_class(QtGui QSystemTrayIcon QtGui_SRC ${TARGET_TYPESYSTEM})
 
-check_qt_class(QtGui QAbstractPageSetupDialog QtGui_SRC)
-check_qt_class(QtGui QAbstractPrintDialog QtGui_SRC)
-check_qt_class(QtGui QPageSetupDialog QtGui_SRC)
-check_qt_class(QtGui QPrintDialog QtGui_SRC)
-check_qt_class(QtGui QPrintPreviewWidget QtGui_SRC)
-check_qt_class(QtGui QPrintPreviewDialog QtGui_SRC)
-check_qt_class(QtGui QPrinter QtGui_SRC)
-check_qt_class(QtGui QPrinterInfo QtGui_SRC)
-check_qt_class(QtGui QPrintEngine QtGui_SRC)
+check_qt_class(QtGui QAbstractPageSetupDialog QtGui_SRC ${TARGET_TYPESYSTEM})
+check_qt_class(QtGui QAbstractPrintDialog QtGui_SRC ${TARGET_TYPESYSTEM})
+check_qt_class(QtGui QPageSetupDialog QtGui_SRC ${TARGET_TYPESYSTEM})
+check_qt_class(QtGui QPrintDialog QtGui_SRC ${TARGET_TYPESYSTEM})
+check_qt_class(QtGui QPrintPreviewWidget QtGui_SRC ${TARGET_TYPESYSTEM})
+check_qt_class(QtGui QPrintPreviewDialog QtGui_SRC ${TARGET_TYPESYSTEM})
+check_qt_class(QtGui QPrinter QtGui_SRC ${TARGET_TYPESYSTEM})
+check_qt_class(QtGui QPrinterInfo QtGui_SRC ${TARGET_TYPESYSTEM})
+check_qt_class(QtGui QPrintEngine QtGui_SRC ${TARGET_TYPESYSTEM})
 
 set(QtGui_typesystem_path "${QtCore_SOURCE_DIR}${PATH_SEP}${QtGui_SOURCE_DIR}")
 set(QtGui_include_dirs  ${CMAKE_CURRENT_SOURCE_DIR}
@@ -421,7 +421,7 @@ create_pyside_module(QtGui
                      QtGui_deps
                      QtGui_typesystem_path
                      QtGui_SRC
-                     "${CMAKE_CURRENT_BINARY_DIR}/typesystem_gui.xml"
+                     ${TARGET_TYPESYSTEM}
                      QPYTEXTOBJECT_MOC)
 
 
diff --git a/PySide/QtGui/optional/QAbstractPageSetupDialog.xml b/PySide/QtGui/optional/QAbstractPageSetupDialog.xml
new file mode 100644
index 0000000..902fb6e
--- /dev/null
+++ b/PySide/QtGui/optional/QAbstractPageSetupDialog.xml
@@ -0,0 +1 @@
+<object-type name="QAbstractPageSetupDialog"/>
diff --git a/PySide/QtGui/optional/QAbstractPrintDialog.xml b/PySide/QtGui/optional/QAbstractPrintDialog.xml
new file mode 100644
index 0000000..373cf30
--- /dev/null
+++ b/PySide/QtGui/optional/QAbstractPrintDialog.xml
@@ -0,0 +1,6 @@
+<object-type name="QAbstractPrintDialog">
+      <enum-type name="PrintDialogOption" flags="QAbstractPrintDialog::PrintDialogOptions"/>
+      <enum-type name="PrintRange"/>
+      <modify-function signature="exec()" rename="exec_" allow-thread="yes" />
+</object-type>
+
diff --git a/PySide/QtGui/optional/QGtkStyle.xml b/PySide/QtGui/optional/QGtkStyle.xml
new file mode 100644
index 0000000..e75e06c
--- /dev/null
+++ b/PySide/QtGui/optional/QGtkStyle.xml
@@ -0,0 +1,11 @@
+<object-type name="QGtkStyle">
+    <modify-function signature="standardPixmap(QStyle::StandardPixmap,const QStyleOption*,const QWidget*)const">
+      <modify-argument index="2">
+        <replace-default-expression with="0"/>
+      </modify-argument>
+      <modify-argument index="3">
+        <replace-default-expression with="0"/>
+      </modify-argument>
+    </modify-function>
+</object-type>
+
diff --git a/PySide/QtGui/optional/QPageSetupDialog.xml b/PySide/QtGui/optional/QPageSetupDialog.xml
new file mode 100644
index 0000000..66fe064
--- /dev/null
+++ b/PySide/QtGui/optional/QPageSetupDialog.xml
@@ -0,0 +1,5 @@
+<object-type name="QPageSetupDialog">
+    <enum-type name="PageSetupDialogOption" flags="QPageSetupDialog::PageSetupDialogOptions"/>
+    <modify-function signature="exec()" rename="exec_" allow-thread="yes"/>
+</object-type>
+
diff --git a/PySide/QtGui/optional/QPrintDialog.xml b/PySide/QtGui/optional/QPrintDialog.xml
new file mode 100644
index 0000000..7b62f48
--- /dev/null
+++ b/PySide/QtGui/optional/QPrintDialog.xml
@@ -0,0 +1,3 @@
+<object-type name="QPrintDialog">
+    <modify-function signature="exec()" rename="exec_" allow-thread="yes" />
+</object-type>
diff --git a/PySide/QtGui/optional/QPrintEngine.xml b/PySide/QtGui/optional/QPrintEngine.xml
new file mode 100644
index 0000000..0f792fc
--- /dev/null
+++ b/PySide/QtGui/optional/QPrintEngine.xml
@@ -0,0 +1,3 @@
+<object-type name="QPrintEngine">
+  <enum-type name="PrintEnginePropertyKey" />
+</object-type>
diff --git a/PySide/QtGui/optional/QPrintPreviewDialog.xml b/PySide/QtGui/optional/QPrintPreviewDialog.xml
new file mode 100644
index 0000000..635f390
--- /dev/null
+++ b/PySide/QtGui/optional/QPrintPreviewDialog.xml
@@ -0,0 +1 @@
+<object-type name="QPrintPreviewDialog"/>
diff --git a/PySide/QtGui/optional/QPrintPreviewWidget.xml b/PySide/QtGui/optional/QPrintPreviewWidget.xml
new file mode 100644
index 0000000..cf60a03
--- /dev/null
+++ b/PySide/QtGui/optional/QPrintPreviewWidget.xml
@@ -0,0 +1,6 @@
+<object-type name="QPrintPreviewWidget">
+    <enum-type name="ViewMode"/>
+    <enum-type name="ZoomMode"/>
+    <modify-function signature="print()" rename="print_" />
+</object-type>
+
diff --git a/PySide/QtGui/optional/QPrinter.xml b/PySide/QtGui/optional/QPrinter.xml
new file mode 100644
index 0000000..b57416c
--- /dev/null
+++ b/PySide/QtGui/optional/QPrinter.xml
@@ -0,0 +1,30 @@
+<rejection class="QPrinter" function-name="printerSelectionOption"/>
+<rejection class="QPrinter" function-name="setPrinterSelectionOption"/>
+
+<object-type name="QPrinter" >
+    <enum-type name="ColorMode"/>
+    <enum-type name="DuplexMode"/>
+    <enum-type name="Orientation"/>
+    <enum-type name="OutputFormat"/>
+    <enum-type name="PageOrder"/>
+    <enum-type name="PageSize" />
+    <enum-type name="PaperSource"/>
+    <enum-type name="PrintRange"/>
+    <enum-type name="PrinterMode"/>
+    <enum-type name="PrinterState"/>
+    <enum-type name="Unit"/>
+    <!-- TODO: What to do with this function? -->
+    <modify-function signature="getPageMargins(qreal*,qreal*,qreal*,qreal*,QPrinter::Unit)const" remove="all" />
+    <modify-function signature="setEngines(QPrintEngine*,QPaintEngine*)">
+      <modify-argument index="1">
+        <parent index="this" action="add"/>
+      </modify-argument>
+      <modify-argument index="2">
+        <parent index="this" action="add"/>
+      </modify-argument>
+    </modify-function>
+    <extra-includes>
+      <include file-name="QPrinterInfo" location="global"/>
+    </extra-includes>
+</object-type>
+
diff --git a/PySide/QtGui/optional/QPrinterInfo.xml b/PySide/QtGui/optional/QPrinterInfo.xml
new file mode 100644
index 0000000..479c4b4
--- /dev/null
+++ b/PySide/QtGui/optional/QPrinterInfo.xml
@@ -0,0 +1 @@
+<value-type name="QPrinterInfo" />
diff --git a/PySide/QtGui/optional/QSessionManager.xml b/PySide/QtGui/optional/QSessionManager.xml
new file mode 100644
index 0000000..b8be5e8
--- /dev/null
+++ b/PySide/QtGui/optional/QSessionManager.xml
@@ -0,0 +1,7 @@
+<object-type name="QSessionManager">
+    <extra-includes>
+    </extra-includes>
+    <enum-type name="RestartHint"/>
+    <modify-function signature="handle()const" remove="all"/>
+</object-type>
+
diff --git a/PySide/QtGui/optional/QSizeGrip.xml b/PySide/QtGui/optional/QSizeGrip.xml
new file mode 100644
index 0000000..a0792da
--- /dev/null
+++ b/PySide/QtGui/optional/QSizeGrip.xml
@@ -0,0 +1,2 @@
+<object-type name="QSizeGrip"/>
+
diff --git a/PySide/QtGui/optional/QSystemTrayIcon.xml b/PySide/QtGui/optional/QSystemTrayIcon.xml
new file mode 100644
index 0000000..095fcf3
--- /dev/null
+++ b/PySide/QtGui/optional/QSystemTrayIcon.xml
@@ -0,0 +1,10 @@
+<object-type name="QSystemTrayIcon">
+    <enum-type name="ActivationReason"/>
+    <enum-type name="MessageIcon"/>
+    <modify-function signature="setContextMenu(QMenu*)">
+      <modify-argument index="1">
+        <reference-count action="add"/>
+      </modify-argument>
+    </modify-function>
+</object-type>
+
diff --git a/PySide/QtGui/typesystem_gui_common.xml b/PySide/QtGui/typesystem_gui_common.xml
index 7dea272..2af6f48 100644
--- a/PySide/QtGui/typesystem_gui_common.xml
+++ b/PySide/QtGui/typesystem_gui_common.xml
@@ -162,8 +162,6 @@
   <rejection class="QPolygon" function-name="setPoint"/>
   <rejection class="QPolygon" function-name="points"/>
   <rejection class="QPolygon" function-name="point"/>
-  <rejection class="QPrinter" function-name="printerSelectionOption"/>
-  <rejection class="QPrinter" function-name="setPrinterSelectionOption"/>
   <rejection class="QWidget" function-name="create"/>
   <rejection class="QWidget" function-name="find"/>
   <rejection class="QWidget" function-name="handle"/>
@@ -1260,7 +1258,6 @@
       <enum-type name="Type"/>
   </value-type>
   <value-type name="QLinearGradient" polymorphic-id-expression="%1-&gt;type() == QGradient::LinearGradient" />
-  <value-type name="QPrinterInfo" />
   <object-type name="QLayoutItem">
 
     <modify-function signature="widget()">
@@ -1476,11 +1473,6 @@
     <!-- ### because the CursorAction enum is protected -->
     <modify-function signature="moveCursor(QAbstractItemView::CursorAction,QFlags&lt;Qt::KeyboardModifier&gt;)" remove="all"/>
   </object-type>
-  <object-type name="QAbstractPrintDialog">
-      <enum-type name="PrintDialogOption" flags="QAbstractPrintDialog::PrintDialogOptions"/>
-      <enum-type name="PrintRange"/>
-      <modify-function signature="exec()" rename="exec_" allow-thread="yes" />
-  </object-type>
   <object-type name="QAbstractSlider">
     <enum-type name="SliderAction"/>
     <enum-type name="SliderChange"/>
@@ -1519,16 +1511,6 @@
   <object-type name="QCDEStyle">
     <modify-function signature="standardIconImplementation(QStyle::StandardPixmap, const QStyleOption *, const QWidget *)const" virtual-slot="yes"/>
   </object-type>
-  <object-type name="QGtkStyle">
-    <modify-function signature="standardPixmap(QStyle::StandardPixmap,const QStyleOption*,const QWidget*)const">
-      <modify-argument index="2">
-        <replace-default-expression with="0"/>
-      </modify-argument>
-      <modify-argument index="3">
-        <replace-default-expression with="0"/>
-      </modify-argument>
-    </modify-function>
-  </object-type>
   <object-type name="QCheckBox"/>
   <object-type name="QCleanlooksStyle">
     <modify-function signature="standardPixmap(QStyle::StandardPixmap,const QStyleOption*,const QWidget*)const" remove="all"/>
@@ -2078,12 +2060,6 @@
     <modify-function signature="standardIconImplementation(QStyle::StandardPixmap, const QStyleOption *, const QWidget *)const" virtual-slot="yes"/>
     <modify-function signature="layoutSpacingImplementation(QSizePolicy::ControlType, QSizePolicy::ControlType, Qt::Orientation, const QStyleOption *, const QWidget *) const" virtual-slot="yes"/>
   </object-type>
-  <object-type name="QPrintDialog">
-      <modify-function signature="exec()" rename="exec_" allow-thread="yes" />
-  </object-type>
-  <object-type name="QPrintEngine">
-      <enum-type name="PrintEnginePropertyKey" />
-  </object-type>
   <object-type name="QProgressBar">
       <enum-type name="Direction"/>
   </object-type>
@@ -2096,12 +2072,6 @@
       </modify-argument>
     </modify-function>
   </object-type>
-  <object-type name="QSessionManager">
-    <extra-includes>
-    </extra-includes>
-    <enum-type name="RestartHint"/>
-    <modify-function signature="handle()const" remove="all"/>
-  </object-type>
 
   <object-type name="QShortcut">
     <add-function signature="QShortcut(const QKeySequence&amp;, QWidget*, PyCallable*, Qt::ShortcutContext)">
@@ -2118,7 +2088,6 @@
       </inject-code>
     </add-function>
   </object-type>
-  <object-type name="QSizeGrip"/>
   <object-type name="QSound"/>
   <object-type name="QSpacerItem"/>
   <object-type name="QStandardItem">
@@ -2262,15 +2231,6 @@
       </modify-argument>
     </modify-function>
   </object-type>
-  <object-type name="QSystemTrayIcon">
-    <enum-type name="ActivationReason"/>
-    <enum-type name="MessageIcon"/>
-    <modify-function signature="setContextMenu(QMenu*)">
-      <modify-argument index="1">
-        <reference-count action="add"/>
-      </modify-argument>
-    </modify-function>
-  </object-type>
   <object-type name="QTableView">
     <modify-function signature="setHorizontalHeader(QHeaderView*)">
       <modify-argument index="1">
@@ -3818,11 +3778,6 @@
       </modify-argument>
     </modify-function>
   </object-type>
-  <object-type name="QAbstractPageSetupDialog"/>
-  <object-type name="QPageSetupDialog">
-      <enum-type name="PageSetupDialogOption" flags="QPageSetupDialog::PageSetupDialogOptions"/>
-      <modify-function signature="exec()" rename="exec_" allow-thread="yes"/>
-  </object-type>
   <object-type name="QTabWidget">
     <enum-type name="TabPosition"/>
     <enum-type name="TabShape"/>
@@ -4668,32 +4623,6 @@
     </modify-function>
     <modify-function signature="print(QPrinter*) const" rename="print_"/>
   </object-type>
-  <object-type name="QPrinter" >
-    <enum-type name="ColorMode"/>
-    <enum-type name="DuplexMode"/>
-    <enum-type name="Orientation"/>
-    <enum-type name="OutputFormat"/>
-    <enum-type name="PageOrder"/>
-    <enum-type name="PageSize" />
-    <enum-type name="PaperSource"/>
-    <enum-type name="PrintRange"/>
-    <enum-type name="PrinterMode"/>
-    <enum-type name="PrinterState"/>
-    <enum-type name="Unit"/>
-    <!-- TODO: What to do with this function? -->
-    <modify-function signature="getPageMargins(qreal*,qreal*,qreal*,qreal*,QPrinter::Unit)const" remove="all" />
-    <modify-function signature="setEngines(QPrintEngine*,QPaintEngine*)">
-      <modify-argument index="1">
-        <parent index="this" action="add"/>
-      </modify-argument>
-      <modify-argument index="2">
-        <parent index="this" action="add"/>
-      </modify-argument>
-    </modify-function>
-    <extra-includes>
-      <include file-name="QPrinterInfo" location="global"/>
-    </extra-includes>
-  </object-type>
   <object-type name="QAction">
     <enum-type name="ActionEvent"/>
     <enum-type name="MenuRole"/>
@@ -5200,12 +5129,6 @@
     </modify-function>
     <modify-function signature="print(QPrinter*)const" rename="print_" />
   </object-type>
-  <object-type name="QPrintPreviewDialog"/>
-  <object-type name="QPrintPreviewWidget">
-      <enum-type name="ViewMode"/>
-      <enum-type name="ZoomMode"/>
-      <modify-function signature="print()" rename="print_" />
-  </object-type>
   <object-type name="QStyledItemDelegate">
     <modify-function signature="setItemEditorFactory(QItemEditorFactory*)">
       <modify-argument index="1">
@@ -6006,7 +5929,6 @@
   <suppress-warning text="unhandled enum value: ~FlagMask in QMessageBox::StandardButton"/>
   <suppress-warning text="unmatched enum ~FlagMask"/>
   <suppress-warning text="enum 'QMatrix4x4::enum_1' is specified in typesystem, but not declared"/>
-  <suppress-warning text="type 'QGtkStyle' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/>
   <suppress-warning text="class not found for setup inheritance 'QMimeSource'"/>
   <suppress-warning text="class 'QDropEvent' inherits from unknown base class 'QMimeSource'"/>