Skip to content

Commit

Permalink
Merge
Browse files Browse the repository at this point in the history
  • Loading branch information
@chrchr-github
chrchr-github committed Feb 26, 2024
2 parents 2d6f1fd + 91f15aa commit 14df48a
Show file tree
Hide file tree
Showing 60 changed files with 962 additions and 553 deletions.
7 changes: 3 additions & 4 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ ifndef HAVE_RULES
HAVE_RULES=no
endif

ifdef SRCDIR
$(error Usage of SRCDIR to activate match compiler has been removed. Use MATCHCOMPILER=yes instead.)
endif
ifndef MATCHCOMPILER
MATCHCOMPILER=
endif
Expand All @@ -32,8 +29,10 @@ ifeq ($(MATCHCOMPILER),yes)
matchcompiler_S := $(shell $(PYTHON_INTERPRETER) tools/matchcompiler.py)
endif
libcppdir:=build
else
else ifeq ($(MATCHCOMPILER),)
libcppdir:=lib
else
$(error invalid MATCHCOMPILER value '$(MATCHCOMPILER)')
endif

ifndef CPPFLAGS
Expand Down
26 changes: 26 additions & 0 deletions cfg/qt.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2765,6 +2765,32 @@
<use-retval/>
<const/>
</function>
<!--int QPoint::x() const -->
<!--int QPoint::y() const -->
<!--int QPoint::manhattanLength() const -->
<function name="QPoint::x,QPoint::y,QPoint::manhattanLength">
<noreturn>false</noreturn>
<leak-ignore/>
<returnValue type="int"/>
<use-retval/>
</function>
<!--int QPoint::isNull() const -->
<function name="QPoint::isNull">
<noreturn>false</noreturn>
<leak-ignore/>
<returnValue type="bool"/>
<use-retval/>
</function>
<!--int QPoint::setX(int x) -->
<!--int QPoint::setY(int y) -->
<function name="QPoint::setX,QPoint::setY">
<noreturn>false</noreturn>
<leak-ignore/>
<returnValue type="void"/>
<arg nr="1" direction="in">
<not-uninit/>
</arg>
</function>
<!-- void QPainter::drawEllipse(const QRectF &rectangle) -->
<!-- void QPainter::drawEllipse(const QRect &rectangle) -->
<!-- void QPainter::drawEllipse(int x, int y, int width, int height) -->
Expand Down
51 changes: 45 additions & 6 deletions cfg/std.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6440,8 +6440,46 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
<not-uninit/>
</arg>
</function>
<!-- (1) (since C++17) bool std::filesystem::exists( std::filesystem::file_status s ) noexcept; -->
<!-- (2) (since C++17) bool std::filesystem::exists( const std::filesystem::path& p ); -->
<!-- (3) (since C++17) bool std::filesystem::exists( const std::filesystem::path& p, std::error_code& ec ) noexcept; -->
<!-- (1) (since C++17) bool std::filesystem::is_block_file( std::filesystem::file_status s ) noexcept; -->
<!-- (2) (since C++17) bool std::filesystem::is_block_file( const std::filesystem::path& p ); -->
<!-- (3) (since C++17) bool std::filesystem::is_block_file( const std::filesystem::path& p, std::error_code& ec ) noexcept; -->
<!-- (1) (since C++17) bool std::filesystem::is_character_file( std::filesystem::file_status s ) noexcept; -->
<!-- (2) (since C++17) bool std::filesystem::is_character_file( const std::filesystem::path& p ); -->
<!-- (3) (since C++17) bool std::filesystem::is_character_file( const std::filesystem::path& p, std::error_code& ec ) noexcept; -->
<!-- (1) (since C++17) bool std::filesystem::is_directory( std::filesystem::file_status s ) noexcept; -->
<!-- (2) (since C++17) bool std::filesystem::is_directory( const std::filesystem::path& p ); -->
<!-- (3) (since C++17) bool std::filesystem::is_directory( const std::filesystem::path& p, std::error_code& ec ) noexcept; -->
<!-- (1) (since C++17) bool std::filesystem::is_empty const std::filesystem::path& p ); -->
<!-- (2) (since C++17) bool std::filesystem::is_empty( const std::filesystem::path& p, std::error_code& ec ) noexcept; -->
<!-- (1) (since C++17) bool std::filesystem::is_fifo( std::filesystem::file_status s ) noexcept; -->
<!-- (2) (since C++17) bool std::filesystem::is_fifo const std::filesystem::path& p ); -->
<!-- (3) (since C++17) bool std::filesystem::is_fifo( const std::filesystem::path& p, std::error_code& ec ) noexcept; -->
<!-- (1) (since C++17) bool std::filesystem::is_other( std::filesystem::file_status s ) noexcept; -->
<!-- (2) (since C++17) bool std::filesystem::is_other const std::filesystem::path& p ); -->
<!-- (3) (since C++17) bool std::filesystem::is_other( const std::filesystem::path& p, std::error_code& ec ) noexcept; -->
<!-- (1) (since C++17) bool std::filesystem::is_regular_file( std::filesystem::file_status s ) noexcept; -->
<!-- (2) (since C++17) bool std::filesystem::is_regular_file( const std::filesystem::path& p ); -->
<!-- (3) (since C++17) bool std::filesystem::is_regular_file( const std::filesystem::path& p, std::error_code& ec ) noexcept; -->
<!-- (1) (since C++17) bool std::filesystem::is_socket( std::filesystem::file_status s ) noexcept; -->
<!-- (2) (since C++17) bool std::filesystem::is_socket( const std::filesystem::path& p ); -->
<!-- (3) (since C++17) bool std::filesystem::is_socket( const std::filesystem::path& p, std::error_code& ec ) noexcept; -->
<!-- (1) (since C++17) bool std::filesystem::is_symlink( std::filesystem::file_status s ) noexcept; -->
<!-- (2) (since C++17) bool std::filesystem::is_symlink( const std::filesystem::path& p ); -->
<!-- (3) (since C++17) bool std::filesystem::is_symlink( const std::filesystem::path& p, std::error_code& ec ) noexcept; -->
<function name="std::filesystem::exists,std::filesystem::is_block_file,std::filesystem::is_character_file,std::filesystem::is_directory,std::filesystem::is_empty,std::filesystem::is_fifo,std::filesystem::is_other,std::filesystem::is_regular_file,std::filesystem::is_socket,std::filesystem::is_symlink">
<returnValue type="bool"/>
<noreturn>false</noreturn>
<leak-ignore/>
<use-retval/>
<arg nr="1" direction="in"/>
<arg nr="2" direction="out" default=""/>
</function>
<!-- std::string std::ostringstream::str() const; -->
<!-- std::string std::stringstream::str() const; -->
<!-- std::string std::basic_stringstream::str() const; -->
<!-- @todo Implement the second version when function overloading is possible: -->
<!-- void std::ostringstream::str(const string & s); -->
<function name="std::istringstream::str,std::ostringstream::str,std::stringstream::str,std::basic_stringstream::str">
Expand All @@ -6451,14 +6489,15 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
<noreturn>false</noreturn>
</function>
<!-- std::ios::pos_type std::istream::tellg( void ); -->
<function name="std::istream::tellg,std::basic_istream::tellg">
<!-- std::ios::pos_type std::ifstream::tellg( void ); -->
<function name="std::istream::tellg,std::basic_istream::tellg,std::ifstream::tellg,std::basic_ifstream::tellg">
<use-retval/>
<const/>
<returnValue type="std::ios::pos_type"/>
<noreturn>false</noreturn>
</function>
<!-- bool good() const; -->
<function name="std::ios::good,std::ios_base::good,std::ostream::good,std::ofstream::good,std::ostringstream::good,std::ifstream::good,std::istringstream::good,std::wistringstream::good,std::basic_istringstream::good">
<function name="std::ios::good,std::ios_base::good,std::ostream::good,std::ofstream::good,std::ostringstream::good,std::ifstream::good,std::istream::good,std::istringstream::good,std::wistringstream::good,std::basic_istringstream::good">
<use-retval/>
<const/>
<returnValue type="bool"/>
Expand All @@ -6472,14 +6511,14 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
<noreturn>false</noreturn>
</function>
<!-- bool fail() const; -->
<function name="std::ios::fail,std::ios_base::fail,std::ostream::fail,std::ofstream::fail,std::ostringstream::fail,std::ifstream::fail,std::istringstream::fail,std::wistringstream::fail,std::basic_istringstream::fail">
<function name="std::ios::fail,std::ios_base::fail,std::ostream::fail,std::ofstream::fail,std::ostringstream::fail,std::ifstream::fail,std::istringstream::fail,std::wistringstream::fail,std::basic_istringstream::fail,std::istream::fail">
<use-retval/>
<const/>
<returnValue type="bool"/>
<noreturn>false</noreturn>
</function>
<!-- bool bad() const; -->
<function name="std::ios::bad,std::ios_base::bad,std::ostream::bad,std::ofstream::bad,std::ostringstream::bad,std::ifstream::bad,std::istringstream::bad,std::wistringstream::bad,std::basic_istringstream::bad">
<function name="std::ios::bad,std::ios_base::bad,std::ostream::bad,std::ofstream::bad,std::ostringstream::bad,std::ifstream::bad,std::istringstream::bad,std::wistringstream::bad,std::basic_istringstream::bad,std::istream::bad">
<use-retval/>
<const/>
<returnValue type="bool"/>
Expand Down Expand Up @@ -6756,7 +6795,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
<function name="std::exchange">
<leak-ignore/>
<noreturn>false</noreturn>
<use-retval/>
<use-retval/>
<returnValue>arg1</returnValue>
<arg nr="1">
<not-uninit/>
Expand Down Expand Up @@ -8909,7 +8948,7 @@ initializer list (7) string& replace (const_iterator i1, const_iterator i2, init
<podtype name="std::atomic_intmax_t"/>
<podtype name="std::atomic_uintmax_t"/>
<!-- https://en.cppreference.com/w/c/program/SIG_types
Values are in alignment with posix.cfg -->
Values are in alignment with posix.cfg -->
<define name="SIGTERM" value="15"/>
<define name="SIGSEGV" value="11"/>
<define name="SIGINT" value="2"/>
Expand Down
Loading

0 comments on commit 14df48a

Please sign in to comment.