From 8f6b0b41e7a4820d08a997682701c28f16f8a01b Mon Sep 17 00:00:00 2001
From: chrchr-github <78114321+chrchr-github@users.noreply.github.com>
Date: Sat, 17 Jun 2023 17:04:14 +0200
Subject: [PATCH] Simplify qt.cfg, wxwidgets.cfg (#5166)

---
 cfg/qt.cfg         | 111 ++-------------------------------------------
 cfg/std.cfg        |   6 +--
 cfg/wxwidgets.cfg  |  34 ++------------
 test/testother.cpp |  12 +++++
 4 files changed, 20 insertions(+), 143 deletions(-)

diff --git a/cfg/qt.cfg b/cfg/qt.cfg
index b7c29297d..13d96ecb6 100644
--- a/cfg/qt.cfg
+++ b/cfg/qt.cfg
@@ -885,36 +885,6 @@
     <use-retval/>
     <const/>
   </function>
-  <!-- iterator QVector::..() -->
-  <function name="QVector::begin,QVector::end,QVector::cbegin,QVector::cend,QVector::constBegin,QVector::constEnd,QVector::rbegin,QVector::rend,QVector::crbegin,QVector::crend">
-    <noreturn>false</noreturn>
-    <use-retval/>
-  </function>
-  <!-- iterator QList::..() -->
-  <function name="QList::begin,QList::end,QList::cbegin,QList::cend,QList::constBegin,QList::constEnd,QList::rbegin,QList::rend,QList::crbegin,QList::crend">
-    <noreturn>false</noreturn>
-    <use-retval/>
-  </function>
-  <!-- iterator QLinkedList::..() -->
-  <function name="QLinkedList::begin,QLinkedList::end,QLinkedList::cbegin,QLinkedList::cend,QLinkedList::constBegin,QLinkedList::constEnd,QLinkedList::rbegin,QLinkedList::rend,QLinkedList::crbegin,QLinkedList::crend">
-    <noreturn>false</noreturn>
-    <use-retval/>
-  </function>
-  <!-- iterator QString::..() -->
-  <function name="QString::begin,QString::end,QString::cbegin,QString::cend,QString::constBegin,QString::constEnd,QString::rbegin,QString::rend,QString::crbegin,QString::crend">
-    <noreturn>false</noreturn>
-    <use-retval/>
-  </function>
-  <!-- iterator QStringList::..() -->
-  <function name="QStringList::begin,QStringList::end,QStringList::cbegin,QStringList::cend,QStringList::constBegin,QStringList::constEnd,QStringList::rbegin,QStringList::rend,QStringList::crbegin,QStringList::crend">
-    <noreturn>false</noreturn>
-    <use-retval/>
-  </function>
-  <!-- iterator QStack::..() -->
-  <function name="QStack::begin,QStack::end,QStack::cbegin,QStack::cend,QStack::constBegin,QStack::constEnd,QStack::rbegin,QStack::rend,QStack::crbegin,QStack::crend">
-    <noreturn>false</noreturn>
-    <use-retval/>
-  </function>
   <!-- QStandardItem *QStandardItem::child(int row, int column = 0) const -->
   <function name="QStandardItem::child">
     <noreturn>false</noreturn>
@@ -949,10 +919,6 @@
       <valid>0:</valid>
     </arg>
   </function>
-  <!-- void QString::clear() -->
-  <function name="QList::clear,QLinkedList::clear,QString::clear">
-    <noreturn>false</noreturn>
-  </function>
   <!-- int QString::compare(const QString &s1, const QString &s2, Qt::CaseSensitivity cs = Qt::CaseSensitive) //static -->
   <!-- int QString::compare(QLatin1String other, Qt::CaseSensitivity cs = Qt::CaseSensitive) const -->
   <!-- int QString::compare(const QString &other, Qt::CaseSensitivity cs = Qt::CaseSensitive) const -->
@@ -1045,14 +1011,6 @@
       <not-uninit/>
     </arg>
   </function>
-  <!-- bool QMap::isEmpty() const -->
-  <function name="QMap::isEmpty">
-    <noreturn>false</noreturn>
-    <returnValue type="bool"/>
-    <use-retval/>
-    <leak-ignore/>
-    <const/>
-  </function>
   <!-- const Key QMap::key(const T &value, const Key &defaultKey = Key()) const -->
   <function name="QMap::key">
     <noreturn>false</noreturn>
@@ -1138,34 +1096,6 @@
       <not-uninit/>
     </arg>
   </function>
-  <!-- int QList::count() const -->
-  <!-- int QList::length() const -->
-  <!-- int QList::size() const -->
-  <!-- int QString::count() const -->
-  <!-- int QString::length() const -->
-  <!-- int QString::size() const -->
-  <!-- int QStringList::count() const -->
-  <!-- int QStringList::length() const -->
-  <!-- int QStringList::size() const -->
-  <!-- int QByteArray::size() const -->
-  <function name="QList::count,QList::length,QList::size,QString::count,QString::length,QString::size,QStringList::count,QStringList::length,QStringList::size,QByteArray::size,QByteArray::length,QByteArray::count">
-    <noreturn>false</noreturn>
-    <use-retval/>
-    <returnValue type="signed int"/>
-    <const/>
-  </function>
-  <!-- bool QList::empty() const -->
-  <!-- bool QList::isEmpty() const -->
-  <!-- bool QString::isEmpty() const -->
-  <!-- bool QString::isNull() const -->
-  <!-- bool QStringList::empty() const -->
-  <!-- bool QStringList::isEmpty() const -->
-  <function name="QList::empty,QList::isEmpty,QString::isEmpty,QString::isNull,QStringList::empty,QStringList::isEmpty">
-    <noreturn>false</noreturn>
-    <use-retval/>
-    <returnValue type="bool"/>
-    <const/>
-  </function>
   <!-- void QList::insert(int i, const T &value) -->
   <!-- iterator QList::insert(iterator before, const T &value) -->
   <!-- QStringList inherits from QList -->
@@ -4061,11 +3991,6 @@
       <valid>0:</valid>
     </arg>
   </function>
-  <!-- void QVector::clear() -->
-  <function name="QVector::clear,QStack::clear">
-    <noreturn>false</noreturn>
-    <returnValue type="void"/>
-  </function>
   <!-- bool QVector::contains(const T &value) const -->
   <function name="QVector::contains,QStack::contains">
     <noreturn>false</noreturn>
@@ -4089,25 +4014,6 @@
       <not-uninit/>
     </arg>
   </function>
-  <!-- T *QVector::data() -->
-  <!-- const T *QVector::data() const -->
-  <function name="QVector::data,QStack::data,QByteArray::data">
-    <noreturn>false</noreturn>
-    <use-retval/>
-  </function>
-  <!-- const T *QVector::constData() const -->
-  <function name="QVector::constData,QStack::constData,QByteArray::constData">
-    <noreturn>false</noreturn>
-    <use-retval/>
-    <const/>
-  </function>
-  <!-- bool QVector::empty() const -->
-  <function name="QVector::empty,QStack::empty">
-    <noreturn>false</noreturn>
-    <returnValue type="bool"/>
-    <use-retval/>
-    <const/>
-  </function>
   <!-- bool QVector::endsWith(const T &value) const -->
   <function name="QVector::endsWith,QStack::endsWith">
     <noreturn>false</noreturn>
@@ -4159,13 +4065,6 @@
       <not-uninit/>
     </arg>
   </function>
-  <!-- bool QVector::isEmpty() const -->
-  <function name="QVector::isEmpty,QStack::isEmpty">
-    <noreturn>false</noreturn>
-    <returnValue type="bool"/>
-    <use-retval/>
-    <const/>
-  </function>
   <!-- int QVector::lastIndexOf(const T &value, int from = ...) const -->
   <function name="QVector::lastIndexOf,QStack::lastIndexOf">
     <noreturn>false</noreturn>
@@ -4181,13 +4080,6 @@
       <not-bool/>
     </arg>
   </function>
-  <!-- int QVector::length() const -->
-  <function name="QVector::length,QStack::length">
-    <noreturn>false</noreturn>
-    <returnValue type="int"/>
-    <use-retval/>
-    <const/>
-  </function>
   <!-- void QVector::push_back(const T &value) -->
   <!-- void QVector::push_back(T &&value) -->
   <function name="QVector::push_back,QStack::push_back">
@@ -5069,6 +4961,7 @@
       <function name="back" yields="item"/>
       <function name="last" yields="item"/>
       <function name="data" yields="buffer"/>
+      <function name="constData" yields="buffer-nt"/>
       <function name="rbegin" yields="start-iterator"/>
       <function name="crbegin" yields="start-iterator"/>
       <function name="rend" yields="end-iterator"/>
@@ -5123,6 +5016,8 @@
       <function name="at" yields="at_index"/>
       <function name="front" yields="item"/>
       <function name="back" yields="item"/>
+      <function name="data" yields="buffer"/>
+      <function name="constData" yields="buffer-nt"/>
       <function name="rbegin" yields="start-iterator"/>
       <function name="crbegin" yields="start-iterator"/>
       <function name="rend" yields="end-iterator"/>
diff --git a/cfg/std.cfg b/cfg/std.cfg
index b40a500be..fa499cf16 100644
--- a/cfg/std.cfg
+++ b/cfg/std.cfg
@@ -6667,7 +6667,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
       <not-uninit/>
     </arg>
   </function>
-  <function name="std::deque::max_size,std::list::max_size,std::map::max_size,std::unordered_map::max_size,std::set::max_size,std::unordered_set::max_size,std::vector::capacity,std::vector::max_size,std::span::size,std::span::size_bytes">
+  <function name="std::deque::max_size,std::list::max_size,std::map::max_size,std::unordered_map::max_size,std::set::max_size,std::unordered_set::max_size,std::vector::capacity,std::vector::max_size,std::span::size_bytes">
     <use-retval/>
     <const/>
     <returnValue type="std::size_t"/>
@@ -6696,10 +6696,6 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
       <valid>0:</valid>
     </arg>
   </function>
-  <function name="std::list::pop_back,std::list::pop_front,std::forward_list::pop_front,std::vector::pop_back">
-    <noreturn>false</noreturn>
-    <returnValue type="void"/>
-  </function>
   <!-- void std::vector::reserve(size_type new_capacity); -->
   <function name="std::vector::reserve">
     <noreturn>false</noreturn>
diff --git a/cfg/wxwidgets.cfg b/cfg/wxwidgets.cfg
index b8f825088..6d4051933 100644
--- a/cfg/wxwidgets.cfg
+++ b/cfg/wxwidgets.cfg
@@ -5256,10 +5256,10 @@
       <function name="clear" action="clear"/>
       <function name="Clear" action="clear"/>
       <function name="Empty" action="clear"/>
-      <function name="size" yields="size"/>
-      <function name="length" yields="size"/>
-      <function name="Length" yields="size"/>
-      <function name="Len" yields="size"/>
+      <function name="size" yields="size" returnType="std::size_t"/>
+      <function name="length" yields="size" returnType="std::size_t"/>
+      <function name="Length" yields="size" returnType="std::size_t"/>
+      <function name="Len" yields="size" returnType="std::size_t"/>
       <function name="empty" yields="empty"/>
       <function name="IsEmpty" yields="empty"/>
       <function name="IsNull" yields="empty"/>
@@ -5482,16 +5482,6 @@
     <use-retval/>
     <warn severity="style">This is a wxWidgets 1.xx compatibility function; you should not use it in new code.</warn>
   </function>
-  <!-- http://docs.wxwidgets.org/trunk/classwx_string.html#ab20a87ca731a52c36ec674dae2213ad8 -->
-  <!-- size_t wxString::Len () const -->
-  <!-- size_t wxString::length () const -->
-  <function name="wxString::Len,wxString::length,wxString::size">
-    <noreturn>false</noreturn>
-    <leak-ignore/>
-    <const/>
-    <returnValue type="size_t"/>
-    <use-retval/>
-  </function>
   <!-- wxUniChar     wxString::Last () const -->
   <!-- wxUniCharRef  wxString::Last () const -->
   <function name="wxString::Last">
@@ -8953,22 +8943,6 @@
       <not-bool/>
     </arg>
   </function>
-  <!-- void wxString::Clear () -->
-  <function name="wxString::Clear">
-    <noreturn>false</noreturn>
-    <returnValue type="void"/>
-  </function>
-  <!-- void wxString::c_str () -->
-  <function name="wxString::c_str">
-    <noreturn>false</noreturn>
-    <leak-ignore/>
-    <const/>
-    <returnValue type="const char*"/>
-  </function>
-  <function name="wxString::begin,wxString::end">
-    <use-retval/>  
-    <noreturn>false</noreturn>
-  </function>
   <!-- void wxBitmap::SetMask( wxMask * mask ) -->
   <function name="wxBitmap::SetMask">
     <noreturn>false</noreturn>
diff --git a/test/testother.cpp b/test/testother.cpp
index e7f91ffda..0fa1c8c26 100644
--- a/test/testother.cpp
+++ b/test/testother.cpp
@@ -3220,6 +3220,18 @@ private:
                       "[test.cpp:9]: (style) Parameter 'a' can be declared as pointer to const\n",
                       errout.str());
 
+        check("void g(int*);\n"
+              "void f(std::vector<int>& v) {\n"
+              "    g(v.data());\n"
+              "}\n");
+        ASSERT_EQUALS("", errout.str());
+
+        check("void g(const int*);\n"
+              "void f(std::vector<int>& v) {\n"
+              "    g(v.data());\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2]: (style) Parameter 'v' can be declared as reference to const\n", errout.str());
+
         check("struct a {\n"
               "    template <class T>\n"
               "    void mutate();\n"