From 580d7f28ca93b053daa23250bdd404f0ddd7171e Mon Sep 17 00:00:00 2001
From: Olivier Goffart <olivier.goffart@nokia.com>
Date: Fri, 23 Apr 2010 13:44:00 +0200
Subject: QObjectPrivate::deleteWatch, and inEventHandler are only used by
 jambi

so #ifdef them out.

Reviewed-by: Brad
---
 src/corelib/kernel/qobject.cpp | 17 ++++++++++++-----
 src/corelib/kernel/qobject.h   |  2 +-
 src/corelib/kernel/qobject_p.h |  4 ++++
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
index 0544a5a..ef1caef 100644
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
@@ -149,9 +149,11 @@ QObjectPrivate::QObjectPrivate(int version)
     postedEvents = 0;
     extraData = 0;
     connectedSignals[0] = connectedSignals[1] = 0;
-    inEventHandler = false;
     inThreadChangeEvent = false;
+#ifdef QT_JAMBI_BUILD
+    inEventHandler = false;
     deleteWatch = 0;
+#endif
     metaObject = 0;
     hasGuards = false;
 }
@@ -159,8 +161,10 @@ QObjectPrivate::QObjectPrivate(int version)
 QObjectPrivate::~QObjectPrivate()
 {
     delete static_cast<QAbstractDynamicMetaObject*>(metaObject);
+#ifdef QT_JAMBI_BUILD
     if (deleteWatch)
         *deleteWatch = 1;
+#endif
 #ifndef QT_NO_USERDATA
     if (extraData)
         qDeleteAll(extraData->userData);
@@ -169,6 +173,7 @@ QObjectPrivate::~QObjectPrivate()
 }
 
 
+#ifdef QT_JAMBI_BUILD
 int *QObjectPrivate::setDeleteWatch(QObjectPrivate *d, int *w) {
     int *old = d->deleteWatch;
     d->deleteWatch = w;
@@ -183,10 +188,7 @@ void QObjectPrivate::resetDeleteWatch(QObjectPrivate *d, int *oldWatch, int dele
     if (oldWatch)
         *oldWatch = deleteWatch;
 }
-
-
-
-
+#endif
 
 #ifdef QT3_SUPPORT
 void QObjectPrivate::sendPendingChildInsertedEvents()
@@ -1192,7 +1194,9 @@ bool QObject::event(QEvent *e)
 
     case QEvent::MetaCall:
         {
+#ifdef QT_JAMBI_BUILD
             d_func()->inEventHandler = false;
+#endif
             QMetaCallEvent *mce = static_cast<QMetaCallEvent*>(e);
             QObjectPrivate::Sender currentSender;
             currentSender.sender = const_cast<QObject*>(mce->sender());
@@ -1510,11 +1514,14 @@ void QObjectPrivate::setThreadData_helper(QThreadData *currentData, QThreadData
         currentSender->ref = 0;
     currentSender = 0;
 
+#ifdef QT_JAMBI_BUILD
     // the current event thread also shouldn't restore the delete watch
     inEventHandler = false;
+
     if (deleteWatch)
         *deleteWatch = 1;
     deleteWatch = 0;
+#endif
 
     // set new thread data
     targetData->ref();
diff --git a/src/corelib/kernel/qobject.h b/src/corelib/kernel/qobject.h
index 1b613a6..44e7ce5 100644
--- a/src/corelib/kernel/qobject.h
+++ b/src/corelib/kernel/qobject.h
@@ -109,7 +109,7 @@ public:
     uint ownObjectName : 1;
     uint sendChildEvents : 1;
     uint receiveChildEvents : 1;
-    uint inEventHandler : 1;
+    uint inEventHandler : 1; //only used if QT_JAMBI_BUILD
     uint inThreadChangeEvent : 1;
     uint hasGuards : 1; //true iff there is one or more QPointer attached to this object
     uint unused : 22;
diff --git a/src/corelib/kernel/qobject_p.h b/src/corelib/kernel/qobject_p.h
index 4800e6a..35b4540 100644
--- a/src/corelib/kernel/qobject_p.h
+++ b/src/corelib/kernel/qobject_p.h
@@ -161,8 +161,10 @@ public:
     static inline void resetCurrentSender(QObject *receiver,
                                    Sender *currentSender,
                                    Sender *previousSender);
+#ifdef QT_JAMBI_BUILD
     static int *setDeleteWatch(QObjectPrivate *d, int *newWatch);
     static void resetDeleteWatch(QObjectPrivate *d, int *oldWatch, int deleteWatch);
+#endif
     static void clearGuards(QObject *);
 
     static QObjectPrivate *get(QObject *o) {
@@ -200,7 +202,9 @@ public:
     // these objects are all used to indicate that a QObject was deleted
     // plus QPointer, which keeps a separate list
     QAtomicPointer<QtSharedPointer::ExternalRefCountData> sharedRefcount;
+#ifdef QT_JAMBI_BUILD
     int *deleteWatch;
+#endif
 };
 
 
-- 
cgit v0.12