Обновление подмодулей

This commit is contained in:
Andrei Astafev 2019-10-27 10:42:16 +03:00
parent 821bd88cee
commit 7dedc13075
5 changed files with 12 additions and 11 deletions

@ -1 +1 @@
Subproject commit 36073091bc042af1ef1f7324d26c503bce3ac148
Subproject commit 28e7c7ffa2602219fc6a90728df703996e0e45de

@ -1 +1 @@
Subproject commit 8b08ebee41cab2c632736e5ac137f05acfb64766
Subproject commit 0aae214a4c5ebff765b8b13ce74afefe53fd0145

View File

@ -211,9 +211,9 @@ bool Paths::makeDefaultDirectories()
{
bool status = true;
if ( !m_dataDirectory.mkpath( m_dataDirectory.absolutePath() ) ) { status = false; }
if ( !m_dataDirectory.mkpath( m_dataDirectory.absolutePath() ) ) { status = false; }
if ( !m_configDirectory.mkpath( m_configDirectory.absolutePath() ) ) { status = false; }
if ( !m_cacheDirectory.mkpath( m_cacheDirectory.absolutePath() ) ) { status = false; }
if ( !m_cacheDirectory.mkpath( m_cacheDirectory.absolutePath() ) ) { status = false; }
return( status );
}

View File

@ -68,9 +68,7 @@ int getExecutablePath( char* out, int capacity, int* dirname_length )
if ( dirname_length )
{
int i;
for ( i = length - 1; i >= 0; --i )
for ( int i = length - 1; i >= 0; --i )
{
if ( out[i] == '/' )
{
@ -156,9 +154,7 @@ int getModulePath( char* out, int capacity, int* dirname_length )
if ( dirname_length )
{
int i;
for ( i = length - 1; i >= 0; --i )
for ( int i = length - 1; i >= 0; --i )
{
if ( out[i] == '/' )
{

View File

@ -19,7 +19,12 @@ struct QOverload
// this adds const to non-const objects (like std::as_const)
template < typename T >
Q_DECL_CONSTEXPR typename std::add_const< T >::type& qAsConst( T& t ) noexcept { return( t ); }
Q_DECL_CONSTEXPR typename std::add_const< T >::type& qAsConst( T& t ) noexcept
{
return( t );
}
// prevent rvalue arguments:
template < typename T >
void qAsConst( const T&& ) = delete;