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>

8 files changed, 25 insertions, 25 deletions

diff --git a/PySide/QtNetwork/CMakeLists.txt b/PySide/QtNetwork/CMakeLists.txt
index b055f42ca..50f8103e8 100644
--- a/PySide/QtNetwork/CMakeLists.txt
+++ b/PySide/QtNetwork/CMakeLists.txt
@@ -46,12 +46,16 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtNetwork/qurlinfo_wrapper.cpp
 ${QtNetwork_47_SRC}
 )
 
-check_qt_class(QtNetwork QSslCertificate QtNetwork_SRC)
-check_qt_class(QtNetwork QSslCipher QtNetwork_SRC)
-check_qt_class(QtNetwork QSslConfiguration QtNetwork_SRC)
-check_qt_class(QtNetwork QSslError QtNetwork_SRC)
-check_qt_class(QtNetwork QSslKey QtNetwork_SRC)
-check_qt_class(QtNetwork QSslSocket QtNetwork_SRC)
+set(TARGET_TYPESYSTEM "${CMAKE_CURRENT_BINARY_DIR}/typesystem_network.xml")
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/typesystem_network.xml"
+               "${TARGET_TYPESYSTEM}" @ONLY)
+
+check_qt_class(QtNetwork QSslCertificate QtNetwork_SRC ${TARGET_TYPESYSTEM})
+check_qt_class(QtNetwork QSslCipher QtNetwork_SRC ${TARGET_TYPESYSTEM})
+check_qt_class(QtNetwork QSslConfiguration QtNetwork_SRC ${TARGET_TYPESYSTEM})
+check_qt_class(QtNetwork QSslError QtNetwork_SRC ${TARGET_TYPESYSTEM})
+check_qt_class(QtNetwork QSslKey QtNetwork_SRC ${TARGET_TYPESYSTEM})
+check_qt_class(QtNetwork QSslSocket QtNetwork_SRC ${TARGET_TYPESYSTEM})
 
 set(QtNetwork_typesystem_path "${QtCore_SOURCE_DIR}")
 set(QtNetwork_include_dirs  ${CMAKE_CURRENT_SOURCE_DIR}
@@ -75,4 +79,4 @@ create_pyside_module(QtNetwork
                      QtNetwork_deps
                      QtNetwork_typesystem_path
                      QtNetwork_SRC
-                     "")
+                     ${TARGET_TYPESYSTEM})
diff --git a/PySide/QtNetwork/optional/QSslCertificate.xml b/PySide/QtNetwork/optional/QSslCertificate.xml
new file mode 100644
index 000000000..7acf97c36
--- /dev/null
+++ b/PySide/QtNetwork/optional/QSslCertificate.xml
@@ -0,0 +1 @@
+<value-type name="QSslCertificate"/>
diff --git a/PySide/QtNetwork/optional/QSslCipher.xml b/PySide/QtNetwork/optional/QSslCipher.xml
new file mode 100644
index 000000000..15ff59a23
--- /dev/null
+++ b/PySide/QtNetwork/optional/QSslCipher.xml
@@ -0,0 +1 @@
+<value-type name="QSslCipher"/>
diff --git a/PySide/QtNetwork/optional/QSslConfiguration.xml b/PySide/QtNetwork/optional/QSslConfiguration.xml
new file mode 100644
index 000000000..31c5e83b7
--- /dev/null
+++ b/PySide/QtNetwork/optional/QSslConfiguration.xml
@@ -0,0 +1 @@
+<value-type name="QSslConfiguration"/>
diff --git a/PySide/QtNetwork/optional/QSslError.xml b/PySide/QtNetwork/optional/QSslError.xml
new file mode 100644
index 000000000..0e4cf3e54
--- /dev/null
+++ b/PySide/QtNetwork/optional/QSslError.xml
@@ -0,0 +1,4 @@
+<value-type name="QSslError">
+  <enum-type name="SslError"/>
+</value-type>
+
diff --git a/PySide/QtNetwork/optional/QSslKey.xml b/PySide/QtNetwork/optional/QSslKey.xml
new file mode 100644
index 000000000..88a6370d6
--- /dev/null
+++ b/PySide/QtNetwork/optional/QSslKey.xml
@@ -0,0 +1 @@
+<value-type name="QSslKey"/>
diff --git a/PySide/QtNetwork/optional/QSslSocket.xml b/PySide/QtNetwork/optional/QSslSocket.xml
new file mode 100644
index 000000000..415e68192
--- /dev/null
+++ b/PySide/QtNetwork/optional/QSslSocket.xml
@@ -0,0 +1,6 @@
+<object-type name="QSslSocket">
+    <enum-type name="SslMode"/>
+    <enum-type name="PeerVerifyMode"/>
+    <modify-function signature="connectToHostEncrypted(const QString&amp;, quint16, QFlags&lt;QIODevice::OpenModeFlag>)" allow-thread="yes" />
+    <modify-function signature="waitForEncrypted(int)" allow-thread="yes" />
+</object-type>
diff --git a/PySide/QtNetwork/typesystem_network.xml b/PySide/QtNetwork/typesystem_network.xml
index 1f01e99f3..8a677fd1f 100644
--- a/PySide/QtNetwork/typesystem_network.xml
+++ b/PySide/QtNetwork/typesystem_network.xml
@@ -34,7 +34,6 @@
 
     <rejection class="QIPv6Address" field-name="c"/>
 
-    <value-type name="QSslCertificate"/>
     <object-type name="QAbstractSocket">
         <enum-type name="NetworkLayerProtocol"/>
         <enum-type name="SocketError"/>
@@ -256,28 +255,11 @@
         <enum-type name="KnownHeaders"/>
     </value-type>
 
-
-    <value-type name="QSslCipher"/>
-    <value-type name="QSslError">
-        <enum-type name="SslError"/>
-    </value-type>
-    <value-type name="QSslKey"/>
-
     <!-- TODO QSslCertificate requires QMultiMap which isn't implemented yet
     <value-type name="QSslCertificate"/>
     -->
     <enum-type name="QSslCertificate::SubjectInfo"/>
 
-    <value-type name="QSslConfiguration"/>
-
-    <object-type name="QSslSocket">
-        <enum-type name="SslMode"/>
-        <enum-type name="PeerVerifyMode"/>
-        <modify-function signature="connectToHostEncrypted(const QString&amp;, quint16, QFlags&lt;QIODevice::OpenModeFlag>)" allow-thread="yes" />
-        <modify-function signature="waitForEncrypted(int)" allow-thread="yes" />
-    </object-type>
-
-
     <!-- Qt 4.7 -->
     <value-type name="QNetworkConfiguration" since="4.7">
         <enum-type name="BearerType" />