make use of QMutexLocker in QCoreApplication

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/src/core/kernel/qcoreapplication.cpp b/src/core/kernel/qcoreapplication.cpp
index 2bd6024..451af57 100644 (file)
--- a/src/core/kernel/qcoreapplication.cpp
+++ b/src/core/kernel/qcoreapplication.cpp
@@ -76,21 +76,6 @@
 
 QT_BEGIN_NAMESPACE
 
-class QMutexUnlocker
-{
-public:
-    inline explicit QMutexUnlocker(QMutex *m)
-        : mtx(m)
-    { }
-    inline ~QMutexUnlocker() { unlock(); }
-    inline void unlock() { if (mtx) mtx->unlock(); mtx = 0; }
-
-private:
-    Q_DISABLE_COPY(QMutexUnlocker)
-
-    QMutex *mtx;
-};
-
 QString QCoreApplicationPrivate::appName() const
 {
     QMutexLocker locker(QMutexPool::globalInstanceGet(&applicationName));
@@ -997,7 +982,7 @@ void QCoreApplication::postEvent(QObject *receiver, QEvent *event, int priority)
     }
 
     // lock the post event mutex
-    data->postEventList.mutex.lock();
+    QMutexLocker locker(&data->postEventList.mutex);
 
     // if object has moved to another thread, follow it
     while (data != *pdata) {
@@ -1013,8 +998,6 @@ void QCoreApplication::postEvent(QObject *receiver, QEvent *event, int priority)
         data->postEventList.mutex.lock();
     }
 
-    QMutexUnlocker locker(&data->postEventList.mutex);
-
     // if this is one of the compressible events, do compression
     if (receiver->d_func()->postedEvents
         && self && self->compressEvent(event, receiver, &data->postEventList)) {

diff --git a/src/core/kernel/qobjectdefs.h b/src/core/kernel/qobjectdefs.h
index 2ed3386..5c0369f 100644 (file)
--- a/src/core/kernel/qobjectdefs.h
+++ b/src/core/kernel/qobjectdefs.h
@@ -231,7 +231,6 @@ class QMetaEnum;
 class QMetaProperty;
 class QMetaClassInfo;
 
-
 class Q_CORE_EXPORT QGenericArgument
 {
 public:
@@ -270,7 +269,6 @@ public:
         {}
 };
 
-
 template <typename T>
 class QReturnArgument: public QGenericReturnArgument
 {