Skip to content

Commit 1f10a86

Browse files
author
florianlink
committed
updated to Qt 4.8 wrappers
git-svn-id: https://pythonqt.svn.sourceforge.net/svnroot/pythonqt/trunk@226 ea8d5007-eb21-0410-b261-ccb3ea6e24a9
1 parent 4fd4cc7 commit 1f10a86

File tree

62 files changed

+95227
-79857
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+95227
-79857
lines changed

‎generated_cpp/com_trolltech_qt_core/com_trolltech_qt_core0.cpp

Lines changed: 251 additions & 256 deletions
Large diffs are not rendered by default.

‎generated_cpp/com_trolltech_qt_core/com_trolltech_qt_core0.h

Lines changed: 145 additions & 89 deletions
Large diffs are not rendered by default.

‎generated_cpp/com_trolltech_qt_core/com_trolltech_qt_core1.cpp

Lines changed: 2580 additions & 3354 deletions
Large diffs are not rendered by default.

‎generated_cpp/com_trolltech_qt_core/com_trolltech_qt_core1.h

Lines changed: 370 additions & 426 deletions
Large diffs are not rendered by default.

‎generated_cpp/com_trolltech_qt_core/com_trolltech_qt_core2.cpp

Lines changed: 1974 additions & 0 deletions
Large diffs are not rendered by default.

‎generated_cpp/com_trolltech_qt_core/com_trolltech_qt_core2.h

Lines changed: 477 additions & 2 deletions
Large diffs are not rendered by default.

‎generated_cpp/com_trolltech_qt_core/com_trolltech_qt_core_init.cpp

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,30 +7,30 @@ static void* polymorphichandler_QEvent(const void *ptr, const char **class_name)
77
{
88
Q_ASSERT(ptr != 0);
99
QEvent *object = (QEvent *)ptr;
10-
if (object->type() == QEvent::None) {
11-
*class_name = "QEvent";
12-
return (QEvent*)object;
13-
}
1410
if (object->type() == QEvent::ChildAdded || object->type() == QEvent::ChildPolished || object->type() == QEvent::ChildRemoved) {
1511
*class_name = "QChildEvent";
1612
return (QChildEvent*)object;
1713
}
18-
if (object->type() == QEvent::StateMachineWrapped) {
19-
*class_name = "QStateMachine_WrappedEvent";
20-
return (QStateMachine::WrappedEvent*)object;
14+
if (object->type() == QEvent::DynamicPropertyChange) {
15+
*class_name = "QDynamicPropertyChangeEvent";
16+
return (QDynamicPropertyChangeEvent*)object;
17+
}
18+
if (object->type() == QEvent::None) {
19+
*class_name = "QEvent";
20+
return (QEvent*)object;
2121
}
2222
if (object->type() == QEvent::StateMachineSignal) {
2323
*class_name = "QStateMachine_SignalEvent";
2424
return (QStateMachine::SignalEvent*)object;
2525
}
26+
if (object->type() == QEvent::StateMachineWrapped) {
27+
*class_name = "QStateMachine_WrappedEvent";
28+
return (QStateMachine::WrappedEvent*)object;
29+
}
2630
if (object->type() == QEvent::Timer) {
2731
*class_name = "QTimerEvent";
2832
return (QTimerEvent*)object;
2933
}
30-
if (object->type() == QEvent::DynamicPropertyChange) {
31-
*class_name = "QDynamicPropertyChangeEvent";
32-
return (QDynamicPropertyChangeEvent*)object;
33-
}
3434
return NULL;
3535
}
3636

@@ -52,6 +52,7 @@ PythonQt::priv()->registerCPPClass("QDir", "", "QtCore", PythonQtCreateObject<Py
5252
PythonQt::priv()->registerCPPClass("QDirIterator", "", "QtCore", PythonQtCreateObject<PythonQtWrapper_QDirIterator>, PythonQtSetInstanceWrapperOnShell<PythonQtShell_QDirIterator>, module, 0);
5353
PythonQt::priv()->registerCPPClass("QDynamicPropertyChangeEvent", "QEvent", "QtCore", PythonQtCreateObject<PythonQtWrapper_QDynamicPropertyChangeEvent>, NULL, module, 0);
5454
PythonQt::priv()->registerCPPClass("QEasingCurve", "", "QtCore", PythonQtCreateObject<PythonQtWrapper_QEasingCurve>, NULL, module, PythonQt::Type_RichCompare);
55+
PythonQt::priv()->registerCPPClass("QElapsedTimer", "", "QtCore", PythonQtCreateObject<PythonQtWrapper_QElapsedTimer>, PythonQtSetInstanceWrapperOnShell<PythonQtShell_QElapsedTimer>, module, PythonQt::Type_RichCompare);
5556
PythonQt::priv()->registerCPPClass("QEvent", "", "QtCore", PythonQtCreateObject<PythonQtWrapper_QEvent>, PythonQtSetInstanceWrapperOnShell<PythonQtShell_QEvent>, module, 0);
5657
PythonQt::priv()->registerClass(&QEventLoop::staticMetaObject, "QtCore", PythonQtCreateObject<PythonQtWrapper_QEventLoop>, PythonQtSetInstanceWrapperOnShell<PythonQtShell_QEventLoop>, module, 0);
5758
PythonQt::priv()->registerClass(&QEventTransition::staticMetaObject, "QtCore", PythonQtCreateObject<PythonQtWrapper_QEventTransition>, PythonQtSetInstanceWrapperOnShell<PythonQtShell_QEventTransition>, module, 0);
@@ -62,7 +63,13 @@ PythonQt::priv()->registerClass(&QFileSystemWatcher::staticMetaObject, "QtCore",
6263
PythonQt::priv()->registerClass(&QFinalState::staticMetaObject, "QtCore", PythonQtCreateObject<PythonQtWrapper_QFinalState>, PythonQtSetInstanceWrapperOnShell<PythonQtShell_QFinalState>, module, 0);
6364
PythonQt::priv()->registerClass(&QHistoryState::staticMetaObject, "QtCore", PythonQtCreateObject<PythonQtWrapper_QHistoryState>, PythonQtSetInstanceWrapperOnShell<PythonQtShell_QHistoryState>, module, 0);
6465
PythonQt::priv()->registerClass(&QIODevice::staticMetaObject, "QtCore", PythonQtCreateObject<PythonQtWrapper_QIODevice>, PythonQtSetInstanceWrapperOnShell<PythonQtShell_QIODevice>, module, 0);
66+
PythonQt::priv()->registerClass(&QLibrary::staticMetaObject, "QtCore", PythonQtCreateObject<PythonQtWrapper_QLibrary>, PythonQtSetInstanceWrapperOnShell<PythonQtShell_QLibrary>, module, 0);
6567
PythonQt::priv()->registerCPPClass("QLibraryInfo", "", "QtCore", PythonQtCreateObject<PythonQtWrapper_QLibraryInfo>, NULL, module, 0);
68+
PythonQt::priv()->registerCPPClass("QMetaClassInfo", "", "QtCore", PythonQtCreateObject<PythonQtWrapper_QMetaClassInfo>, NULL, module, 0);
69+
PythonQt::priv()->registerCPPClass("QMetaEnum", "", "QtCore", PythonQtCreateObject<PythonQtWrapper_QMetaEnum>, NULL, module, 0);
70+
PythonQt::priv()->registerCPPClass("QMetaMethod", "", "QtCore", PythonQtCreateObject<PythonQtWrapper_QMetaMethod>, NULL, module, 0);
71+
PythonQt::priv()->registerCPPClass("QMetaProperty", "", "QtCore", PythonQtCreateObject<PythonQtWrapper_QMetaProperty>, NULL, module, 0);
72+
PythonQt::priv()->registerCPPClass("QMetaType", "", "QtCore", PythonQtCreateObject<PythonQtWrapper_QMetaType>, PythonQtSetInstanceWrapperOnShell<PythonQtShell_QMetaType>, module, 0);
6673
PythonQt::priv()->registerClass(&QMimeData::staticMetaObject, "QtCore", PythonQtCreateObject<PythonQtWrapper_QMimeData>, PythonQtSetInstanceWrapperOnShell<PythonQtShell_QMimeData>, module, 0);
6774
PythonQt::priv()->registerCPPClass("QModelIndex", "", "QtCore", PythonQtCreateObject<PythonQtWrapper_QModelIndex>, NULL, module, PythonQt::Type_RichCompare);
6875
PythonQt::priv()->registerCPPClass("QMutex", "", "QtCore", PythonQtCreateObject<PythonQtWrapper_QMutex>, NULL, module, 0);
@@ -73,10 +80,12 @@ PythonQt::priv()->registerClass(&QProcess::staticMetaObject, "QtCore", PythonQtC
7380
PythonQt::priv()->registerCPPClass("QProcessEnvironment", "", "QtCore", PythonQtCreateObject<PythonQtWrapper_QProcessEnvironment>, NULL, module, PythonQt::Type_RichCompare);
7481
PythonQt::priv()->registerClass(&QPropertyAnimation::staticMetaObject, "QtCore", PythonQtCreateObject<PythonQtWrapper_QPropertyAnimation>, PythonQtSetInstanceWrapperOnShell<PythonQtShell_QPropertyAnimation>, module, 0);
7582
PythonQt::priv()->registerCPPClass("QReadWriteLock", "", "QtCore", PythonQtCreateObject<PythonQtWrapper_QReadWriteLock>, NULL, module, 0);
83+
PythonQt::priv()->registerCPPClass("QResource", "", "QtCore", PythonQtCreateObject<PythonQtWrapper_QResource>, PythonQtSetInstanceWrapperOnShell<PythonQtShell_QResource>, module, 0);
7684
PythonQt::priv()->registerCPPClass("QRunnable", "", "QtCore", PythonQtCreateObject<PythonQtWrapper_QRunnable>, PythonQtSetInstanceWrapperOnShell<PythonQtShell_QRunnable>, module, 0);
7785
PythonQt::priv()->registerCPPClass("QSemaphore", "", "QtCore", PythonQtCreateObject<PythonQtWrapper_QSemaphore>, NULL, module, 0);
7886
PythonQt::priv()->registerClass(&QSequentialAnimationGroup::staticMetaObject, "QtCore", PythonQtCreateObject<PythonQtWrapper_QSequentialAnimationGroup>, PythonQtSetInstanceWrapperOnShell<PythonQtShell_QSequentialAnimationGroup>, module, 0);
7987
PythonQt::priv()->registerClass(&QSettings::staticMetaObject, "QtCore", PythonQtCreateObject<PythonQtWrapper_QSettings>, PythonQtSetInstanceWrapperOnShell<PythonQtShell_QSettings>, module, 0);
88+
PythonQt::priv()->registerClass(&QSharedMemory::staticMetaObject, "QtCore", PythonQtCreateObject<PythonQtWrapper_QSharedMemory>, PythonQtSetInstanceWrapperOnShell<PythonQtShell_QSharedMemory>, module, 0);
8089
PythonQt::priv()->registerClass(&QSignalMapper::staticMetaObject, "QtCore", PythonQtCreateObject<PythonQtWrapper_QSignalMapper>, PythonQtSetInstanceWrapperOnShell<PythonQtShell_QSignalMapper>, module, 0);
8190
PythonQt::priv()->registerClass(&QSignalTransition::staticMetaObject, "QtCore", PythonQtCreateObject<PythonQtWrapper_QSignalTransition>, PythonQtSetInstanceWrapperOnShell<PythonQtShell_QSignalTransition>, module, 0);
8291
PythonQt::priv()->registerClass(&QSocketNotifier::staticMetaObject, "QtCore", PythonQtCreateObject<PythonQtWrapper_QSocketNotifier>, PythonQtSetInstanceWrapperOnShell<PythonQtShell_QSocketNotifier>, module, 0);
@@ -85,6 +94,7 @@ PythonQt::priv()->registerClass(&QStateMachine::staticMetaObject, "QtCore", Pyth
8594
PythonQt::priv()->registerCPPClass("QStateMachine::SignalEvent", "QEvent", "QtCore", PythonQtCreateObject<PythonQtWrapper_QStateMachine_SignalEvent>, NULL, module, 0);
8695
PythonQt::priv()->registerCPPClass("QStateMachine::WrappedEvent", "QEvent", "QtCore", PythonQtCreateObject<PythonQtWrapper_QStateMachine_WrappedEvent>, NULL, module, 0);
8796
PythonQt::priv()->registerCPPClass("QStringMatcher", "", "QtCore", PythonQtCreateObject<PythonQtWrapper_QStringMatcher>, NULL, module, 0);
97+
PythonQt::priv()->registerCPPClass("QSysInfo", "", "QtCore", PythonQtCreateObject<PythonQtWrapper_QSysInfo>, PythonQtSetInstanceWrapperOnShell<PythonQtShell_QSysInfo>, module, 0);
8898
PythonQt::priv()->registerCPPClass("QSystemSemaphore", "", "QtCore", PythonQtCreateObject<PythonQtWrapper_QSystemSemaphore>, NULL, module, 0);
8999
PythonQt::priv()->registerClass(&QTemporaryFile::staticMetaObject, "QtCore", PythonQtCreateObject<PythonQtWrapper_QTemporaryFile>, PythonQtSetInstanceWrapperOnShell<PythonQtShell_QTemporaryFile>, module, 0);
90100
PythonQt::priv()->registerCPPClass("QTextBoundaryFinder", "", "QtCore", PythonQtCreateObject<PythonQtWrapper_QTextBoundaryFinder>, NULL, module, 0);

0 commit comments

Comments
 (0)