QObject: replace _q_reregisterTimers with a lambda

- Pass the QList by value, no heap allocation and no plain new/delete
- A lambda means that there isn't runtime string-based lookup to find
  the member method in QObjectPrivate

The code is only a couple of lines and used in a single place, so might
as well move the code from _q_reregisterTimers to the local lambda.

Modify tst_moc to account for the numer of methods in QObjectPrivate
changing. The test had hardcoded numbers.

Change-Id: I07906fc7138b8e601e4695f8d2de1b5fdd88449c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

1 files changed, 16 insertions, 14 deletions

diff --git a/tests/auto/tools/moc/tst_moc.cpp b/tests/auto/tools/moc/tst_moc.cpp
index 0cd33288fc..58bc00b055 100644
--- a/tests/auto/tools/moc/tst_moc.cpp
+++ b/tests/auto/tools/moc/tst_moc.cpp
@@ -1589,41 +1589,43 @@ void tst_Moc::specifyMetaTagsFromCmdline() {
 
 void tst_Moc::invokable()
 {
+    const int fooIndex = 4;
     {
         const QMetaObject &mobj = InvokableBeforeReturnType::staticMetaObject;
-        QCOMPARE(mobj.methodCount(), 6);
-        QCOMPARE(mobj.method(5).methodSignature(), QByteArray("foo()"));
+        QCOMPARE(mobj.methodCount(), 5);
+        QCOMPARE(mobj.method(fooIndex).methodSignature(), QByteArray("foo()"));
     }
 
     {
         const QMetaObject &mobj = InvokableBeforeInline::staticMetaObject;
-        QCOMPARE(mobj.methodCount(), 7);
-        QCOMPARE(mobj.method(5).methodSignature(), QByteArray("foo()"));
-        QCOMPARE(mobj.method(6).methodSignature(), QByteArray("bar()"));
+        QCOMPARE(mobj.methodCount(), 6);
+        QCOMPARE(mobj.method(fooIndex).methodSignature(), QByteArray("foo()"));
+        QCOMPARE(mobj.method(fooIndex + 1).methodSignature(), QByteArray("bar()"));
     }
 }
 
 void tst_Moc::singleFunctionKeywordSignalAndSlot()
 {
+    const int mySignalIndex = 4;
     {
         const QMetaObject &mobj = SingleFunctionKeywordBeforeReturnType::staticMetaObject;
-        QCOMPARE(mobj.methodCount(), 7);
-        QCOMPARE(mobj.method(5).methodSignature(), QByteArray("mySignal()"));
-        QCOMPARE(mobj.method(6).methodSignature(), QByteArray("mySlot()"));
+        QCOMPARE(mobj.methodCount(), 6);
+        QCOMPARE(mobj.method(mySignalIndex).methodSignature(), QByteArray("mySignal()"));
+        QCOMPARE(mobj.method(mySignalIndex + 1).methodSignature(), QByteArray("mySlot()"));
     }
 
     {
         const QMetaObject &mobj = SingleFunctionKeywordBeforeInline::staticMetaObject;
-        QCOMPARE(mobj.methodCount(), 7);
-        QCOMPARE(mobj.method(5).methodSignature(), QByteArray("mySignal()"));
-        QCOMPARE(mobj.method(6).methodSignature(), QByteArray("mySlot()"));
+        QCOMPARE(mobj.methodCount(), 6);
+        QCOMPARE(mobj.method(mySignalIndex).methodSignature(), QByteArray("mySignal()"));
+        QCOMPARE(mobj.method(mySignalIndex + 1).methodSignature(), QByteArray("mySlot()"));
     }
 
     {
         const QMetaObject &mobj = SingleFunctionKeywordAfterInline::staticMetaObject;
-        QCOMPARE(mobj.methodCount(), 7);
-        QCOMPARE(mobj.method(5).methodSignature(), QByteArray("mySignal()"));
-        QCOMPARE(mobj.method(6).methodSignature(), QByteArray("mySlot()"));
+        QCOMPARE(mobj.methodCount(), 6);
+        QCOMPARE(mobj.method(mySignalIndex).methodSignature(), QByteArray("mySignal()"));
+        QCOMPARE(mobj.method(mySignalIndex + 1).methodSignature(), QByteArray("mySlot()"));
     }
 }