Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #12699 QDir functions missing from qt.cfg #6374

Closed
wants to merge 2 commits into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
100 changes: 88 additions & 12 deletions cfg/qt.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -2297,7 +2297,7 @@
<not-null/>
</arg>
</function>
<!-- https://doc.qt.io/qt-5/qdir.html -->
<!-- https://doc.qt.io/qt-6/qdir.html -->
<!-- QString QDir::fromNativeSeparators(const QString &pathName) -->
<!-- QString QDir::toNativeSeparators(const QString &pathName) -->
<function name="QDir::fromNativeSeparators,QDir::toNativeSeparators">
Expand All @@ -2309,10 +2309,27 @@
<not-bool/>
</arg>
</function>
<!-- bool QDir::mkdir(const QString &dirPath) const -->
<!-- bool QDir::mkpath(const QString &dirPath) const -->
<!-- do not mark as const as it is not const from a side effect standpoint-->
<function name="QDir::mkdir,QDir::mkpath">
<noreturn>false</noreturn>
<returnValue type="bool"/>
<use-retval type="error-code"/>
<arg nr="1" direction="in">
<not-uninit/>
<not-bool/>
</arg>
</function>
<!-- bool QDir::path() const -->
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this comment wrong it says that QDir::path returns bool?

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suggest <use-retval/>

<function name="QDir::path">
<noreturn>false</noreturn>
<returnValue type="QString"/>
</function>
<!-- QString absolutePath() const -->
<!-- QString canonicalPath() const -->
<!-- QString dirName() const -->
<function name="QDir::absoluteFilePath,QDir::canonicalPath,QDir::dirName">
<function name="QDir::absolutePath,QDir::canonicalPath,QDir::dirName">
<noreturn>false</noreturn>
<returnValue type="QString"/>
<use-retval/>
Expand All @@ -2328,6 +2345,63 @@
<not-bool/>
</arg>
</function>
<!-- QString QDir::absoluteFilePath(const QString &fileName) -->
<function name="QDir::absoluteFilePath">
<noreturn>false</noreturn>
<returnValue type="QString"/>
<arg nr="1" direction="in">
<not-uninit/>
<not-bool/>
</arg>
<const/>
</function>
<!-- QString QDir::filePath(const QString &fileName) -->
<function name="QDir::filePath">
<noreturn>false</noreturn>
<returnValue type="QString"/>
<arg nr="1" direction="in">
<not-uninit/>
<not-bool/>
</arg>
<const/>
</function>
<!-- QString QDir::cleanPath(const QString &path) -->
<function name="QDir::cleanPath">
<noreturn>false</noreturn>
<returnValue type="QString"/>
<arg nr="1" direction="in">
<not-uninit/>
<not-bool/>
</arg>
<const/>
</function>
<!-- QString QDir::currentPath() -->
<!-- QString QDir::tempPath() -->
<function name="QDir::currentPath,QDir::tempPath">
<noreturn>false</noreturn>
<returnValue type="QString"/>
<const/>
</function>
<!-- QStringList QDir::entryList(const QStringList &nameFilters, QDir::Filters filters = NoFilter, QDir::SortFlags sort = NoSort) const-->
<!-- QStringList QDir::entryList(QDir::Filters filters = NoFilter, QDir::SortFlags sort = NoSort)const-->
<function name="QDir::entryList">
<noreturn>false</noreturn>
<returnValue type="QStringList"/>
<arg nr="any">
<not-uninit/>
</arg>
<const/>
</function>
<!-- QFileInfoList QDir::entryInfoList(const QStringList &nameFilters, QDir::Filters filters = NoFilter, QDir::SortFlags sort = NoSort) const -->
<!-- QFileInfoList QDir::entryInfoList(QDir::Filters filters = NoFilter, QDir::SortFlags sort = NoSort) const -->
<function name="QDir::entryInfoList">
<noreturn>false</noreturn>
<returnValue type="QFileInfoList"/>
<arg nr="any">
<not-uninit/>
</arg>
<const/>
</function>
<!-- bool QDir::cdUp() -->
<function name="QDir::cdUp">
<noreturn>false</noreturn>
Expand All @@ -2336,7 +2410,7 @@
</function>
<!-- bool QDir::exists(QString &name) const -->
<!-- bool QDir::exists() const -->
<function name="QDir">
<function name="QDir::exists">
<noreturn>false</noreturn>
<returnValue type="bool"/>
<use-retval/>
Expand All @@ -2353,17 +2427,19 @@
<use-retval/>
<const/>
</function>
<!-- bool QFile::exists(const QString &fileName) // static -->
<!-- bool QFile::exists() const -->
<function name="QFile::exists">
<!-- QChar QDir::separator() static -->
<function name="QDir::separator">
<noreturn>false</noreturn>
<returnValue type="bool"/>
<returnValue type="QChar"/>
<use-retval/>
<leak-ignore/>
<arg nr="1" default="&quot;&quot;" direction="in">
<not-uninit/>
<not-bool/>
</arg>
<const/>
</function>
<!-- QChar QDir::separator() static -->
<function name="QDir::homePath">
<noreturn>false</noreturn>
<returnValue type="QString"/>
<use-retval/>
<const/>
</function>
<!-- bool QFile::open(OpenMode mode) -->
<!-- bool QFile::open(FILE *fh, OpenMode mode, FileHandleFlags handleFlags = DontCloseHandle) -->
Expand Down
Loading