Fix #12529 false negative: unreadVariable with library type

danmar · Mar 19, 2024 · 3172f54 · 3172f54
1 parent e2081e8
commit 3172f54
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 deletions.
diff --git a/cfg/qt.cfg b/cfg/qt.cfg
@@ -5236,12 +5236,12 @@
     <unusedvar>
       <suppress>QApplication</suppress>
       <suppress>QMutexLocker</suppress>
-      <check>QRectF</check>
-      <check>QSizeF</check>
-      <check>QPointF</check>
       <check>QRect</check>
+      <check>QRectF</check>
       <check>QSize</check>
+      <check>QSizeF</check>
       <check>QPoint</check>
+      <check>QPointF</check>
       <check>QRegion</check>
     </unusedvar>
     <operatorEqVarError>

diff --git a/lib/checkunusedvar.cpp b/lib/checkunusedvar.cpp
@@ -713,10 +713,17 @@ void CheckUnusedVar::checkFunctionVariableUsage_iterateScopes(const Scope* const
                 type = Variables::pointer;
             else if (mTokenizer->isC() ||
                      i->typeEndToken()->isStandardType() ||
-                     isRecordTypeWithoutSideEffects(i->type()) ||
-                     mSettings->library.detectContainer(i->typeStartToken()) ||
                      i->isStlType())
                 type = Variables::standard;
+            else {
+                if (isRecordTypeWithoutSideEffects(i->type()) || mSettings->library.detectContainer(i->typeStartToken()))
+                    type = Variables::standard;
+                else {
+                    Library::TypeCheck typeCheck = mSettings->library.getTypeCheck("unusedvar", i->typeStartToken()->str());
+                    if (typeCheck == Library::TypeCheck::check)
+                        type = Variables::standard;
+                }
+            }
             if (type == Variables::none || isPartOfClassStructUnion(i->typeStartToken()))
                 continue;
             const Token* defValTok = i->nameToken()->next();

diff --git a/test/cfg/qt.cpp b/test/cfg/qt.cpp
@@ -51,6 +51,17 @@ void unreadVariable_QRegion(const int x, const QRegion::RegionType type, const Q
     QRegion g{region};
 }
 
+void unusedVariable_QPoint_QSize_QRect_QRegion() { // #12529
+    // cppcheck-suppress unusedVariable
+    QPoint pt;
+    // cppcheck-suppress unusedVariable
+    QSize sz;
+    // cppcheck-suppress unusedVariable
+    QRect rect;
+    // cppcheck-suppress unusedVariable
+    QRegion reg;
+}
+
 void unreadVariable_QPoint(const QPoint &s)
 {
     // cppcheck-suppress unreadVariable