Move QScopedLoopLevelCounter to qthread_p.h

... and use it in QCoreApplication::notifyInterna() instead of
"reinventing" the wheel there. The constructor and destructor for
QScopedLoopLevelCounter are inline, so the class does not need to be
exported.

Change-Id: I7af5a4ef0987f277bcc50c1057f3c74152f3d79d
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>

1 files changed, 1 insertions, 10 deletions

diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
index c30f6135a9..2a80d39620 100644
--- a/src/corelib/kernel/qcoreapplication.cpp
+++ b/src/corelib/kernel/qcoreapplication.cpp
@@ -809,16 +809,7 @@ bool QCoreApplication::notifyInternal(QObject *receiver, QEvent *event)
     // call overhead.
     QObjectPrivate *d = receiver->d_func();
     QThreadData *threadData = d->threadData;
-
-    // Exception-safety without try/catch
-    struct Incrementer {
-        int &variable;
-        inline Incrementer(int &variable) : variable(variable)
-        { ++variable; }
-        inline ~Incrementer()
-        { --variable; }
-    };
-    Incrementer inc(threadData->loopLevel);
+    QScopedLoopLevelCounter loopLevelCounter(threadData);
 
 #ifdef QT_JAMBI_BUILD
     int deleteWatch = 0;