Fix #10689 Several Qt containers are missing from qt.cfg (#6146)

danmar · Mar 18, 2024 · 49a34cd · 49a34cd
1 parent 7fef83a
commit 49a34cd
Show file tree

Hide file tree

Showing 3 changed files with 69 additions and 2 deletions.
diff --git a/cfg/qt.cfg b/cfg/qt.cfg
@@ -5160,6 +5160,22 @@
       <function name="crend" yields="end-iterator"/>
     </access>
   </container>
+  <container id="qtLatin1String" startPattern="QLatin1String" endPattern="" inherits="qtContainer" opLessAllowed="true" itEndPattern=":: const_iterator|const_reverse_iterator">
+    <type string="std-like"/>
+    <size>
+      <function name="isNull" yields="empty"/>
+      <function name="chop" action="change"/>
+    </size>
+    <access indexOperator="array-like">
+      <function name="at" yields="at_index"/>
+      <function name="front" yields="item"/>
+      <function name="back" yields="item"/>
+      <function name="rbegin" yields="start-iterator"/>
+      <function name="crbegin" yields="start-iterator"/>
+      <function name="rend" yields="end-iterator"/>
+      <function name="crend" yields="end-iterator"/>
+    </access>
+  </container>
   <container id="qtByteArray" startPattern="QByteArray" endPattern="" inherits="qtContainer" opLessAllowed="true" itEndPattern=":: iterator|const_iterator|reverse_iterator|const_reverse_iterator">
     <size>
       <function name="isNull" yields="empty"/>
@@ -5183,6 +5199,39 @@
       <function name="crend" yields="end-iterator"/>
     </access>
   </container>
+  <container id="qtMap" startPattern="QMap|QMultiMap &lt;" inherits="qtContainer">
+    <type templateParameter="1" associative="std-like"/>
+    <rangeItemRecordType>
+      <member name="first" templateParameter="0"/>
+      <member name="second" templateParameter="1"/>
+    </rangeItemRecordType>
+    <access>
+      <function name="count" action="find"/>
+      <function name="find" action="find" yields="iterator"/>
+      <function name="insert" action="push"/>
+      <function name="lower_bound" yields="iterator"/>
+      <function name="upper_bound" yields="iterator"/>
+    </access>
+  </container>
+  <container id="qtSet" startPattern="QSet &lt;" inherits="qtContainer">
+    <access>
+      <function name="count" action="find"/>
+      <function name="find" action="find" yields="iterator"/>
+      <function name="insert" action="push"/>
+    </access>
+  </container>
+  <container id="qtQueue" startPattern="QQueue &lt;" inherits="qtContainer">
+    <access>
+      <function name="at" yields="at_index"/>
+      <function name="emplace" action="push" yields="item"/>
+      <function name="push_front" action="push"/>
+      <function name="push_back" action="push"/>
+      <function name="pop_back" action="pop"/>
+      <function name="pop_front" action="pop"/>
+      <function name="front" yields="item"/>
+      <function name="back" yields="item"/>
+    </access>
+  </container>
   <type-checks>
     <unusedvar>
       <suppress>QApplication</suppress>

diff --git a/cfg/std.cfg b/cfg/std.cfg
@@ -8782,7 +8782,6 @@ initializer list (7) string& replace (const_iterator i1, const_iterator i2, init
       <member name="second" templateParameter="1"/>
     </rangeItemRecordType>
     <access>
-      <function name="at" yields="at_index"/>
       <function name="count" action="find"/>
       <function name="find" action="find" yields="iterator"/>
       <function name="emplace_hint" action="push" yields="iterator"/>

diff --git a/test/cfg/qt.cpp b/test/cfg/qt.cpp
@@ -14,9 +14,12 @@
 #include <QByteArray>
 #include <QList>
 #include <QLinkedList>
+#include <QMap>
+#include <QMultiMap>
+#include <QQueue>
+#include <QSet>
 #include <QtPlugin>
 #include <QFile>
-#include <cstdio>
 #include <QCoreApplication>
 #include <QLoggingCategory>
 #include <QTest>
@@ -27,6 +30,8 @@
 #include <QSize>
 #include <QPoint>
 
+#include <cstdio>
+
 void unreadVariable_QPoint(const QPoint &s)
 {
     // cppcheck-suppress unreadVariable
@@ -713,3 +718,17 @@ bool knownConditionTrueFalse_QString_count(const QString& s) // #11036
         return false;
     return true;
 }
+
+void unusedVariable_qtContainers() // #10689
+{
+  // cppcheck-suppress unusedVariable
+  QMap<int, int> qm;
+  // cppcheck-suppress unusedVariable
+  QSet<int> qs;
+  // cppcheck-suppress unusedVariable
+  QMultiMap<int, int> qmm;
+  // cppcheck-suppress unusedVariable
+  QQueue<int> qq;
+  // cppcheck-suppress unusedVariable
+  QLatin1String ql1s;
+}