1 files changed, 0 insertions, 40 deletions
diff --git a/src/dbus/qdbusthreaddebug_p.h b/src/dbus/qdbusthreaddebug_p.h
index 96f389fa49..ad0984e26c 100644
--- a/src/dbus/qdbusthreaddebug_p.h
+++ b/src/dbus/qdbusthreaddebug_p.h
@@ -95,17 +95,6 @@ enum ThreadAction {
     PendingCallBlockAction = 28,
     SendMessageAction = 29,
     HuntAndEmitAction = 30,
-
-    AddTimeoutAction = 50,
-    RealAddTimeoutAction = 51,
-    RemoveTimeoutAction = 52,
-    KillTimerAction = 58,
-    TimerEventAction = 59,
-    AddWatchAction = 60,
-    RemoveWatchAction = 61,
-    ToggleWatchAction = 62,
-    SocketReadAction = 63,
-    SocketWriteAction = 64
 };
 
 struct QDBusLockerBase
@@ -176,35 +165,6 @@ struct QDBusWriteLocker: QDBusLockerBase
     }
 };
 
-struct QDBusMutexLocker: QDBusLockerBase
-{
-    QDBusConnectionPrivate *self;
-    QMutex *mutex;
-    ThreadAction action;
-    inline QDBusMutexLocker(ThreadAction a, QDBusConnectionPrivate *s,
-                            QMutex *m)
-        : self(s), mutex(m), action(a)
-    {
-        reportThreadAction(action, BeforeLock, self);
-        mutex->lock();
-        reportThreadAction(action, AfterLock, self);
-    }
-
-    inline ~QDBusMutexLocker()
-    {
-        reportThreadAction(action, BeforeUnlock, self);
-        mutex->unlock();
-        reportThreadAction(action, AfterUnlock, self);
-    }
-};
-
-struct QDBusDispatchLocker: QDBusMutexLocker
-{
-    inline QDBusDispatchLocker(ThreadAction a, QDBusConnectionPrivate *s)
-        : QDBusMutexLocker(a, s, &s->dispatchLock)
-    { }
-};
-
 #if QDBUS_THREAD_DEBUG
 # define SEM_ACQUIRE(action, sem)                                       \
     do {                                                                \