summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2009-08-03 16:43:54 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2009-08-04 14:29:33 (GMT)
commit9081e1e65681aab1c1d8a913b1a493fe1d37e837 (patch)
treed6f56f23bcf91d9882cd70757a8b3d10eee299c6
parent6d9143ebffc10a58d8d62e57e3378adae4af92cd (diff)
downloadQt-9081e1e65681aab1c1d8a913b1a493fe1d37e837.zip
Qt-9081e1e65681aab1c1d8a913b1a493fe1d37e837.tar.gz
Qt-9081e1e65681aab1c1d8a913b1a493fe1d37e837.tar.bz2
Clean up old Jambi code: there's a way of getting the QObject d-pointer
-rw-r--r--src/corelib/kernel/qobject.cpp9
1 files changed, 1 insertions, 8 deletions
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
index 7bf209a..c989d15 100644
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
@@ -3897,19 +3897,12 @@ QDebug operator<<(QDebug dbg, const QObject *o) {
Synonym for QList<QObject *>.
*/
-#ifdef QT_JAMBI_BUILD
-class QDPtrAccessor : public QObject {
-public:
- QObjectData *d() const { return d_ptr; }
-};
-#endif
-
void qDeleteInEventHandler(QObject *o)
{
#ifdef QT_JAMBI_BUILD
if (!o)
return;
- ((QDPtrAccessor *) o)->d()->inEventHandler = false;
+ QObjectPrivate::get(o)->inEventHandler = false;
#endif
delete o;
}