From 1b02382a556d011b333cda20adf2dd7191b5a548 2010-02-22 08:58:46 From: florianlink Date: 2010-02-22 08:58:46 Subject: [PATCH] updated to newly generated files git-svn-id: svn://svn.code.sf.net/p/pythonqt/code/trunk@134 ea8d5007-eb21-0410-b261-ccb3ea6e24a9 --- diff --git a/src/PythonQt.cpp b/src/PythonQt.cpp index 7151764..c6fdef4 100644 --- a/src/PythonQt.cpp +++ b/src/PythonQt.cpp @@ -56,6 +56,9 @@ PythonQt* PythonQt::_self = NULL; int PythonQt::_uniqueModuleCount = 0; +void PythonQt_init_QtGuiBuiltin(); +void PythonQt_init_QtCoreBuiltin(); + void PythonQt::init(int flags) { if (!_self) { @@ -72,23 +75,9 @@ void PythonQt::init(int flags) PythonQt::self()->addDecorators(new PythonQtStdDecorators()); - PythonQt::self()->registerCPPClass("Qt", "", "QtCore", PythonQtCreateObject); - PythonQt::self()->registerCPPClass("QBitArray", "", "QtCore", PythonQtCreateObject); - PythonQt::self()->registerCPPClass("QDate", "", "QtCore", PythonQtCreateObject); - PythonQt::self()->registerCPPClass("QTime", "", "QtCore", PythonQtCreateObject); - PythonQt::self()->registerCPPClass("QDateTime", "", "QtCore", PythonQtCreateObject); - PythonQt::self()->registerCPPClass("QUrl", "", "QtCore", PythonQtCreateObject); - PythonQt::self()->registerCPPClass("QLocale", "", "QtCore", PythonQtCreateObject); - PythonQt::self()->registerCPPClass("QRect", "", "QtCore", PythonQtCreateObject); - PythonQt::self()->registerCPPClass("QRectF", "", "QtCore", PythonQtCreateObject); - PythonQt::self()->registerCPPClass("QSize", "", "QtCore", PythonQtCreateObject); - PythonQt::self()->registerCPPClass("QSizeF", "", "QtCore", PythonQtCreateObject); - PythonQt::self()->registerCPPClass("QLine", "", "QtCore", PythonQtCreateObject); - PythonQt::self()->registerCPPClass("QLineF", "", "QtCore", PythonQtCreateObject); - PythonQt::self()->registerCPPClass("QPoint", "", "QtCore", PythonQtCreateObject); - PythonQt::self()->registerCPPClass("QPointF", "", "QtCore", PythonQtCreateObject); - PythonQt::self()->registerCPPClass("QRegExp", "", "QtCore", PythonQtCreateObject); - + PythonQt_init_QtCoreBuiltin(); + PythonQt_init_QtGuiBuiltin(); + PythonQtRegisterToolClassesTemplateConverter(QDate); PythonQtRegisterToolClassesTemplateConverter(QTime); PythonQtRegisterToolClassesTemplateConverter(QDateTime); @@ -104,24 +93,6 @@ void PythonQt::init(int flags) PythonQtRegisterToolClassesTemplateConverter(QPointF); PythonQtRegisterToolClassesTemplateConverter(QRegExp); - PythonQt::self()->registerCPPClass("QFont", "", "QtGui", PythonQtCreateObject); - PythonQt::self()->registerCPPClass("QPixmap", "", "QtGui", PythonQtCreateObject); - PythonQt::self()->registerCPPClass("QBrush", "", "QtGui", PythonQtCreateObject); - PythonQt::self()->registerCPPClass("QColor", "", "QtGui", PythonQtCreateObject); - PythonQt::self()->registerCPPClass("QPalette", "", "QtGui", PythonQtCreateObject); - PythonQt::self()->registerCPPClass("QIcon", "", "QtGui", PythonQtCreateObject); - PythonQt::self()->registerCPPClass("QImage", "", "QtGui", PythonQtCreateObject); - PythonQt::self()->registerCPPClass("QPolygon", "", "QtGui", PythonQtCreateObject); - PythonQt::self()->registerCPPClass("QRegion", "", "QtGui", PythonQtCreateObject); - PythonQt::self()->registerCPPClass("QBitmap", "", "QtGui", PythonQtCreateObject); - PythonQt::self()->registerCPPClass("QCursor", "", "QtGui", PythonQtCreateObject); - PythonQt::self()->registerCPPClass("QSizePolicy", "", "QtGui", PythonQtCreateObject); - PythonQt::self()->registerCPPClass("QKeySequence", "", "QtGui", PythonQtCreateObject); - PythonQt::self()->registerCPPClass("QPen", "", "QtGui", PythonQtCreateObject); - PythonQt::self()->registerCPPClass("QTextLength", "", "QtGui", PythonQtCreateObject); - PythonQt::self()->registerCPPClass("QTextFormat", "", "QtGui", PythonQtCreateObject); - PythonQt::self()->registerCPPClass("QMatrix", "", "QtGui", PythonQtCreateObject); - PythonQtRegisterToolClassesTemplateConverter(QFont); PythonQtRegisterToolClassesTemplateConverter(QPixmap); PythonQtRegisterToolClassesTemplateConverter(QBrush); diff --git a/src/PythonQtVariants.cpp b/src/PythonQtVariants.cpp deleted file mode 100644 index 455b7d3..0000000 --- a/src/PythonQtVariants.cpp +++ /dev/null @@ -1,43 +0,0 @@ -/* - * - * Copyright (C) 2006 MeVis Research GmbH All Rights Reserved. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * Further, this software is distributed without any warranty that it is - * free of the rightful claim of any third person regarding infringement - * or the like. Any license provided herein, whether implied or - * otherwise, applies only to this software file. Patent licenses, if - * any, provided herein do not apply to combinations of this program with - * other software, or any other product whatsoever. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * Contact information: MeVis Research GmbH, Universitaetsallee 29, - * 28359 Bremen, Germany or: - * - * http://www.mevis.de - * - */ - -//---------------------------------------------------------------------------------- -/*! -// \file PythonQtVariants.cpp -// \author Florian Link -// \author Last changed by $Author: florian $ -// \date 2006-08 -*/ -//---------------------------------------------------------------------------------- - -#include "PythonQtVariants.h" - diff --git a/src/PythonQtVariants.h b/src/PythonQtVariants.h index cb2e992..adc4c24 100644 --- a/src/PythonQtVariants.h +++ b/src/PythonQtVariants.h @@ -42,40 +42,37 @@ */ //---------------------------------------------------------------------------------- -#include "../generated_cpp/com_trolltech_qt_core/PythonQtWrapper_Qt.h" -#include "../generated_cpp/com_trolltech_qt_core/PythonQtWrapper_QBitArray.h" -#include "../generated_cpp/com_trolltech_qt_core/PythonQtWrapper_QDate.h" -#include "../generated_cpp/com_trolltech_qt_core/PythonQtWrapper_QTime.h" -#include "../generated_cpp/com_trolltech_qt_core/PythonQtWrapper_QDateTime.h" -#include "../generated_cpp/com_trolltech_qt_core/PythonQtWrapper_QUrl.h" -#include "../generated_cpp/com_trolltech_qt_core/PythonQtWrapper_QLocale.h" -#include "../generated_cpp/com_trolltech_qt_core/PythonQtWrapper_QRect.h" -#include "../generated_cpp/com_trolltech_qt_core/PythonQtWrapper_QRectF.h" -#include "../generated_cpp/com_trolltech_qt_core/PythonQtWrapper_QSize.h" -#include "../generated_cpp/com_trolltech_qt_core/PythonQtWrapper_QSizeF.h" -#include "../generated_cpp/com_trolltech_qt_core/PythonQtWrapper_QLine.h" -#include "../generated_cpp/com_trolltech_qt_core/PythonQtWrapper_QLineF.h" -#include "../generated_cpp/com_trolltech_qt_core/PythonQtWrapper_QPoint.h" -#include "../generated_cpp/com_trolltech_qt_core/PythonQtWrapper_QPointF.h" -#include "../generated_cpp/com_trolltech_qt_core/PythonQtWrapper_QRegExp.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include "../generated_cpp/com_trolltech_qt_gui/PythonQtWrapper_QFont.h" -#include "../generated_cpp/com_trolltech_qt_gui/PythonQtWrapper_QPixmap.h" -#include "../generated_cpp/com_trolltech_qt_gui/PythonQtWrapper_QBrush.h" -#include "../generated_cpp/com_trolltech_qt_gui/PythonQtWrapper_QColor.h" -#include "../generated_cpp/com_trolltech_qt_gui/PythonQtWrapper_QPalette.h" -#include "../generated_cpp/com_trolltech_qt_gui/PythonQtWrapper_QIcon.h" -#include "../generated_cpp/com_trolltech_qt_gui/PythonQtWrapper_QImage.h" -#include "../generated_cpp/com_trolltech_qt_gui/PythonQtWrapper_QPolygon.h" -#include "../generated_cpp/com_trolltech_qt_gui/PythonQtWrapper_QRegion.h" -#include "../generated_cpp/com_trolltech_qt_gui/PythonQtWrapper_QBitmap.h" -#include "../generated_cpp/com_trolltech_qt_gui/PythonQtWrapper_QCursor.h" -#include "../generated_cpp/com_trolltech_qt_gui/PythonQtWrapper_QSizePolicy.h" -#include "../generated_cpp/com_trolltech_qt_gui/PythonQtWrapper_QKeySequence.h" -#include "../generated_cpp/com_trolltech_qt_gui/PythonQtWrapper_QPen.h" -#include "../generated_cpp/com_trolltech_qt_gui/PythonQtWrapper_QTextLength.h" -#include "../generated_cpp/com_trolltech_qt_gui/PythonQtWrapper_QTextFormat.h" -#include "../generated_cpp/com_trolltech_qt_gui/PythonQtWrapper_QMatrix.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #endif diff --git a/src/src.pri b/src/src.pri index e4a7149..a19fe17 100644 --- a/src/src.pri +++ b/src/src.pri @@ -16,47 +16,11 @@ HEADERS += \ $$PWD/PythonQtInstanceWrapper.h \ $$PWD/PythonQtClassWrapper.h \ $$PWD/PythonQtCppWrapperFactory.h \ - $$PWD/PythonQtVariants.h \ $$PWD/PythonQtQFileImporter.h \ $$PWD/PythonQtQFileImporter.h \ + $$PWD/PythonQtVariants.h \ $$PWD/gui/PythonQtScriptingConsole.h \ - $$PWD/PythonQtSystem.h \ - \ - $$PWD/../generated_cpp/com_trolltech_qt_core/PythonQtWrapper_Qt.h \ - $$PWD/../generated_cpp/com_trolltech_qt_core/PythonQtWrapper_QBitArray.h \ - $$PWD/../generated_cpp/com_trolltech_qt_core/PythonQtWrapper_QDate.h \ - $$PWD/../generated_cpp/com_trolltech_qt_core/PythonQtWrapper_QTime.h \ - $$PWD/../generated_cpp/com_trolltech_qt_core/PythonQtWrapper_QDateTime.h \ - $$PWD/../generated_cpp/com_trolltech_qt_core/PythonQtWrapper_QUrl.h \ - $$PWD/../generated_cpp/com_trolltech_qt_core/PythonQtWrapper_QLocale.h \ - $$PWD/../generated_cpp/com_trolltech_qt_core/PythonQtWrapper_QRect.h \ - $$PWD/../generated_cpp/com_trolltech_qt_core/PythonQtWrapper_QRectF.h \ - $$PWD/../generated_cpp/com_trolltech_qt_core/PythonQtWrapper_QSize.h \ - $$PWD/../generated_cpp/com_trolltech_qt_core/PythonQtWrapper_QSizeF.h \ - $$PWD/../generated_cpp/com_trolltech_qt_core/PythonQtWrapper_QLine.h \ - $$PWD/../generated_cpp/com_trolltech_qt_core/PythonQtWrapper_QLineF.h \ - $$PWD/../generated_cpp/com_trolltech_qt_core/PythonQtWrapper_QPoint.h \ - $$PWD/../generated_cpp/com_trolltech_qt_core/PythonQtWrapper_QPointF.h \ - $$PWD/../generated_cpp/com_trolltech_qt_core/PythonQtWrapper_QRegExp.h \ - \ - $$PWD/../generated_cpp/com_trolltech_qt_gui/PythonQtWrapper_QFont.h \ - $$PWD/../generated_cpp/com_trolltech_qt_gui/PythonQtWrapper_QPixmap.h \ - $$PWD/../generated_cpp/com_trolltech_qt_gui/PythonQtWrapper_QBrush.h \ - $$PWD/../generated_cpp/com_trolltech_qt_gui/PythonQtWrapper_QColor.h \ - $$PWD/../generated_cpp/com_trolltech_qt_gui/PythonQtWrapper_QPalette.h \ - $$PWD/../generated_cpp/com_trolltech_qt_gui/PythonQtWrapper_QIcon.h \ - $$PWD/../generated_cpp/com_trolltech_qt_gui/PythonQtWrapper_QImage.h \ - $$PWD/../generated_cpp/com_trolltech_qt_gui/PythonQtWrapper_QPolygon.h \ - $$PWD/../generated_cpp/com_trolltech_qt_gui/PythonQtWrapper_QRegion.h \ - $$PWD/../generated_cpp/com_trolltech_qt_gui/PythonQtWrapper_QBitmap.h \ - $$PWD/../generated_cpp/com_trolltech_qt_gui/PythonQtWrapper_QCursor.h \ - $$PWD/../generated_cpp/com_trolltech_qt_gui/PythonQtWrapper_QSizePolicy.h \ - $$PWD/../generated_cpp/com_trolltech_qt_gui/PythonQtWrapper_QKeySequence.h \ - $$PWD/../generated_cpp/com_trolltech_qt_gui/PythonQtWrapper_QPen.h \ - $$PWD/../generated_cpp/com_trolltech_qt_gui/PythonQtWrapper_QTextLength.h \ - $$PWD/../generated_cpp/com_trolltech_qt_gui/PythonQtWrapper_QTextFormat.h \ - $$PWD/../generated_cpp/com_trolltech_qt_gui/PythonQtWrapper_QMatrix.h - + $$PWD/PythonQtSystem.h SOURCES += \ $$PWD/PythonQtStdDecorators.cpp \ @@ -70,44 +34,10 @@ SOURCES += \ $$PWD/PythonQtMethodInfo.cpp \ $$PWD/PythonQtConversion.cpp \ $$PWD/PythonQtSignalReceiver.cpp \ - $$PWD/PythonQtVariants.cpp \ $$PWD/PythonQtInstanceWrapper.cpp \ $$PWD/PythonQtQFileImporter.cpp \ $$PWD/PythonQtClassWrapper.cpp \ $$PWD/gui/PythonQtScriptingConsole.cpp \ - \ - $$PWD/../generated_cpp/com_trolltech_qt_core/PythonQtWrapper_Qt.cpp \ - $$PWD/../generated_cpp/com_trolltech_qt_core/PythonQtWrapper_QBitArray.cpp \ - $$PWD/../generated_cpp/com_trolltech_qt_core/PythonQtWrapper_QDate.cpp \ - $$PWD/../generated_cpp/com_trolltech_qt_core/PythonQtWrapper_QTime.cpp \ - $$PWD/../generated_cpp/com_trolltech_qt_core/PythonQtWrapper_QDateTime.cpp \ - $$PWD/../generated_cpp/com_trolltech_qt_core/PythonQtWrapper_QUrl.cpp \ - $$PWD/../generated_cpp/com_trolltech_qt_core/PythonQtWrapper_QLocale.cpp \ - $$PWD/../generated_cpp/com_trolltech_qt_core/PythonQtWrapper_QRect.cpp \ - $$PWD/../generated_cpp/com_trolltech_qt_core/PythonQtWrapper_QRectF.cpp \ - $$PWD/../generated_cpp/com_trolltech_qt_core/PythonQtWrapper_QSize.cpp \ - $$PWD/../generated_cpp/com_trolltech_qt_core/PythonQtWrapper_QSizeF.cpp \ - $$PWD/../generated_cpp/com_trolltech_qt_core/PythonQtWrapper_QLine.cpp \ - $$PWD/../generated_cpp/com_trolltech_qt_core/PythonQtWrapper_QLineF.cpp \ - $$PWD/../generated_cpp/com_trolltech_qt_core/PythonQtWrapper_QPoint.cpp \ - $$PWD/../generated_cpp/com_trolltech_qt_core/PythonQtWrapper_QPointF.cpp \ - $$PWD/../generated_cpp/com_trolltech_qt_core/PythonQtWrapper_QRegExp.cpp \ - \ - $$PWD/../generated_cpp/com_trolltech_qt_gui/PythonQtWrapper_QFont.cpp \ - $$PWD/../generated_cpp/com_trolltech_qt_gui/PythonQtWrapper_QPixmap.cpp \ - $$PWD/../generated_cpp/com_trolltech_qt_gui/PythonQtWrapper_QBrush.cpp \ - $$PWD/../generated_cpp/com_trolltech_qt_gui/PythonQtWrapper_QColor.cpp \ - $$PWD/../generated_cpp/com_trolltech_qt_gui/PythonQtWrapper_QPalette.cpp \ - $$PWD/../generated_cpp/com_trolltech_qt_gui/PythonQtWrapper_QIcon.cpp \ - $$PWD/../generated_cpp/com_trolltech_qt_gui/PythonQtWrapper_QImage.cpp \ - $$PWD/../generated_cpp/com_trolltech_qt_gui/PythonQtWrapper_QPolygon.cpp \ - $$PWD/../generated_cpp/com_trolltech_qt_gui/PythonQtWrapper_QRegion.cpp \ - $$PWD/../generated_cpp/com_trolltech_qt_gui/PythonQtWrapper_QBitmap.cpp \ - $$PWD/../generated_cpp/com_trolltech_qt_gui/PythonQtWrapper_QCursor.cpp \ - $$PWD/../generated_cpp/com_trolltech_qt_gui/PythonQtWrapper_QSizePolicy.cpp \ - $$PWD/../generated_cpp/com_trolltech_qt_gui/PythonQtWrapper_QKeySequence.cpp \ - $$PWD/../generated_cpp/com_trolltech_qt_gui/PythonQtWrapper_QPen.cpp \ - $$PWD/../generated_cpp/com_trolltech_qt_gui/PythonQtWrapper_QTextLength.cpp \ - $$PWD/../generated_cpp/com_trolltech_qt_gui/PythonQtWrapper_QTextFormat.cpp \ - $$PWD/../generated_cpp/com_trolltech_qt_gui/PythonQtWrapper_QMatrix.cpp +include($$PWD/../generated_cpp/com_trolltech_qt_core_builtin/com_trolltech_qt_core_builtin.pri) +include($$PWD/../generated_cpp/com_trolltech_qt_gui_builtin/com_trolltech_qt_gui_builtin.pri)