From 811e37c378ee12dca738e57c640385c9e0546355 Mon Sep 17 00:00:00 2001 From: Renato Araujo Oliveira Filho Date: Tue, 8 Feb 2011 11:57:59 -0300 Subject: 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 Hugo Parente Lima --- PySide/QtGui/CMakeLists.txt | 32 ++++----- PySide/QtGui/optional/QAbstractPageSetupDialog.xml | 1 + PySide/QtGui/optional/QAbstractPrintDialog.xml | 6 ++ PySide/QtGui/optional/QGtkStyle.xml | 11 +++ PySide/QtGui/optional/QPageSetupDialog.xml | 5 ++ PySide/QtGui/optional/QPrintDialog.xml | 3 + PySide/QtGui/optional/QPrintEngine.xml | 3 + PySide/QtGui/optional/QPrintPreviewDialog.xml | 1 + PySide/QtGui/optional/QPrintPreviewWidget.xml | 6 ++ PySide/QtGui/optional/QPrinter.xml | 30 +++++++++ PySide/QtGui/optional/QPrinterInfo.xml | 1 + PySide/QtGui/optional/QSessionManager.xml | 7 ++ PySide/QtGui/optional/QSizeGrip.xml | 2 + PySide/QtGui/optional/QSystemTrayIcon.xml | 10 +++ PySide/QtGui/typesystem_gui_common.xml | 78 ---------------------- PySide/QtNetwork/CMakeLists.txt | 18 +++-- PySide/QtNetwork/optional/QSslCertificate.xml | 1 + PySide/QtNetwork/optional/QSslCipher.xml | 1 + PySide/QtNetwork/optional/QSslConfiguration.xml | 1 + PySide/QtNetwork/optional/QSslError.xml | 4 ++ PySide/QtNetwork/optional/QSslKey.xml | 1 + PySide/QtNetwork/optional/QSslSocket.xml | 6 ++ PySide/QtNetwork/typesystem_network.xml | 18 ----- cmake/Macros/PySideModules.cmake | 26 ++++++-- 24 files changed, 149 insertions(+), 123 deletions(-) create mode 100644 PySide/QtGui/optional/QAbstractPageSetupDialog.xml create mode 100644 PySide/QtGui/optional/QAbstractPrintDialog.xml create mode 100644 PySide/QtGui/optional/QGtkStyle.xml create mode 100644 PySide/QtGui/optional/QPageSetupDialog.xml create mode 100644 PySide/QtGui/optional/QPrintDialog.xml create mode 100644 PySide/QtGui/optional/QPrintEngine.xml create mode 100644 PySide/QtGui/optional/QPrintPreviewDialog.xml create mode 100644 PySide/QtGui/optional/QPrintPreviewWidget.xml create mode 100644 PySide/QtGui/optional/QPrinter.xml create mode 100644 PySide/QtGui/optional/QPrinterInfo.xml create mode 100644 PySide/QtGui/optional/QSessionManager.xml create mode 100644 PySide/QtGui/optional/QSizeGrip.xml create mode 100644 PySide/QtGui/optional/QSystemTrayIcon.xml create mode 100644 PySide/QtNetwork/optional/QSslCertificate.xml create mode 100644 PySide/QtNetwork/optional/QSslCipher.xml create mode 100644 PySide/QtNetwork/optional/QSslConfiguration.xml create mode 100644 PySide/QtNetwork/optional/QSslError.xml create mode 100644 PySide/QtNetwork/optional/QSslKey.xml create mode 100644 PySide/QtNetwork/optional/QSslSocket.xml diff --git a/PySide/QtGui/CMakeLists.txt b/PySide/QtGui/CMakeLists.txt index 7178e60ba..4313606ec 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 000000000..902fb6eb1 --- /dev/null +++ b/PySide/QtGui/optional/QAbstractPageSetupDialog.xml @@ -0,0 +1 @@ + diff --git a/PySide/QtGui/optional/QAbstractPrintDialog.xml b/PySide/QtGui/optional/QAbstractPrintDialog.xml new file mode 100644 index 000000000..373cf3058 --- /dev/null +++ b/PySide/QtGui/optional/QAbstractPrintDialog.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/PySide/QtGui/optional/QGtkStyle.xml b/PySide/QtGui/optional/QGtkStyle.xml new file mode 100644 index 000000000..e75e06c91 --- /dev/null +++ b/PySide/QtGui/optional/QGtkStyle.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/PySide/QtGui/optional/QPageSetupDialog.xml b/PySide/QtGui/optional/QPageSetupDialog.xml new file mode 100644 index 000000000..66fe0645b --- /dev/null +++ b/PySide/QtGui/optional/QPageSetupDialog.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/PySide/QtGui/optional/QPrintDialog.xml b/PySide/QtGui/optional/QPrintDialog.xml new file mode 100644 index 000000000..7b62f484a --- /dev/null +++ b/PySide/QtGui/optional/QPrintDialog.xml @@ -0,0 +1,3 @@ + + + diff --git a/PySide/QtGui/optional/QPrintEngine.xml b/PySide/QtGui/optional/QPrintEngine.xml new file mode 100644 index 000000000..0f792fc5a --- /dev/null +++ b/PySide/QtGui/optional/QPrintEngine.xml @@ -0,0 +1,3 @@ + + + diff --git a/PySide/QtGui/optional/QPrintPreviewDialog.xml b/PySide/QtGui/optional/QPrintPreviewDialog.xml new file mode 100644 index 000000000..635f3906d --- /dev/null +++ b/PySide/QtGui/optional/QPrintPreviewDialog.xml @@ -0,0 +1 @@ + diff --git a/PySide/QtGui/optional/QPrintPreviewWidget.xml b/PySide/QtGui/optional/QPrintPreviewWidget.xml new file mode 100644 index 000000000..cf60a03a7 --- /dev/null +++ b/PySide/QtGui/optional/QPrintPreviewWidget.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/PySide/QtGui/optional/QPrinter.xml b/PySide/QtGui/optional/QPrinter.xml new file mode 100644 index 000000000..b57416c41 --- /dev/null +++ b/PySide/QtGui/optional/QPrinter.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PySide/QtGui/optional/QPrinterInfo.xml b/PySide/QtGui/optional/QPrinterInfo.xml new file mode 100644 index 000000000..479c4b454 --- /dev/null +++ b/PySide/QtGui/optional/QPrinterInfo.xml @@ -0,0 +1 @@ + diff --git a/PySide/QtGui/optional/QSessionManager.xml b/PySide/QtGui/optional/QSessionManager.xml new file mode 100644 index 000000000..b8be5e81b --- /dev/null +++ b/PySide/QtGui/optional/QSessionManager.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/PySide/QtGui/optional/QSizeGrip.xml b/PySide/QtGui/optional/QSizeGrip.xml new file mode 100644 index 000000000..a0792daa1 --- /dev/null +++ b/PySide/QtGui/optional/QSizeGrip.xml @@ -0,0 +1,2 @@ + + diff --git a/PySide/QtGui/optional/QSystemTrayIcon.xml b/PySide/QtGui/optional/QSystemTrayIcon.xml new file mode 100644 index 000000000..095fcf36c --- /dev/null +++ b/PySide/QtGui/optional/QSystemTrayIcon.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/PySide/QtGui/typesystem_gui_common.xml b/PySide/QtGui/typesystem_gui_common.xml index 7dea272e0..2af6f484a 100644 --- a/PySide/QtGui/typesystem_gui_common.xml +++ b/PySide/QtGui/typesystem_gui_common.xml @@ -162,8 +162,6 @@ - - @@ -1260,7 +1258,6 @@ - @@ -1476,11 +1473,6 @@ - - - - - @@ -1519,16 +1511,6 @@ - - - - - - - - - - @@ -2078,12 +2060,6 @@ - - - - - - @@ -2096,12 +2072,6 @@ - - - - - - @@ -2118,7 +2088,6 @@ - @@ -2262,15 +2231,6 @@ - - - - - - - - - @@ -3818,11 +3778,6 @@ - - - - - @@ -4668,32 +4623,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -5200,12 +5129,6 @@ - - - - - - @@ -6006,7 +5929,6 @@ - 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 @@ + 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 @@ + 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 @@ + 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 @@ + + + + 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 @@ + 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 @@ + + + + + + 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 @@ - @@ -256,28 +255,11 @@ - - - - - - - - - - - - - - - - - diff --git a/cmake/Macros/PySideModules.cmake b/cmake/Macros/PySideModules.cmake index 44ea8ea15..2f695317f 100644 --- a/cmake/Macros/PySideModules.cmake +++ b/cmake/Macros/PySideModules.cmake @@ -43,19 +43,37 @@ macro(create_pyside_module module_name module_include_dir module_libraries modul install(FILES ${typesystem_files} DESTINATION share/PySide${pyside_SUFFIX}/typesystems) endmacro() -#macro(check_qt_class_with_namespace module namespace class global_sources [namespace]) -macro(check_qt_class module class global_sources) - if (${ARGC} GREATER 3) +macro(append_class_xml commom_xml class_xml) + INCLUDE(FindPythonInterp) + set(REPLACE_PROGRAM "import string; \\ + commomFile = open('${commom_xml}', 'r'); \\ + commomData = commomFile.read(); \\ + commomFile.close(); \\ + objectFile = open('${class_xml}', 'r'); \\ + objectData = objectFile.read(); \\ + objectFile.close(); \\ + commomData = string.replace(commomData, '', '%s\\n' % objectData); \\ + commomFile = open('${commom_xml}', 'w'); \\ + commomFile.write(commomData); \\ + commomFile.close();") + execute_process( + COMMAND ${PYTHON_EXECUTABLE} -c "${REPLACE_PROGRAM}") +endmacro() + +#macro(check_qt_class_with_namespace module namespace class global_sources commom_xml class_xml [namespace] [module]) +macro(check_qt_class module class global_sources commom_xml) + if (${ARGC} GREATER 4) set (namespace ${ARGV3}) string(TOLOWER ${namespace} _namespace) else () set (namespace "") endif () - if (${ARGC} GREATER 4) + if (${ARGC} GREATER 5) set (include_file ${ARGV4}) else () set (include_file ${module}) endif () + append_class_xml(${commom_xml} "${CMAKE_CURRENT_SOURCE_DIR}/optional/${class}.xml") string(TOLOWER ${class} _class) string(TOUPPER ${module} _module) if (${namespace}) -- cgit v1.2.3