1 files changed, 1 insertions, 30 deletions
diff --git a/src/corelib/kernel/qobject_p.h b/src/corelib/kernel/qobject_p.h
index 20e3da1..3b59abb 100644
--- a/src/corelib/kernel/qobject_p.h
+++ b/src/corelib/kernel/qobject_p.h
@@ -60,7 +60,6 @@
 #include "QtCore/qvector.h"
 #include "QtCore/qreadwritelock.h"
 #include "QtCore/qvariant.h"
-#include "private/qguard_p.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -100,13 +99,12 @@ class Q_CORE_EXPORT QObjectPrivate : public QObjectData
 public:
     struct ExtraData
     {
-        ExtraData() : objectGuards(0) {}
+        ExtraData() {}
 #ifndef QT_NO_USERDATA
         QVector<QObjectUserData *> userData;
 #endif
         QList<QByteArray> propertyNames;
         QList<QVariant> propertyValues;
-        QGuard<QObject> *objectGuards; //linked list handle of QGuards
     };
 
     struct Connection
@@ -224,33 +222,6 @@ inline bool QObjectPrivate::isSignalConnected(uint signal_index) const
 }
 
 
-inline void q_guard_addGuard(QGuard<QObject> *g)
-{
-    QObjectPrivate *p = QObjectPrivate::get(g->o);
-    if (p->wasDeleted) {
-        qWarning("QGuard: cannot add guard to deleted object");
-        g->o = 0;
-        return;
-    }
-
-    if (!p->extraData)
-        p->extraData = new QObjectPrivate::ExtraData;
-
-    g->next = p->extraData->objectGuards;
-    p->extraData->objectGuards = g;
-    g->prev = &p->extraData->objectGuards;
-    if (g->next)
-        g->next->prev = &g->next;
-}
-
-inline void q_guard_removeGuard(QGuard<QObject> *g)
-{
-    if (g->next) g->next->prev = g->prev;
-    *g->prev = g->next;
-    g->next = 0;
-    g->prev = 0;
-}
-
 Q_DECLARE_TYPEINFO(QObjectPrivate::Connection, Q_MOVABLE_TYPE);
 Q_DECLARE_TYPEINFO(QObjectPrivate::Sender, Q_MOVABLE_TYPE);