diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-03 19:23:03 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-03 19:23:03 -0600 |
commit | f2fc430b75c36c70333c2e01b649eebf39142c33 (patch) | |
tree | e4e59b6582180a9ae0d90df2de438dc1e646c3cd /sip/qt | |
parent | 8a055d66f43592c257cece2eb8cc021808062917 (diff) | |
download | pytqt-f2fc430b75c36c70333c2e01b649eebf39142c33.tar.gz pytqt-f2fc430b75c36c70333c2e01b649eebf39142c33.zip |
Rename sip*_Q items
Diffstat (limited to 'sip/qt')
-rw-r--r-- | sip/qt/qapplication.sip | 2 | ||||
-rw-r--r-- | sip/qt/qbytearray.sip | 4 | ||||
-rw-r--r-- | sip/qt/qcstring.sip | 4 | ||||
-rw-r--r-- | sip/qt/qdir.sip | 6 | ||||
-rw-r--r-- | sip/qt/qevent.sip | 80 | ||||
-rw-r--r-- | sip/qt/qkeysequence.sip | 16 | ||||
-rw-r--r-- | sip/qt/qlayout.sip | 4 | ||||
-rw-r--r-- | sip/qt/qlineedit.sip | 2 | ||||
-rw-r--r-- | sip/qt/qobject.sip | 348 | ||||
-rw-r--r-- | sip/qt/qobjectlist.sip | 6 | ||||
-rw-r--r-- | sip/qt/qstring.sip | 8 | ||||
-rw-r--r-- | sip/qt/qtabbar.sip | 2 | ||||
-rw-r--r-- | sip/qt/qwidgetlist.sip | 6 |
13 files changed, 244 insertions, 244 deletions
diff --git a/sip/qt/qapplication.sip b/sip/qt/qapplication.sip index 7093a33..577308e 100644 --- a/sip/qt/qapplication.sip +++ b/sip/qt/qapplication.sip @@ -189,7 +189,7 @@ public: { PyObject *sw; - if ((sw = sipGetWrapper(w,sipClass_QWidget)) != NULL) + if ((sw = sipGetWrapper(w,sipClass_TQWidget)) != NULL) sipTransferTo(sw,NULL); ++it; diff --git a/sip/qt/qbytearray.sip b/sip/qt/qbytearray.sip index 5b4fd7e..d5941b4 100644 --- a/sip/qt/qbytearray.sip +++ b/sip/qt/qbytearray.sip @@ -173,7 +173,7 @@ public: if (sipIsErr == NULL) return (PyString_Check(sipPy) || - sipCanConvertToInstance(sipPy,sipClass_QByteArray,SIP_NO_CONVERTORS)); + sipCanConvertToInstance(sipPy,sipClass_TQByteArray,SIP_NO_CONVERTORS)); if (PyString_Check(sipPy)) { @@ -188,7 +188,7 @@ public: return sipGetState(sipTransferObj); } - *sipCppPtr = reinterpret_cast<TQByteArray *>(sipConvertToInstance(sipPy,sipClass_QByteArray,sipTransferObj,SIP_NO_CONVERTORS,0,sipIsErr)); + *sipCppPtr = reinterpret_cast<TQByteArray *>(sipConvertToInstance(sipPy,sipClass_TQByteArray,sipTransferObj,SIP_NO_CONVERTORS,0,sipIsErr)); return 0; %End diff --git a/sip/qt/qcstring.sip b/sip/qt/qcstring.sip index acf919d..0fcc624 100644 --- a/sip/qt/qcstring.sip +++ b/sip/qt/qcstring.sip @@ -205,7 +205,7 @@ public: if (sipIsErr == NULL) return (PyString_Check(sipPy) || - sipCanConvertToInstance(sipPy,sipClass_QCString,SIP_NO_CONVERTORS)); + sipCanConvertToInstance(sipPy,sipClass_TQCString,SIP_NO_CONVERTORS)); if (PyString_Check(sipPy)) { @@ -214,7 +214,7 @@ public: return sipGetState(sipTransferObj); } - *sipCppPtr = reinterpret_cast<TQCString *>(sipConvertToInstance(sipPy,sipClass_QCString,sipTransferObj,SIP_NO_CONVERTORS,0,sipIsErr)); + *sipCppPtr = reinterpret_cast<TQCString *>(sipConvertToInstance(sipPy,sipClass_TQCString,sipTransferObj,SIP_NO_CONVERTORS,0,sipIsErr)); return 0; %End diff --git a/sip/qt/qdir.sip b/sip/qt/qdir.sip index 1c1d8d8..a531b5e 100644 --- a/sip/qt/qdir.sip +++ b/sip/qt/qdir.sip @@ -59,7 +59,7 @@ the return type of a function or the type of an argument, a Python list of { PyObject *inst; - if ((inst = sipConvertFromInstance(obj,sipClass_QFileInfo,sipTransferObj)) == NULL || PyList_Append(pl,inst) < 0) + if ((inst = sipConvertFromInstance(obj,sipClass_TQFileInfo,sipTransferObj)) == NULL || PyList_Append(pl,inst) < 0) { Py_XDECREF(inst); Py_DECREF(pl); @@ -83,7 +83,7 @@ the return type of a function or the type of an argument, a Python list of return 0; for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) - if (!sipCanConvertToInstance(PyList_GET_ITEM(sipPy,i),sipClass_QFileInfo,0)) + if (!sipCanConvertToInstance(PyList_GET_ITEM(sipPy,i),sipClass_TQFileInfo,0)) return 0; return 1; @@ -98,7 +98,7 @@ the return type of a function or the type of an argument, a Python list of // We apply the transfer to the list itself, not the elements. // Note that any temporary element will never be destroyed. // There is nothing that can be done about this. - qfi = reinterpret_cast<TQFileInfo *>(sipConvertToInstance(PyList_GET_ITEM(sipPy,i),sipClass_QFileInfo,0,0,0,sipIsErr)); + qfi = reinterpret_cast<TQFileInfo *>(sipConvertToInstance(PyList_GET_ITEM(sipPy,i),sipClass_TQFileInfo,0,0,0,sipIsErr)); if (*sipIsErr) { diff --git a/sip/qt/qevent.sip b/sip/qt/qevent.sip index ee66b43..098e253 100644 --- a/sip/qt/qevent.sip +++ b/sip/qt/qevent.sip @@ -243,69 +243,69 @@ public: switch (sipCpp -> type()) { case Event_Timer: - sipClass = sipClass_QTimerEvent; + sipClass = sipClass_TQTimerEvent; break; case Event_MouseButtonPress: case Event_MouseButtonRelease: case Event_MouseButtonDblClick: case Event_MouseMove: - sipClass = sipClass_QMouseEvent; + sipClass = sipClass_TQMouseEvent; break; case Event_KeyPress: case Event_KeyRelease: - sipClass = sipClass_QKeyEvent; + sipClass = sipClass_TQKeyEvent; break; case Event_FocusIn: case Event_FocusOut: - sipClass = sipClass_QFocusEvent; + sipClass = sipClass_TQFocusEvent; break; case Event_Paint: - sipClass = sipClass_QPaintEvent; + sipClass = sipClass_TQPaintEvent; break; case Event_Move: - sipClass = sipClass_QMoveEvent; + sipClass = sipClass_TQMoveEvent; break; case Event_Resize: - sipClass = sipClass_QResizeEvent; + sipClass = sipClass_TQResizeEvent; break; case Event_Close: - sipClass = sipClass_QCloseEvent; + sipClass = sipClass_TQCloseEvent; break; case Event_Show: - sipClass = sipClass_QShowEvent; + sipClass = sipClass_TQShowEvent; break; case Event_Hide: - sipClass = sipClass_QHideEvent; + sipClass = sipClass_TQHideEvent; break; case Event_DragMove: - sipClass = sipClass_QDragMoveEvent; + sipClass = sipClass_TQDragMoveEvent; break; case Event_DragEnter: - sipClass = sipClass_QDragEnterEvent; + sipClass = sipClass_TQDragEnterEvent; break; case Event_DragLeave: - sipClass = sipClass_QDragLeaveEvent; + sipClass = sipClass_TQDragLeaveEvent; break; case Event_Drop: - sipClass = sipClass_QDropEvent; + sipClass = sipClass_TQDropEvent; break; case Event_ChildInserted: case Event_ChildRemoved: - sipClass = sipClass_QChildEvent; + sipClass = sipClass_TQChildEvent; break; default: @@ -451,14 +451,14 @@ public: switch (sipCpp -> type()) { case TQEvent::Timer: - sipClass = sipClass_QTimerEvent; + sipClass = sipClass_TQTimerEvent; break; case TQEvent::MouseButtonPress: case TQEvent::MouseButtonRelease: case TQEvent::MouseButtonDblClick: case TQEvent::MouseMove: - sipClass = sipClass_QMouseEvent; + sipClass = sipClass_TQMouseEvent; break; case TQEvent::Accel: @@ -467,108 +467,108 @@ public: #endif case TQEvent::KeyPress: case TQEvent::KeyRelease: - sipClass = sipClass_QKeyEvent; + sipClass = sipClass_TQKeyEvent; break; case TQEvent::FocusIn: case TQEvent::FocusOut: - sipClass = sipClass_QFocusEvent; + sipClass = sipClass_TQFocusEvent; break; case TQEvent::Paint: - sipClass = sipClass_QPaintEvent; + sipClass = sipClass_TQPaintEvent; break; case TQEvent::Move: - sipClass = sipClass_QMoveEvent; + sipClass = sipClass_TQMoveEvent; break; case TQEvent::Resize: - sipClass = sipClass_QResizeEvent; + sipClass = sipClass_TQResizeEvent; break; case TQEvent::Close: - sipClass = sipClass_QCloseEvent; + sipClass = sipClass_TQCloseEvent; break; #if QT_VERSION >= 0x030300 case TQEvent::IconDrag: - sipClass = sipClass_QIconDragEvent; + sipClass = sipClass_TQIconDragEvent; break; #endif case TQEvent::Wheel: - sipClass = sipClass_QWheelEvent; + sipClass = sipClass_TQWheelEvent; break; case TQEvent::Show: - sipClass = sipClass_QShowEvent; + sipClass = sipClass_TQShowEvent; break; case TQEvent::Hide: - sipClass = sipClass_QHideEvent; + sipClass = sipClass_TQHideEvent; break; #if defined(SIP_FEATURE_TQt_DRAGANDDROP) case TQEvent::DragMove: - sipClass = sipClass_QDragMoveEvent; + sipClass = sipClass_TQDragMoveEvent; break; case TQEvent::DragEnter: - sipClass = sipClass_QDragEnterEvent; + sipClass = sipClass_TQDragEnterEvent; break; case TQEvent::DragLeave: - sipClass = sipClass_QDragLeaveEvent; + sipClass = sipClass_TQDragLeaveEvent; break; case TQEvent::Drop: - sipClass = sipClass_QDropEvent; + sipClass = sipClass_TQDropEvent; break; #endif case TQEvent::ChildInserted: case TQEvent::ChildRemoved: - sipClass = sipClass_QChildEvent; + sipClass = sipClass_TQChildEvent; break; #if QT_VERSION >= 0x030000 case TQEvent::ContextMenu: - sipClass = sipClass_QContextMenuEvent; + sipClass = sipClass_TQContextMenuEvent; break; case TQEvent::IMStart: case TQEvent::IMEnd: - sipClass = sipClass_QIMEvent; + sipClass = sipClass_TQIMEvent; break; #endif #if QT_VERSION >= 0x030000 && QT_VERSION < 0x030100 case TQEvent::IMCompose: - sipClass = sipClass_QIMEvent; + sipClass = sipClass_TQIMEvent; break; case TQEvent::Tablet: - sipClass = sipClass_QTabletEvent; + sipClass = sipClass_TQTabletEvent; break; #endif #if QT_VERSION >= 0x030100 case TQEvent::IMCompose: - sipClass = sipClass_QIMComposeEvent; + sipClass = sipClass_TQIMComposeEvent; break; case TQEvent::TabletMove: case TQEvent::TabletPress: case TQEvent::TabletRelease: - sipClass = sipClass_QTabletEvent; + sipClass = sipClass_TQTabletEvent; break; #endif default: sipClass = (sipCpp -> type() < TQEvent::User ? - sipClass_QEvent : - sipClass_QCustomEvent); + sipClass_TQEvent : + sipClass_TQCustomEvent); } %End }; diff --git a/sip/qt/qkeysequence.sip b/sip/qt/qkeysequence.sip index 327d6e6..f70f6ef 100644 --- a/sip/qt/qkeysequence.sip +++ b/sip/qt/qkeysequence.sip @@ -63,10 +63,10 @@ public: if (sipIsErr == NULL) { - if (sipCanConvertToInstance(sipPy,sipClass_QKeySequence,SIP_NO_CONVERTORS)) + if (sipCanConvertToInstance(sipPy,sipClass_TQKeySequence,SIP_NO_CONVERTORS)) return 1; - if (sipCanConvertToInstance(sipPy,sipClass_QString,0)) + if (sipCanConvertToInstance(sipPy,sipClass_TQString,0)) return 1; PyErr_Clear(); @@ -79,21 +79,21 @@ public: // We do this case before the int case because, otherwise, // PyInt_AsLong() would achieve the same result but less efficiently. - if (sipCanConvertToInstance(sipPy,sipClass_QKeySequence,SIP_NO_CONVERTORS)) + if (sipCanConvertToInstance(sipPy,sipClass_TQKeySequence,SIP_NO_CONVERTORS)) { - *sipCppPtr = reinterpret_cast<TQKeySequence *>(sipConvertToInstance(sipPy,sipClass_QKeySequence,sipTransferObj,SIP_NO_CONVERTORS,0,sipIsErr)); + *sipCppPtr = reinterpret_cast<TQKeySequence *>(sipConvertToInstance(sipPy,sipClass_TQKeySequence,sipTransferObj,SIP_NO_CONVERTORS,0,sipIsErr)); return 0; } - if (sipCanConvertToInstance(sipPy,sipClass_QString,0)) + if (sipCanConvertToInstance(sipPy,sipClass_TQString,0)) { int state; - TQString *s = reinterpret_cast<TQString *>(sipConvertToInstance(sipPy,sipClass_QString,0,0,&state,sipIsErr)); + TQString *s = reinterpret_cast<TQString *>(sipConvertToInstance(sipPy,sipClass_TQString,0,0,&state,sipIsErr)); if (*sipIsErr) { - sipReleaseInstance(s,sipClass_QString,state); + sipReleaseInstance(s,sipClass_TQString,state); return 0; } @@ -101,7 +101,7 @@ public: *sipCppPtr = new TQKeySequence(*s); Py_END_ALLOW_THREADS - sipReleaseInstance(s,sipClass_QString,state); + sipReleaseInstance(s,sipClass_TQString,state); return sipGetState(sipTransferObj); } diff --git a/sip/qt/qlayout.sip b/sip/qt/qlayout.sip index 41fc23b..4663282 100644 --- a/sip/qt/qlayout.sip +++ b/sip/qt/qlayout.sip @@ -187,9 +187,9 @@ public: // Note that we let the TQObject sub-class code handle TQLayout and it's // sub-classes. if (sipCpp->widget()) - sipClass = sipClass_QWidgetItem; + sipClass = sipClass_TQWidgetItem; else if (sipCpp->spacerItem()) - sipClass = sipClass_QSpacerItem; + sipClass = sipClass_TQSpacerItem; else sipClass = NULL; %End diff --git a/sip/qt/qlineedit.sip b/sip/qt/qlineedit.sip index dfe7880..9c2a44d 100644 --- a/sip/qt/qlineedit.sip +++ b/sip/qt/qlineedit.sip @@ -212,7 +212,7 @@ public: res = sipCpp -> characterAt(a0,chr); Py_END_ALLOW_THREADS - sipRes = sipBuildResult(&sipIsErr,"(iB)",res,chr,sipClass_QChar,NULL); + sipRes = sipBuildResult(&sipIsErr,"(iB)",res,chr,sipClass_TQChar,NULL); %End // Obsolete. diff --git a/sip/qt/qobject.sip b/sip/qt/qobject.sip index 8131cf3..c0bc703 100644 --- a/sip/qt/qobject.sip +++ b/sip/qt/qobject.sip @@ -76,302 +76,302 @@ public: sipWrapperType **type; int yes, no; } graph[] = { - {sipName_QWidget, &sipClass_QWidget, 25, 1}, + {sipName_TQWidget, &sipClass_TQWidget, 25, 1}, #if QT_VERSION >= 0x030100 && defined(SIP_FEATURE_TQt_ASSISTANTCLIENT) - {sipName_QAssistantClient, &sipClass_QAssistantClient, -1, 2}, + {sipName_TQAssistantClient, &sipClass_TQAssistantClient, -1, 2}, #else {NULL, NULL, -1, 2}, #endif - {sipName_QSessionManager, &sipClass_QSessionManager, -1, 3}, - {sipName_QTranslator, &sipClass_QTranslator, -1, 4}, + {sipName_TQSessionManager, &sipClass_TQSessionManager, -1, 3}, + {sipName_TQTranslator, &sipClass_TQTranslator, -1, 4}, #if QT_VERSION >= 0x030000 - {sipName_QProcess, &sipClass_QProcess, -1, 5}, + {sipName_TQProcess, &sipClass_TQProcess, -1, 5}, #else {NULL, NULL, -1, 5}, #endif - {sipName_QToolTipGroup, &sipClass_QToolTipGroup, -1, 6}, + {sipName_TQToolTipGroup, &sipClass_TQToolTipGroup, -1, 6}, #if defined(SIP_FEATURE_TQt_FILEDIALOG) - {sipName_QFileIconProvider, &sipClass_QFileIconProvider, -1, 7}, + {sipName_TQFileIconProvider, &sipClass_TQFileIconProvider, -1, 7}, #else {NULL, NULL, -1, 7}, #endif #if QT_VERSION >= 220 && defined(SIP_FEATURE_TQt_ACTION) - {sipName_QAction, &sipClass_QAction, 89, 8}, + {sipName_TQAction, &sipClass_TQAction, 89, 8}, #else {NULL, NULL, -1, 8}, #endif #if QT_VERSION >= 0x030000 - {sipName_QObjectCleanupHandler, &sipClass_QObjectCleanupHandler, -1, 9}, + {sipName_TQObjectCleanupHandler, &sipClass_TQObjectCleanupHandler, -1, 9}, #else {NULL, NULL, -1, 9}, #endif - {sipName_QTimer, &sipClass_QTimer, -1, 10}, - {sipName_QLayout, &sipClass_QLayout, 90, 11}, + {sipName_TQTimer, &sipClass_TQTimer, -1, 10}, + {sipName_TQLayout, &sipClass_TQLayout, 90, 11}, #if QT_VERSION >= 210 && defined(SIP_FEATURE_TQt_NETWORKPROTOCOL) - {sipName_QUrlOperator, &sipClass_QUrlOperator, -1, 12}, + {sipName_TQUrlOperator, &sipClass_TQUrlOperator, -1, 12}, #else {NULL, NULL, -1, 12}, #endif - {sipName_QStyleSheet, &sipClass_QStyleSheet, -1, 13}, - {sipName_QValidator, &sipClass_QValidator, 94, 14}, + {sipName_TQStyleSheet, &sipClass_TQStyleSheet, -1, 13}, + {sipName_TQValidator, &sipClass_TQValidator, 94, 14}, #if QT_VERSION >= 210 && defined(SIP_FEATURE_TQt_NETWORKPROTOCOL) - {sipName_QNetworkOperation, &sipClass_QNetworkOperation, -1, 15}, + {sipName_TQNetworkOperation, &sipClass_TQNetworkOperation, -1, 15}, #else {NULL, NULL, -1, 15}, #endif - {sipName_QAccel, &sipClass_QAccel, -1, 16}, + {sipName_TQAccel, &sipClass_TQAccel, -1, 16}, #if QT_VERSION >= 0x030100 - {sipName_QEventLoop, &sipClass_QEventLoop, -1, 17}, + {sipName_TQEventLoop, &sipClass_TQEventLoop, -1, 17}, #else {NULL, NULL, -1, 17}, #endif #if QT_VERSION >= 210 && defined(SIP_FEATURE_TQt_NETWORKPROTOCOL) - {sipName_QNetworkProtocol, &sipClass_QNetworkProtocol, -1, 18}, + {sipName_TQNetworkProtocol, &sipClass_TQNetworkProtocol, -1, 18}, #else {NULL, NULL, -1, 18}, #endif #if QT_VERSION >= 220 && defined(SIP_FEATURE_TQt_SOUND) - {sipName_QSound, &sipClass_QSound, -1, 19}, + {sipName_TQSound, &sipClass_TQSound, -1, 19}, #else {NULL, NULL, -1, 19}, #endif - {sipName_QApplication, &sipClass_QApplication, -1, 20}, - {sipName_QDragObject, &sipClass_QDragObject, 97, 21}, - {sipName_QSocketNotifier, &sipClass_QSocketNotifier, -1, 22}, - {sipName_QStyle, &sipClass_QStyle, 103, 23}, - {sipName_QSignalMapper, &sipClass_QSignalMapper, -1, 24}, + {sipName_TQApplication, &sipClass_TQApplication, -1, 20}, + {sipName_TQDragObject, &sipClass_TQDragObject, 97, 21}, + {sipName_TQSocketNotifier, &sipClass_TQSocketNotifier, -1, 22}, + {sipName_TQStyle, &sipClass_TQStyle, 103, 23}, + {sipName_TQSignalMapper, &sipClass_TQSignalMapper, -1, 24}, #if defined(SIP_FEATURE_TQt_CLIPBOARD) - {sipName_QClipboard, &sipClass_QClipboard, -1, -1}, + {sipName_TQClipboard, &sipClass_TQClipboard, -1, -1}, #else {NULL, NULL, -1, -1}, #endif - {sipName_QStatusBar, &sipClass_QStatusBar, -1, 26}, + {sipName_TQStatusBar, &sipClass_TQStatusBar, -1, 26}, #if defined(SIP_FEATURE_TQt_SIZEGRIP) - {sipName_QSizeGrip, &sipClass_QSizeGrip, -1, 27}, + {sipName_TQSizeGrip, &sipClass_TQSizeGrip, -1, 27}, #else {NULL, NULL, -1, 27}, #endif - {sipName_QTabWidget, &sipClass_QTabWidget, -1, 28}, + {sipName_TQTabWidget, &sipClass_TQTabWidget, -1, 28}, #if QT_VERSION >= 0x030000 - {sipName_QDateEdit, &sipClass_QDateEdit, -1, 29}, + {sipName_TQDateEdit, &sipClass_TQDateEdit, -1, 29}, #else {NULL, NULL, -1, 29}, #endif - {sipName_QMainWindow, &sipClass_QMainWindow, -1, 30}, + {sipName_TQMainWindow, &sipClass_TQMainWindow, -1, 30}, #if QT_VERSION >= 0x030000 - {sipName_QDateTimeEdit, &sipClass_QDateTimeEdit, -1, 31}, + {sipName_TQDateTimeEdit, &sipClass_TQDateTimeEdit, -1, 31}, #else {NULL, NULL, -1, 31}, #endif #if QT_VERSION >= 0x030000 - {sipName_QTimeEdit, &sipClass_QTimeEdit, -1, 32}, + {sipName_TQTimeEdit, &sipClass_TQTimeEdit, -1, 32}, #else {NULL, NULL, -1, 32}, #endif - {sipName_QFrame, &sipClass_QFrame, 46, 33}, - {sipName_QScrollBar, &sipClass_QScrollBar, -1, 34}, + {sipName_TQFrame, &sipClass_TQFrame, 46, 33}, + {sipName_TQScrollBar, &sipClass_TQScrollBar, -1, 34}, #if QT_VERSION >= 220 && defined(SIP_FEATURE_TQt_DIAL) - {sipName_QDial, &sipClass_QDial, -1, 35}, + {sipName_TQDial, &sipClass_TQDial, -1, 35}, #else {NULL, NULL, -1, 35}, #endif - {sipName_QButton, &sipClass_QButton, 75, 36}, - {sipName_QTabBar, &sipClass_QTabBar, -1, 37}, - {sipName_QDialog, &sipClass_QDialog, 79, 38}, - {sipName_QComboBox, &sipClass_QComboBox, -1, 39}, - {sipName_QHeader, &sipClass_QHeader, -1, 40}, + {sipName_TQButton, &sipClass_TQButton, 75, 36}, + {sipName_TQTabBar, &sipClass_TQTabBar, -1, 37}, + {sipName_TQDialog, &sipClass_TQDialog, 79, 38}, + {sipName_TQComboBox, &sipClass_TQComboBox, -1, 39}, + {sipName_TQHeader, &sipClass_TQHeader, -1, 40}, #if QT_VERSION >= 0x030000 - {sipName_QDockArea, &sipClass_QDockArea, -1, 41}, + {sipName_TQDockArea, &sipClass_TQDockArea, -1, 41}, #else {NULL, NULL, -1, 41}, #endif #if QT_VERSION >= 0x030200 - {sipName_QSplashScreen, &sipClass_QSplashScreen, -1, 42}, + {sipName_TQSplashScreen, &sipClass_TQSplashScreen, -1, 42}, #else {NULL, NULL, -1, 42}, #endif - {sipName_QSlider, &sipClass_QSlider, -1, 43}, - {sipName_QSpinBox, &sipClass_QSpinBox, -1, 44}, + {sipName_TQSlider, &sipClass_TQSlider, -1, 43}, + {sipName_TQSpinBox, &sipClass_TQSpinBox, -1, 44}, #if QT_VERSION >= 210 && defined(SIP_FEATURE_TQt_WORKSPACE) - {sipName_QWorkspace, &sipClass_QWorkspace, -1, 45}, + {sipName_TQWorkspace, &sipClass_TQWorkspace, -1, 45}, #else {NULL, NULL, -1, 45}, #endif #if QT_VERSION >= 0x030000 - {sipName_QDesktopWidget, &sipClass_QDesktopWidget, -1, -1}, + {sipName_TQDesktopWidget, &sipClass_TQDesktopWidget, -1, -1}, #else {NULL, NULL, -1, -1}, #endif - {sipName_QGrid, &sipClass_QGrid, -1, 47}, - {sipName_QLineEdit, &sipClass_QLineEdit, -1, 48}, + {sipName_TQGrid, &sipClass_TQGrid, -1, 47}, + {sipName_TQLineEdit, &sipClass_TQLineEdit, -1, 48}, #if QT_VERSION >= 0x030200 - {sipName_QToolBox, &sipClass_QToolBox, -1, 49}, + {sipName_TQToolBox, &sipClass_TQToolBox, -1, 49}, #else {NULL, NULL, -1, 49}, #endif - {sipName_QWidgetStack, &sipClass_QWidgetStack, -1, 50}, + {sipName_TQWidgetStack, &sipClass_TQWidgetStack, -1, 50}, #if QT_VERSION >= 0x030000 - {sipName_QDockWindow, &sipClass_QDockWindow, 60, 51}, + {sipName_TQDockWindow, &sipClass_TQDockWindow, 60, 51}, #else {NULL, NULL, -1, 51}, #endif - {sipName_QMenuBar, &sipClass_QMenuBar, -1, 52}, - {sipName_QLabel, &sipClass_QLabel, -1, 53}, - {sipName_QGroupBox, &sipClass_QGroupBox, 61, 54}, - {sipName_QPopupMenu, &sipClass_QPopupMenu, -1, 55}, + {sipName_TQMenuBar, &sipClass_TQMenuBar, -1, 52}, + {sipName_TQLabel, &sipClass_TQLabel, -1, 53}, + {sipName_TQGroupBox, &sipClass_TQGroupBox, 61, 54}, + {sipName_TQPopupMenu, &sipClass_TQPopupMenu, -1, 55}, #if defined(SIP_FEATURE_TQt_SPLITTER) - {sipName_QSplitter, &sipClass_QSplitter, -1, 56}, + {sipName_TQSplitter, &sipClass_TQSplitter, -1, 56}, #else {NULL, NULL, -1, 56}, #endif - {sipName_QProgressBar, &sipClass_QProgressBar, -1, 57}, - {sipName_QScrollView, &sipClass_QScrollView, 66, 58}, - {sipName_QHBox, &sipClass_QHBox, 74, 59}, - {sipName_QLCDNumber, &sipClass_QLCDNumber, -1, -1}, - {sipName_QToolBar, &sipClass_QToolBar, -1, -1}, - {sipName_QButtonGroup, &sipClass_QButtonGroup, 64, 62}, - {sipName_QHGroupBox, &sipClass_QHGroupBox, -1, 63}, - {sipName_QVGroupBox, &sipClass_QVGroupBox, -1, -1}, - {sipName_QVButtonGroup, &sipClass_QVButtonGroup, -1, 65}, - {sipName_QHButtonGroup, &sipClass_QHButtonGroup, -1, -1}, + {sipName_TQProgressBar, &sipClass_TQProgressBar, -1, 57}, + {sipName_TQScrollView, &sipClass_TQScrollView, 66, 58}, + {sipName_TQHBox, &sipClass_TQHBox, 74, 59}, + {sipName_TQLCDNumber, &sipClass_TQLCDNumber, -1, -1}, + {sipName_TQToolBar, &sipClass_TQToolBar, -1, -1}, + {sipName_TQButtonGroup, &sipClass_TQButtonGroup, 64, 62}, + {sipName_TQHGroupBox, &sipClass_TQHGroupBox, -1, 63}, + {sipName_TQVGroupBox, &sipClass_TQVGroupBox, -1, -1}, + {sipName_TQVButtonGroup, &sipClass_TQVButtonGroup, -1, 65}, + {sipName_TQHButtonGroup, &sipClass_TQHButtonGroup, -1, -1}, #if QT_VERSION >= 210 && defined(SIP_FEATURE_TQt_ICONVIEW) - {sipName_QIconView, &sipClass_QIconView, -1, 67}, + {sipName_TQIconView, &sipClass_TQIconView, -1, 67}, #else {NULL, NULL, -1, 67}, #endif - {sipName_QListView, &sipClass_QListView, -1, 68}, - {sipName_QListBox, &sipClass_QListBox, -1, 69}, + {sipName_TQListView, &sipClass_TQListView, -1, 68}, + {sipName_TQListBox, &sipClass_TQListBox, -1, 69}, #if QT_VERSION >= 0x030000 - {sipName_QGridView, &sipClass_QGridView, -1, 70}, + {sipName_TQGridView, &sipClass_TQGridView, -1, 70}, #else {NULL, NULL, -1, 70}, #endif #if QT_VERSION >= 0x030000 - {sipName_QTextEdit, &sipClass_QTextEdit, 71, -1}, + {sipName_TQTextEdit, &sipClass_TQTextEdit, 71, -1}, #else {NULL, NULL, -1, -1}, #endif - {sipName_QTextBrowser, &sipClass_QTextBrowser, -1, 72}, - {sipName_QMultiLineEdit, &sipClass_QMultiLineEdit, -1, 73}, - {sipName_QTextView, &sipClass_QTextView, -1, -1}, - {sipName_QVBox, &sipClass_QVBox, -1, -1}, - {sipName_QToolButton, &sipClass_QToolButton, -1, 76}, - {sipName_QRadioButton, &sipClass_QRadioButton, -1, 77}, - {sipName_QPushButton, &sipClass_QPushButton, -1, 78}, - {sipName_QCheckBox, &sipClass_QCheckBox, -1, -1}, + {sipName_TQTextBrowser, &sipClass_TQTextBrowser, -1, 72}, + {sipName_TQMultiLineEdit, &sipClass_TQMultiLineEdit, -1, 73}, + {sipName_TQTextView, &sipClass_TQTextView, -1, -1}, + {sipName_TQVBox, &sipClass_TQVBox, -1, -1}, + {sipName_TQToolButton, &sipClass_TQToolButton, -1, 76}, + {sipName_TQRadioButton, &sipClass_TQRadioButton, -1, 77}, + {sipName_TQPushButton, &sipClass_TQPushButton, -1, 78}, + {sipName_TQCheckBox, &sipClass_TQCheckBox, -1, -1}, #if defined(WS_X11) && defined(SIP_FEATURE_TQt_PRINTDIALOG) - {sipName_QPrintDialog, &sipClass_QPrintDialog, -1, 80}, + {sipName_TQPrintDialog, &sipClass_TQPrintDialog, -1, 80}, #else {NULL, NULL, -1, 80}, #endif #if QT_VERSION >= 0x030000 - {sipName_QErrorMessage, &sipClass_QErrorMessage, -1, 81}, + {sipName_TQErrorMessage, &sipClass_TQErrorMessage, -1, 81}, #else {NULL, NULL, -1, 81}, #endif #if QT_VERSION >= 210 && defined(SIP_FEATURE_TQt_INPUTDIALOG) - {sipName_QInputDialog, &sipClass_QInputDialog, -1, 82}, + {sipName_TQInputDialog, &sipClass_TQInputDialog, -1, 82}, #else {NULL, NULL, -1, 82}, #endif #if defined(SIP_FEATURE_TQt_MESSAGEBOX) - {sipName_QMessageBox, &sipClass_QMessageBox, -1, 83}, + {sipName_TQMessageBox, &sipClass_TQMessageBox, -1, 83}, #else {NULL, NULL, -1, 83}, #endif #if defined(SIP_FEATURE_TQt_WIZARD) - {sipName_QWizard, &sipClass_QWizard, -1, 84}, + {sipName_TQWizard, &sipClass_TQWizard, -1, 84}, #else {NULL, NULL, -1, 84}, #endif #if defined(SIP_FEATURE_TQt_COLORDIALOG) - {sipName_QColorDialog, &sipClass_QColorDialog, -1, 85}, + {sipName_TQColorDialog, &sipClass_TQColorDialog, -1, 85}, #else {NULL, NULL, -1, 85}, #endif #if defined(SIP_FEATURE_TQt_FONTDIALOG) - {sipName_QFontDialog, &sipClass_QFontDialog, -1, 86}, + {sipName_TQFontDialog, &sipClass_TQFontDialog, -1, 86}, #else {NULL, NULL, -1, 86}, #endif #if defined(SIP_FEATURE_TQt_FILEDIALOG) - {sipName_QFileDialog, &sipClass_QFileDialog, -1, 87}, + {sipName_TQFileDialog, &sipClass_TQFileDialog, -1, 87}, #else {NULL, NULL, -1, 87}, #endif #if defined(SIP_FEATURE_TQt_PROGRESSDIALOG) - {sipName_QProgressDialog, &sipClass_QProgressDialog, -1, 88}, + {sipName_TQProgressDialog, &sipClass_TQProgressDialog, -1, 88}, #else {NULL, NULL, -1, 88}, #endif #if defined(SIP_FEATURE_TQt_TABDIALOG) - {sipName_QTabDialog, &sipClass_QTabDialog, -1, -1}, + {sipName_TQTabDialog, &sipClass_TQTabDialog, -1, -1}, #else {NULL, NULL, -1, -1}, #endif #if QT_VERSION >= 220 && defined(SIP_FEATURE_TQt_ACTION) - {sipName_QActionGroup, &sipClass_QActionGroup, -1, -1}, + {sipName_TQActionGroup, &sipClass_TQActionGroup, -1, -1}, #else {NULL, NULL, -1, -1}, #endif - {sipName_QGridLayout, &sipClass_QGridLayout, -1, 91}, - {sipName_QBoxLayout, &sipClass_QBoxLayout, 92, -1}, - {sipName_QHBoxLayout, &sipClass_QHBoxLayout, -1, 93}, - {sipName_QVBoxLayout, &sipClass_QVBoxLayout, -1, -1}, - {sipName_QDoubleValidator, &sipClass_QDoubleValidator, -1, 95}, - {sipName_QIntValidator, &sipClass_QIntValidator, -1, 96}, + {sipName_TQGridLayout, &sipClass_TQGridLayout, -1, 91}, + {sipName_TQBoxLayout, &sipClass_TQBoxLayout, 92, -1}, + {sipName_TQHBoxLayout, &sipClass_TQHBoxLayout, -1, 93}, + {sipName_TQVBoxLayout, &sipClass_TQVBoxLayout, -1, -1}, + {sipName_TQDoubleValidator, &sipClass_TQDoubleValidator, -1, 95}, + {sipName_TQIntValidator, &sipClass_TQIntValidator, -1, 96}, #if QT_VERSION >= 0x030000 - {sipName_QRegExpValidator, &sipClass_QRegExpValidator, -1, -1}, + {sipName_TQRegExpValidator, &sipClass_TQRegExpValidator, -1, -1}, #else {NULL, NULL, -1, -1}, #endif - {sipName_QTextDrag, &sipClass_QTextDrag, -1, 98}, - {sipName_QStoredDrag, &sipClass_QStoredDrag, 101, 99}, + {sipName_TQTextDrag, &sipClass_TQTextDrag, -1, 98}, + {sipName_TQStoredDrag, &sipClass_TQStoredDrag, 101, 99}, #if QT_VERSION >= 210 && defined(SIP_FEATURE_TQt_ICONVIEW) && defined(SIP_FEATURE_TQt_DRAGANDDROP) - {sipName_QIconDrag, &sipClass_QIconDrag, -1, 100}, + {sipName_TQIconDrag, &sipClass_TQIconDrag, -1, 100}, #else {NULL, NULL, -1, 100}, #endif - {sipName_QImageDrag, &sipClass_QImageDrag, -1, -1}, + {sipName_TQImageDrag, &sipClass_TQImageDrag, -1, -1}, #if QT_VERSION >= 210 - {sipName_QColorDrag, &sipClass_QColorDrag, -1, 102}, + {sipName_TQColorDrag, &sipClass_TQColorDrag, -1, 102}, #else {NULL, NULL, -1, 102}, #endif - {sipName_QUriDrag, &sipClass_QUriDrag, -1, -1}, - {sipName_QCommonStyle, &sipClass_QCommonStyle, 104, -1}, + {sipName_TQUriDrag, &sipClass_TQUriDrag, -1, -1}, + {sipName_TQCommonStyle, &sipClass_TQCommonStyle, 104, -1}, #if defined(SIP_FEATURE_TQt_STYLE_WINDOWS) - {sipName_QWindowsStyle, &sipClass_QWindowsStyle, 106, 105}, + {sipName_TQWindowsStyle, &sipClass_TQWindowsStyle, 106, 105}, #else {NULL, NULL, -1, 105}, #endif #if defined(SIP_FEATURE_TQt_STYLE_MOTIF) - {sipName_QMotifStyle, &sipClass_QMotifStyle, 107, -1}, + {sipName_TQMotifStyle, &sipClass_TQMotifStyle, 107, -1}, #else {NULL, NULL, -1, -1}, #endif #if defined(SIP_FEATURE_TQt_STYLE_PLATINUM) - {sipName_QPlatinumStyle, &sipClass_QPlatinumStyle, -1, 110}, + {sipName_TQPlatinumStyle, &sipClass_TQPlatinumStyle, -1, 110}, #else {NULL, NULL, -1, 110}, #endif #if defined(SIP_FEATURE_TQt_STYLE_CDE) - {sipName_QCDEStyle, &sipClass_QCDEStyle, -1, 108}, + {sipName_TQCDEStyle, &sipClass_TQCDEStyle, -1, 108}, #else {NULL, NULL, -1, 108}, #endif #if QT_VERSION >= 220 && defined(SIP_FEATURE_TQt_STYLE_MOTIFPLUS) - {sipName_QMotifPlusStyle, &sipClass_QMotifPlusStyle, -1, 109}, + {sipName_TQMotifPlusStyle, &sipClass_TQMotifPlusStyle, -1, 109}, #else {NULL, NULL, -1, 109}, #endif #if QT_VERSION >= 220 && defined(SIP_FEATURE_TQt_STYLE_SGI) - {sipName_QSGIStyle, &sipClass_QSGIStyle, -1, -1}, + {sipName_TQSGIStyle, &sipClass_TQSGIStyle, -1, -1}, #else {NULL, NULL, -1, -1}, #endif #if defined(PYQT_STYLE_WINDOWSXP) - {sipName_QWindowsXPStyle, &sipClass_QWindowsXPStyle, -1, -1}, + {sipName_TQWindowsXPStyle, &sipClass_TQWindowsXPStyle, -1, -1}, #else {NULL, NULL, -1, -1}, #endif @@ -562,7 +562,7 @@ public: while (o) { bool remove = TRUE; - PyObject *pyo = sipConvertFromInstance(o, sipClass_QObject, 0); + PyObject *pyo = sipConvertFromInstance(o, sipClass_TQObject, 0); if (pyo) { @@ -711,72 +711,72 @@ public: // must be sorted by name. static sipStringTypeClassMap map[] = { - {sipName_QAccel, &sipClass_QAccel}, - {sipName_QApplication, &sipClass_QApplication}, - {sipName_QBoxLayout, &sipClass_QBoxLayout}, - {sipName_QButton, &sipClass_QButton}, - {sipName_QButtonGroup, &sipClass_QButtonGroup}, - {sipName_QCheckBox, &sipClass_QCheckBox}, + {sipName_TQAccel, &sipClass_TQAccel}, + {sipName_TQApplication, &sipClass_TQApplication}, + {sipName_TQBoxLayout, &sipClass_TQBoxLayout}, + {sipName_TQButton, &sipClass_TQButton}, + {sipName_TQButtonGroup, &sipClass_TQButtonGroup}, + {sipName_TQCheckBox, &sipClass_TQCheckBox}, #if defined(SIP_FEATURE_TQt_CLIPBOARD) - {sipName_QClipboard, &sipClass_QClipboard}, + {sipName_TQClipboard, &sipClass_TQClipboard}, #endif - {sipName_QComboBox, &sipClass_QComboBox}, - {sipName_QDialog, &sipClass_QDialog}, - {sipName_QDoubleValidator, &sipClass_QDoubleValidator}, - {sipName_QDragObject, &sipClass_QDragObject}, + {sipName_TQComboBox, &sipClass_TQComboBox}, + {sipName_TQDialog, &sipClass_TQDialog}, + {sipName_TQDoubleValidator, &sipClass_TQDoubleValidator}, + {sipName_TQDragObject, &sipClass_TQDragObject}, #if defined(SIP_FEATURE_TQt_FILEDIALOG) - {sipName_QFileDialog, &sipClass_QFileDialog}, - {sipName_QFileIconProvider, &sipClass_QFileIconProvider}, -#endif - {sipName_QFrame, &sipClass_QFrame}, - {sipName_QGridLayout, &sipClass_QGridLayout}, - {sipName_QGroupBox, &sipClass_QGroupBox}, - {sipName_QHBoxLayout, &sipClass_QHBoxLayout}, - {sipName_QHeader, &sipClass_QHeader}, - {sipName_QImageDrag, &sipClass_QImageDrag}, - {sipName_QIntValidator, &sipClass_QIntValidator}, - {sipName_QLCDNumber, &sipClass_QLCDNumber}, - {sipName_QLabel, &sipClass_QLabel}, - {sipName_QLayout, &sipClass_QLayout}, - {sipName_QLineEdit, &sipClass_QLineEdit}, - {sipName_QListBox, &sipClass_QListBox}, - {sipName_QListView, &sipClass_QListView}, - {sipName_QMainWindow, &sipClass_QMainWindow}, - {sipName_QMenuBar, &sipClass_QMenuBar}, + {sipName_TQFileDialog, &sipClass_TQFileDialog}, + {sipName_TQFileIconProvider, &sipClass_TQFileIconProvider}, +#endif + {sipName_TQFrame, &sipClass_TQFrame}, + {sipName_TQGridLayout, &sipClass_TQGridLayout}, + {sipName_TQGroupBox, &sipClass_TQGroupBox}, + {sipName_TQHBoxLayout, &sipClass_TQHBoxLayout}, + {sipName_TQHeader, &sipClass_TQHeader}, + {sipName_TQImageDrag, &sipClass_TQImageDrag}, + {sipName_TQIntValidator, &sipClass_TQIntValidator}, + {sipName_TQLCDNumber, &sipClass_TQLCDNumber}, + {sipName_TQLabel, &sipClass_TQLabel}, + {sipName_TQLayout, &sipClass_TQLayout}, + {sipName_TQLineEdit, &sipClass_TQLineEdit}, + {sipName_TQListBox, &sipClass_TQListBox}, + {sipName_TQListView, &sipClass_TQListView}, + {sipName_TQMainWindow, &sipClass_TQMainWindow}, + {sipName_TQMenuBar, &sipClass_TQMenuBar}, #if defined(SIP_FEATURE_TQt_MESSAGEBOX) - {sipName_QMessageBox, &sipClass_QMessageBox}, + {sipName_TQMessageBox, &sipClass_TQMessageBox}, #endif - {sipName_QMultiLineEdit, &sipClass_QMultiLineEdit}, - {sipName_QPopupMenu, &sipClass_QPopupMenu}, + {sipName_TQMultiLineEdit, &sipClass_TQMultiLineEdit}, + {sipName_TQPopupMenu, &sipClass_TQPopupMenu}, #if defined(WS_X11) && defined(SIP_FEATURE_TQt_PRINTDIALOG) - {sipName_QPrintDialog, &sipClass_QPrintDialog}, + {sipName_TQPrintDialog, &sipClass_TQPrintDialog}, #endif - {sipName_QProgressBar, &sipClass_QProgressBar}, + {sipName_TQProgressBar, &sipClass_TQProgressBar}, #if defined(SIP_FEATURE_TQt_PROGRESSDIALOG) - {sipName_QProgressDialog, &sipClass_QProgressDialog}, -#endif - {sipName_QPushButton, &sipClass_QPushButton}, - {sipName_QRadioButton, &sipClass_QRadioButton}, - {sipName_QScrollBar, &sipClass_QScrollBar}, - {sipName_QScrollView, &sipClass_QScrollView}, - {sipName_QSlider, &sipClass_QSlider}, - {sipName_QSocketNotifier, &sipClass_QSocketNotifier}, - {sipName_QSpinBox, &sipClass_QSpinBox}, + {sipName_TQProgressDialog, &sipClass_TQProgressDialog}, +#endif + {sipName_TQPushButton, &sipClass_TQPushButton}, + {sipName_TQRadioButton, &sipClass_TQRadioButton}, + {sipName_TQScrollBar, &sipClass_TQScrollBar}, + {sipName_TQScrollView, &sipClass_TQScrollView}, + {sipName_TQSlider, &sipClass_TQSlider}, + {sipName_TQSocketNotifier, &sipClass_TQSocketNotifier}, + {sipName_TQSpinBox, &sipClass_TQSpinBox}, #if defined(SIP_FEATURE_TQt_SPLITTER) - {sipName_QSplitter, &sipClass_QSplitter}, -#endif - {sipName_QStatusBar, &sipClass_QStatusBar}, - {sipName_QStoredDrag, &sipClass_QStoredDrag}, - {sipName_QTabBar, &sipClass_QTabBar}, - {sipName_QTextDrag, &sipClass_QTextDrag}, - {sipName_QTimer, &sipClass_QTimer}, - {sipName_QToolBar, &sipClass_QToolBar}, - {sipName_QToolButton, &sipClass_QToolButton}, - {sipName_QToolTipGroup, &sipClass_QToolTipGroup}, - {sipName_QVBoxLayout, &sipClass_QVBoxLayout}, - {sipName_QValidator, &sipClass_QValidator}, - {sipName_QWidget, &sipClass_QWidget}, - {sipName_QWidgetStack, &sipClass_QWidgetStack} + {sipName_TQSplitter, &sipClass_TQSplitter}, +#endif + {sipName_TQStatusBar, &sipClass_TQStatusBar}, + {sipName_TQStoredDrag, &sipClass_TQStoredDrag}, + {sipName_TQTabBar, &sipClass_TQTabBar}, + {sipName_TQTextDrag, &sipClass_TQTextDrag}, + {sipName_TQTimer, &sipClass_TQTimer}, + {sipName_TQToolBar, &sipClass_TQToolBar}, + {sipName_TQToolButton, &sipClass_TQToolButton}, + {sipName_TQToolTipGroup, &sipClass_TQToolTipGroup}, + {sipName_TQVBoxLayout, &sipClass_TQVBoxLayout}, + {sipName_TQValidator, &sipClass_TQValidator}, + {sipName_TQWidget, &sipClass_TQWidget}, + {sipName_TQWidgetStack, &sipClass_TQWidgetStack} }; sipClass = sipMapStringToClass(sipCpp -> className(),map,sizeof (map)/sizeof (map[0])); @@ -1219,7 +1219,7 @@ static sipWrapperType pyqtWrapper_Type = { Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HAVE_GC, /* tp_flags */ 0, /* tp_doc */ (traverseproc)pyqtWrapper_traverse, /* tp_traverse */ - (intquiry)pyqtWrapper_clear, /* tp_clear */ + (inquiry)pyqtWrapper_clear, /* tp_clear */ 0, /* tp_richcompare */ 0, /* tp_weaklistoffset */ 0, /* tp_iter */ @@ -1576,7 +1576,7 @@ bool UniversalSlot::qt_invoke(int id, TQUObject *qargs) case qvariant_sat: case qvariantp_sat: - arg = sipConvertFromInstance((void *)&static_QUType_TQVariant.get(qargs),sipClass_QVariant,0); + arg = sipConvertFromInstance((void *)&static_QUType_TQVariant.get(qargs),sipClass_TQVariant,0); break; case pyobject_sat: @@ -1649,7 +1649,7 @@ static void *sipTQtCreateUniversalSlot(sipWrapper *tx, const char *sig, // universal slot a child of the transmitter. This doesn't work as // expected because TQWidget destroys its children before emitting the // destroyed signal.) - if (tx && PyObject_TypeCheck((PyObject *)tx, (PyTypeObject *)sipClass_QObject)) + if (tx && PyObject_TypeCheck((PyObject *)tx, (PyTypeObject *)sipClass_TQObject)) qtx = reinterpret_cast<TQObject *>(conn.sc_transmitter); return new UniversalSlot(qtx, &conn, member); @@ -2185,7 +2185,7 @@ int pyqt3EmitSignal(PyObject *self, const char *sig, PyObject *sigargs) { // Don't do anything if signals are blocked. TQt signals would be blocked // anyway, but this blocks Python signals as well. - void *tx = sipGetCppPtr((sipSimpleWrapper *)self, sipType_QObject); + void *tx = sipGetCppPtr((sipSimpleWrapper *)self, sipType_TQObject); if (!tx) return 0; @@ -2278,7 +2278,7 @@ PyObject *pyqt3GetSender() // sender, so use it instead. if (UniversalSlot::lastSender) { - sender = sipConvertFromType(UniversalSlot::lastSender, sipType_QObject, + sender = sipConvertFromType(UniversalSlot::lastSender, sipType_TQObject, NULL); } else diff --git a/sip/qt/qobjectlist.sip b/sip/qt/qobjectlist.sip index 2c528b0..eb323df 100644 --- a/sip/qt/qobjectlist.sip +++ b/sip/qt/qobjectlist.sip @@ -50,7 +50,7 @@ return type of a function or the type of an argument, a Python list of { PyObject *inst; - if ((inst = sipConvertFromInstance(obj,sipClass_QObject,sipTransferObj)) == NULL || PyList_Append(pl,inst) < 0) + if ((inst = sipConvertFromInstance(obj,sipClass_TQObject,sipTransferObj)) == NULL || PyList_Append(pl,inst) < 0) { Py_XDECREF(inst); Py_DECREF(pl); @@ -74,7 +74,7 @@ return type of a function or the type of an argument, a Python list of return 0; for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) - if (!sipCanConvertToInstance(PyList_GET_ITEM(sipPy,i),sipClass_QObject,0)) + if (!sipCanConvertToInstance(PyList_GET_ITEM(sipPy,i),sipClass_TQObject,0)) return 0; return 1; @@ -89,7 +89,7 @@ return type of a function or the type of an argument, a Python list of // We apply the transfer to the list itself, not the elements. // Note that any temporary element will never be destroyed. // There is nothing that can be done about this. - qobj = reinterpret_cast<TQObject *>(sipConvertToInstance(PyList_GET_ITEM(sipPy,i),sipClass_QObject,0,0,0,sipIsErr)); + qobj = reinterpret_cast<TQObject *>(sipConvertToInstance(PyList_GET_ITEM(sipPy,i),sipClass_TQObject,0,0,0,sipIsErr)); if (*sipIsErr) { diff --git a/sip/qt/qstring.sip b/sip/qt/qstring.sip index 3b49341..0ce1cbf 100644 --- a/sip/qt/qstring.sip +++ b/sip/qt/qstring.sip @@ -878,14 +878,14 @@ static TQString *PyUnicodeStringToTQString(PyObject *py) #if PY_VERSION_HEX >= 0x01060000 PyUnicode_Check(sipPy) || #endif - sipCanConvertToInstance(sipPy,sipClass_QString,SIP_NO_CONVERTORS)); + sipCanConvertToInstance(sipPy,sipClass_TQString,SIP_NO_CONVERTORS)); *sipCppPtr = PyUnicodeStringToTQString(sipPy); if (*sipCppPtr) return sipGetState(sipTransferObj); - *sipCppPtr = reinterpret_cast<TQString *>(sipConvertToInstance(sipPy,sipClass_QString,sipTransferObj,SIP_NO_CONVERTORS,0,sipIsErr)); + *sipCppPtr = reinterpret_cast<TQString *>(sipConvertToInstance(sipPy,sipClass_TQString,sipTransferObj,SIP_NO_CONVERTORS,0,sipIsErr)); return 0; %End @@ -1061,7 +1061,7 @@ public: if (sipIsErr == NULL) return (PyString_Check(sipPy) || - sipCanConvertToInstance(sipPy,sipClass_QString,SIP_NO_CONVERTORS)); + sipCanConvertToInstance(sipPy,sipClass_TQString,SIP_NO_CONVERTORS)); if (PyString_Check(sipPy)) { @@ -1070,7 +1070,7 @@ public: return sipGetState(sipTransferObj); } - *sipCppPtr = reinterpret_cast<TQString *>(sipConvertToInstance(sipPy,sipClass_QString,sipTransferObj,SIP_NO_CONVERTORS,0,sipIsErr)); + *sipCppPtr = reinterpret_cast<TQString *>(sipConvertToInstance(sipPy,sipClass_TQString,sipTransferObj,SIP_NO_CONVERTORS,0,sipIsErr)); return 0; %End diff --git a/sip/qt/qtabbar.sip b/sip/qt/qtabbar.sip index 908011d..f3c8371 100644 --- a/sip/qt/qtabbar.sip +++ b/sip/qt/qtabbar.sip @@ -236,7 +236,7 @@ protected: // Convert the list. for (TQListIterator<TQTab> it(*tl); (tab = it.current()) != NULL; ++it) { - PyObject *inst = sipBuildResult(&sipIsErr,"C",tab,sipClass_QTab,NULL); + PyObject *inst = sipBuildResult(&sipIsErr,"C",tab,sipClass_TQTab,NULL); if (sipIsErr) break; diff --git a/sip/qt/qwidgetlist.sip b/sip/qt/qwidgetlist.sip index 2b70a2b..804eef0 100644 --- a/sip/qt/qwidgetlist.sip +++ b/sip/qt/qwidgetlist.sip @@ -50,7 +50,7 @@ instances is used instead. { PyObject *inst; - if ((inst = sipConvertFromInstance(obj,sipClass_QWidget,sipTransferObj)) == NULL || PyList_Append(pl,inst) < 0) + if ((inst = sipConvertFromInstance(obj,sipClass_TQWidget,sipTransferObj)) == NULL || PyList_Append(pl,inst) < 0) { Py_XDECREF(inst); Py_DECREF(pl); @@ -74,7 +74,7 @@ instances is used instead. return 0; for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) - if (!sipCanConvertToInstance(PyList_GET_ITEM(sipPy,i),sipClass_QWidget,0)) + if (!sipCanConvertToInstance(PyList_GET_ITEM(sipPy,i),sipClass_TQWidget,0)) return 0; return 1; @@ -89,7 +89,7 @@ instances is used instead. // We apply the transfer to the list itself, not the elements. // Note that any temporary element will never be destroyed. // There is nothing that can be done about this. - qw = reinterpret_cast<TQWidget *>(sipConvertToInstance(PyList_GET_ITEM(sipPy,i),sipClass_QWidget,0,0,0,sipIsErr)); + qw = reinterpret_cast<TQWidget *>(sipConvertToInstance(PyList_GET_ITEM(sipPy,i),sipClass_TQWidget,0,0,0,sipIsErr)); if (*sipIsErr) { |