Moc: simplify showing a warning

Instead of changing the "index" member then restoring it, add a
symbolAt() method to get the Symbol in question, and pass it to
new warning() overload.

Change-Id: Ie84a6cf4d837f4ed694f617100e9556c2fc2eea3
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

1 files changed, 2 insertions, 5 deletions

diff --git a/src/tools/moc/moc.cpp b/src/tools/moc/moc.cpp
index e067158784..b6671f6e12 100644
--- a/src/tools/moc/moc.cpp
+++ b/src/tools/moc/moc.cpp
@@ -1931,13 +1931,10 @@ void Moc::checkProperties(ClassDef *cdef)
         }
 
         if (p.read.isEmpty() && p.member.isEmpty() && p.bind.isEmpty()) {
-            const qsizetype rewind = index;
-            if (p.location >= 0)
-                index = p.location;
             QByteArray msg = "Property declaration " + p.name + " has neither an associated QProperty<> member"
                              ", nor a READ accessor function nor an associated MEMBER variable. The property will be invalid.";
-            warning(msg.constData());
-            index = rewind;
+            const auto &sym = p.location >= 0 ? symbolAt(p.location) : Symbol();
+            warning(sym, msg.constData());
             if (p.write.isEmpty()) {
                 cdef->propertyList.removeAt(i);
                 --i;